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

[Laurent Montel]

SVN commit 553808 by mlaurent:

Port++


 M  +40 -20    activitydialog.cpp  
 M  +4 -9      activitydialog.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/activitydialog.cpp #553807:553808
@@ -21,7 +21,7 @@
 #include <Q3Frame>
 #include <QHBoxLayout>
 #include <QGridLayout>
-
+#include <kvbox.h>
 //kde includes
 #include <kiconloader.h>
 #include <klocale.h>
@@ -32,7 +32,13 @@
 #include "../dialog_utils.h"
 
 ActivityDialog::ActivityDialog( UMLView * pView, ActivityWidget * pWidget )
-        : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, Ok, pView, "_STATEDIALOG_", true, true) {
+        : KPageDialog(pView) {
+    setCaption( i18n("Properties") );
+    setButtons( Ok | Apply | Cancel | Help );
+    setDefaultButton( Ok );
+    setModal( true );
+    setFaceType( KPageDialog::List );
+    enableButtonSeparator( true );
     m_pView = pView;
     m_pActivityWidget = pWidget;
     m_bChangesMade = false;
@@ -40,14 +46,14 @@
 }
 
 void ActivityDialog::slotOk() {
-    applyPage( GeneralPage );
-    applyPage( ColorPage );
-    applyPage( FontPage );
+    applyPage( pageItemColor );
+    applyPage( pageItemFont );
+    applyPage( pageItemGeneral );
     accept();
 }
 
 void ActivityDialog::slotApply() {
-    applyPage( (Page) activePageIndex() );
+    applyPage(currentPage());
 }
 
 void ActivityDialog::setupPages() {
@@ -56,28 +62,34 @@
     setupFontPage();
 }
 
-void ActivityDialog::applyPage( Page page ) {
+void ActivityDialog::applyPage( KPageWidgetItem *item ) {
     m_bChangesMade = true;
-    switch( page ) {
-    case GeneralPage:
+    if ( item == pageItemGeneral )
+    {
         m_pActivityWidget -> setName( m_GenPageWidgets.nameLE -> text() );
         m_pActivityWidget -> setDoc( m_GenPageWidgets.docMLE -> text() );
-        break;
-
-    case ColorPage:
+    }
+    else if ( item == pageItemFont )
+    {
+        m_pActivityWidget -> setFont( m_pChooser -> font() );
+    }
+    else if ( item == pageItemColor )
+    {
         m_pColorPage -> updateUMLWidget();
-
-    case FontPage:
-        m_pActivityWidget -> setFont( m_pChooser -> font() );
-        break;
-    }//end switch
+    }
 }
 
 void ActivityDialog::setupGeneralPage() {
     QString types[ ] = { i18n("Initial activity"), i18n("Activity"), i18n("End activity"), i18n( "Branch/Merge"), i18n( "Fork/Join" ) };
     ActivityWidget::ActivityType type = m_pActivityWidget -> getActivityType();
 
-    KVBox * page = addVBoxPage( i18n("General"), i18n("General Properties"), DesktopIcon( "misc") );
+
+    KVBox *page = new KVBox();
+    pageItemGeneral = new KPageWidgetItem( page, i18n("General") );
+    pageItemGeneral->setHeader(i18n("General Properties"));
+    pageItemGeneral->setIcon( DesktopIcon( "misc") );
+    addPage( pageItemGeneral );
+
     m_GenPageWidgets.generalGB = new Q3GroupBox( i18n( "Properties"), (QWidget *)page );
 
     QGridLayout * generalLayout = new QGridLayout( m_GenPageWidgets.generalGB );
@@ -112,13 +124,21 @@
 }
 
 void ActivityDialog::setupFontPage() {
-    KVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts")  );
+    KVBox *page = new KVBox();
+    pageItemFont = new KPageWidgetItem( page, i18n("Font") );
+    pageItemFont->setHeader( i18n("Font Settings") );
+    pageItemFont->setIcon( DesktopIcon( "fonts") );
+    addPage( pageItemFont );
     m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
     m_pChooser -> setFont( m_pActivityWidget -> getFont() );
 }
 
 void ActivityDialog::setupColorPage() {
-    QFrame * colorPage = addPage( i18n("Color"), i18n("Widget Colors"), DesktopIcon( "colors") );
+    QFrame *colorPage = new QFrame();
+    pageItemColor = new KPageWidgetItem( colorPage, i18n("Color") );
+    pageItemColor->setHeader( i18n("Widget Colors") );
+    pageItemColor->setIcon( DesktopIcon( "colors") );
+    addPage( pageItemColor );
     QHBoxLayout * m_pColorLayout = new QHBoxLayout(colorPage);
     m_pColorPage = new UMLWidgetColorPage( colorPage, m_pActivityWidget );
     m_pColorLayout -> addWidget(m_pColorPage);
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/activitydialog.h #553807:553808
@@ -22,7 +22,7 @@
 #include <q3groupbox.h>
 
 //kde class includes
-#include <kdialogbase.h>
+#include <kpagedialog.h>
 #include <kfontdialog.h>
 
 //local class includes
@@ -39,7 +39,7 @@
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
  */
 
-class ActivityDialog : public KDialogBase {
+class ActivityDialog : public KPageDialog {
     Q_OBJECT
 
 public:
@@ -57,12 +57,6 @@
 
 protected:
 
-    enum Page
-    {
-        GeneralPage = 0,
-        ColorPage,
-        FontPage
-    };
 
     /**
     *   Entered when OK button pressed.
@@ -97,7 +91,7 @@
     /**
     *     Applys changes to the given page.
     */
-    void applyPage( Page page );
+    void applyPage( KPageWidgetItem * );
 
     /**
     *   Font chooser widget for font page.
@@ -132,6 +126,7 @@
         Q3GroupBox * docGB, * generalGB;
     }
     m_GenPageWidgets;
+    KPageWidgetItem *pageItemGeneral,*pageItemFont,*pageItemColor;
 };
 
 #endif