[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 1279523 by okellogg:

Apply attachment 47642 by Egbert Voigt :

> I have attached a simple solution, where instead of the package name
> the whole path will be used in the text field. I.e., when you touch the
> Apply of OK button the hierarchy is not more destroyed.

BUG: 174184


 M  +1 -0      ChangeLog  
 M  +3 -2      umbrello/dialogs/classgenpage.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #1279522:1279523
@@ -2,6 +2,7 @@
 
 * Enabling of cut/copy/paste actions is incorrect (70925)
 * Illegal tag without any parameter is generated (155382)
+* Classes in sub-packages are moved to top level packages on edit (174184)
 * Loading existing XMI file (194897) and therefore also
   -  umbrello (2.4.2) crashed while opening solid_design.xmi (233705)
 * Generation of classes from files in folder in umbrello (197137)
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classgenpage.cpp #1279522:1279523
@@ -124,7 +124,7 @@
     }
 
     if (t == UMLObject::ot_Class || t == UMLObject::ot_Interface) {
-        m_pPackageL = new QLabel(i18n("Package name:"), this);
+        m_pPackageL = new QLabel(i18n("Package path:"), this);
         m_pNameLayout->addWidget(m_pPackageL, 2, 0);
 
         m_pPackageCB = new KComboBox(this);
@@ -138,6 +138,7 @@
         }
         packages.sort();
         m_pPackageCB->insertItems(-1, packages);
+	QString packagePath = o->package();
         UMLPackage* parentPackage = o->umlPackage();
 
         // if parent package == NULL
@@ -146,7 +147,7 @@
              parentPackage == static_cast<UMLPackage*>(m_pUmldoc->rootFolder(Uml::ModelType::Logical)))
             m_pPackageCB->setEditText( QString() );
         else
-            m_pPackageCB->setEditText(parentPackage->name());
+            m_pPackageCB->setEditText(packagePath);
     }
 
     if (t == UMLObject::ot_Class || t == UMLObject::ot_UseCase ) {