[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

improved Diagram folder in list view so it doesn't have the same ID as 
Logical View, which caused problems on loading files.


  M +8 -1      umllistview.cpp   1.19
  M +1 -0      umlnamespace.h   1.11


--- kdesdk/umbrello/umbrello/umllistview.cpp  #1.18:1.19
@@ -614,5 +614,5 @@ void UMLListView::init() {
         lv = new UMLListViewItem(rv, i18n("Logical View"), Uml::lvt_Logical_View);
         componentView = new UMLListViewItem(rv, i18n("Component View"), Uml::lvt_Component_View);
-        diagramFolder = new UMLListViewItem(rv,i18n("Diagrams"),Uml::lvt_Logical_View);
+        diagramFolder = new UMLListViewItem(rv,i18n("Diagrams"),Uml::lvt_Diagrams);
         rv->setOpen(true);
         ucv->setOpen(true);
@@ -1906,4 +1906,6 @@ bool UMLListView::loadFromXMI( QDomEleme
         delete componentView;
         componentView = 0;
+        delete diagramFolder;
+        diagramFolder = 0;
         QDomNode node = element.firstChild();
         QDomElement domElement = node.toElement();
@@ -1979,4 +1981,9 @@ bool UMLListView::loadChildrenFromXMI( U
                                         item = new UMLListViewItem(parent, i18n("Component View"), lvType, nID );
                                         componentView = item;
+                                        break;
+
+                                case Uml::lvt_Diagrams:
+                                        item = new UMLListViewItem(parent, i18n("Diagrams"), lvType, nID );
+                                        diagramFolder = item;
                                         break;
 

--- kdesdk/umbrello/umbrello/umlnamespace.h  #1.10:1.11
@@ -155,4 +155,5 @@ namespace Uml {
             lvt_Component_View,
             lvt_Component,
+            lvt_Diagrams,
             lvt_Unknown = -1
         };