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

[Oliver Kellogg]

CVS commit by okellogg: 

Add PkgContentsPage.


  A            pkgcontentspage.cpp   1.1 [no copyright GPL (v2+)]
  A            pkgcontentspage.h   1.1 [no copyright GPL (v2+)]
  M +1 -0      Makefile.am   1.21
  M +17 -6     classpropdlg.cpp   1.17
  M +2 -0      classpropdlg.h   1.8


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.20:1.21
@@ -43,4 +43,5 @@
 overwritedialogue.cpp \
 packagepropertiespage.cpp \
+pkgcontentspage.cpp \
 parameterpropertiespage.cpp \
 parmpropdlg.cpp \

--- kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp  #1.16:1.17
@@ -17,4 +17,5 @@
 #include "classgenpage.h"
 #include "classifierlistpage.h"
+#include "pkgcontentspage.h"
 #include "assocpage.h"
 #include "classoptionspage.h"
@@ -27,5 +28,6 @@
 #include "../umlview.h"
 
-ClassPropDlg::ClassPropDlg(QWidget *parent, UMLObject * c, int pageNum, bool assoc) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
+ClassPropDlg::ClassPropDlg(QWidget *parent, UMLObject * c, int pageNum, bool assoc)
+  : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
         Ok, parent, "_CLASSDLG_", true, true) {
         m_pWidget = 0;
@@ -44,5 +46,6 @@ ClassPropDlg::ClassPropDlg(QWidget *pare
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-ClassPropDlg::ClassPropDlg(QWidget *parent, ObjectWidget * o) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
+ClassPropDlg::ClassPropDlg(QWidget *parent, ObjectWidget * o)
+  : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
         Ok, parent, "_CLASSDLG_", true, true) {
         m_pWidget = o;
@@ -72,5 +75,6 @@ ClassPropDlg::ClassPropDlg(QWidget *pare
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-ClassPropDlg::ClassPropDlg(QWidget *parent, UMLWidget * w) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
+ClassPropDlg::ClassPropDlg(QWidget *parent, UMLWidget * w)
+  : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
         Ok, parent, "_CLASSDLG_", true, true) {
         m_pWidget = w;
@@ -205,4 +209,11 @@ void ClassPropDlg::setupPages(UMLObject 
                 connect(m_pEnumLiteralPage, SIGNAL(sigUpdateChildObject(int)),
                         this, SLOT(slotUpdateChildObject(int)));
+        }
+        if (c->getBaseType() == Uml::ot_Package ) {
+                // Set up containment page.
+                QFrame* newPage = addPage( i18n("Contents"), i18n("Contents Settings"), DesktopIcon("misc") );
+                m_pPkgContentsPage = new PkgContentsPage(newPage, (UMLPackage*)(c));
+                QHBoxLayout* contentsLayout = new QHBoxLayout(newPage);
+                contentsLayout->addWidget(m_pPkgContentsPage);
         }
         if (assoc) {

--- kdesdk/umbrello/umbrello/dialogs/classpropdlg.h  #1.7:1.8
@@ -19,4 +19,5 @@ class ClassifierListPage;
 class ClassOpsPage;
 class ClassTemplatePage;
+class PkgContentsPage;
 class AssocPage;
 class ClassOptionsPage;
@@ -104,4 +105,5 @@ private:
         ClassifierListPage* m_pTemplatePage;
         ClassifierListPage* m_pEnumLiteralPage;
+        PkgContentsPage * m_pPkgContentsPage;
         AssocPage * m_pAssocPage;
         ClassOptionsPage * m_pOptionsPage;