[Uml-devel] KDE/kdesdk/umbrello/umbrello/dialogs

[Ralf Habacker]

SVN commit 1273415 by habacker:

Reuse font page and style page implementation from DialogBase.

 M  +5 -37     statedialog.cpp  
 M  +2 -17     statedialog.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/statedialog.cpp #1273414:1273415
@@ -32,7 +32,7 @@
 #include <QtGui/QHBoxLayout>
 
 StateDialog::StateDialog( UMLView * pView, StateWidget * pWidget )
-    : KPageDialog( pView )
+  : DialogBase( pView )
 {
     setCaption(i18n("Properties") );
     setButtons( Help | Default | Apply | Ok | Cancel );
@@ -79,8 +79,8 @@
     if ( m_pStateWidget->stateType() == StateWidget::Normal ) {
         setupActivityPage();
     }
-    setupStylePage();
-    setupFontPage();
+    pageStyle = setupStylePage( m_pStateWidget );
+    pageFont = setupFontPage( m_pStateWidget );
 }
 
 /**
@@ -99,10 +99,10 @@
         }
     }
     else if ( item == pageStyle ) {
-        m_pStylePage->updateUMLWidget();
+        saveStylePageData( m_pStateWidget );
     }
     else if ( item == pageFont ) {
-        m_pStateWidget->setFont( m_pChooser->font() );
+        saveFontPageData( m_pStateWidget );
     }
 }
 
@@ -155,38 +155,6 @@
 }
 
 /**
- * Sets up the font selection page.
- */
-void StateDialog::setupFontPage()
-{
-    if ( !m_pStateWidget ) {
-        return;
-    }
-    KVBox * page = new KVBox();
-    pageFont = new KPageWidgetItem( page,i18n("Font")  );
-    pageFont->setHeader( i18n("Font Settings") );
-    pageFont->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
-    addPage( pageFont );
-    m_pChooser = new KFontChooser( (QWidget*)page, KFontChooser::NoDisplayFlags, QStringList(), 0);
-    m_pChooser->setFont( m_pStateWidget->font() );
-}
-
-/**
- * Sets up the style page.
- */
-void StateDialog::setupStylePage()
-{
-    QFrame * stylePage = new QFrame();
-    pageStyle = new KPageWidgetItem( stylePage, i18nc("style page", "Style")  );
-    pageStyle->setHeader( i18n("Widget Style") );
-    pageStyle->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Color) );
-    addPage( pageStyle );
-    QHBoxLayout * m_pStyleLayout = new QHBoxLayout(stylePage);
-    m_pStylePage = new UMLWidgetStylePage( stylePage, m_pStateWidget );
-    m_pStyleLayout->addWidget(m_pStylePage);
-}
-
-/**
  * Sets up the activity page.
  */
 void StateDialog::setupActivityPage()
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/statedialog.h #1273414:1273415
@@ -16,12 +16,11 @@
 #include "activitypage.h"
 
 // kde class includes
-#include <kpagedialog.h>
+#include "dialogbase.h"
 
 //forward declarations
 class UMLView;
 class StateWidget;
-class KFontChooser;
 class KLineEdit;
 class QGroupBox;
 class QLabel;
@@ -32,7 +31,7 @@
  * @author   Paul Hensgen
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
  */
-class StateDialog : public KPageDialog
+class StateDialog : public DialogBase
 {
     Q_OBJECT
 
@@ -62,25 +61,11 @@
 
     void setupGeneralPage();
 
-    void setupStylePage();
-
-    void setupFontPage();
-
     void setupActivityPage();
 
     void applyPage( KPageWidgetItem*item );
 
     /**
-     * Font chooser widget for font page.
-     */
-    KFontChooser * m_pChooser;
-
-    /**
-     * style page
-     */
-    UMLWidgetStylePage * m_pStylePage;
-
-    /**
      * Activity page.
      */
     ActivityPage * m_pActivityPage;