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

Sat Jul 23 11:45:48 UTC 2005

SVN commit 437967 by okellogg:

Externalized folders are not available when tabbed diagrams are enabled.
Thanks to Paulo Sehn for his report at
http://sourceforge.net/mailarchive/forum.php?thread_id=7806178&forum_id=472


 M  +8 -0      listpopupmenu.cpp  
 M  +7 -1      tips  
 M  +5 -0      umlobject.cpp  
 M  +5 -0      umlview.cpp

--- trunk/KDE/kdesdk/umbrello/umbrello/listpopupmenu.cpp #437966:437967
@@ -594,6 +594,14 @@
 }
 
 void ListPopupMenu::insertSubmodelAction() {
+    const Settings::OptionState& ostat = UMLApp::app()->getOptionState();
+    if (ostat.generalState.tabdiagrams) {
+        // Umbrello currently does not support External Folders
+        // in combination with Tabbed Diagrams.
+        // If you need external folders then disable the tabbed diagrams
+        // in the General Settings.
+        return;
+    }
     UMLListView *listView = UMLApp::app()->getListView();
     UMLListViewItem *current = static_cast<UMLListViewItem*>(listView->currentItem());
     QString submodelFile = current->getFolderFile();
--- trunk/KDE/kdesdk/umbrello/umbrello/tips #437966:437967
@@ -8,12 +8,18 @@
 
 <tip category="Umbrello">
 <html>
-<p>Welcome to Umbrello 1.4.  New in this version are tabbed diagrams, canvas items can be moved with Alt+arrowkeys, a PHP 5 code generator, entity relationship diagrams and many fixes.</p>
+<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby code generation, externalizable folders, ability to change interfaces into classes, and more.</p>
 </html>
 </tip>
 
 <tip category="Umbrello">
 <html>
+<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need External Folders then deselect "Use tabbed diagrams" in the General Settings.</p>
+</html>
+</tip>
+
+<tip category="Umbrello">
+<html>
 <p>Most diagram items can not be resized, they will resize themselves to fit to their contents.
 Boxes, notes and sequence diagram messages can be resized, just click and drag on the red square.</p>
 </html>
--- trunk/KDE/kdesdk/umbrello/umbrello/umlobject.cpp #437966:437967
@@ -68,6 +68,11 @@
 
 
 bool UMLObject::isSavedInSeparateFile() {
+    if (UMLApp::app()->getOptionState().generalState.tabdiagrams) {
+        // Umbrello currently does not support external folders
+        // when tabbed diagrams are enabled.
+        return false;
+    }
     const QString msgPrefix("UMLObject::isSavedInSeparateFile(" + m_Name + "): ");
     UMLListView *listView = UMLApp::app()->getListView();
     UMLListViewItem *lvItem = listView->findUMLObject(this);
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #437966:437967
@@ -1183,6 +1183,11 @@
 }
 
 bool UMLView::isSavedInSeparateFile() {
+    if (getOptionState().generalState.tabdiagrams) {
+        // Umbrello currently does not support external folders
+        // when tabbed diagrams are enabled.
+        return false;
+    }
     const QString msgPrefix("UMLView::isSavedInSeparateFile(" + getName() + "): ");
     UMLListView *listView = UMLApp::app()->getListView();
     UMLListViewItem *lvItem = listView->findItem(m_nID);


