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

[Sharan Rao]

SVN commit 661878 by sharan:

fixed
* deletion of message widgets
* deletion of containment association ( thanks to Danny Beullens :) )
* a worktoolbar buttonstate problem, which changed button state, but not the toolbarstate of the view when
switching between views



 M  +2 -1      umlview.cpp  
 M  +6 -1      worktoolbar.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #661877:661878
@@ -143,6 +143,7 @@
     // Initialize other data
     m_AssociationList.setAutoDelete( true );
     m_WidgetList.setAutoDelete( true );
+    m_MessageList.setAutoDelete( true );
 
     //Setup up booleans
     m_bChildDisplayedDoc = false;
@@ -2031,7 +2032,7 @@
             // Wow, all done. Great!
             return;
         }
-        m_AssociationList.remove(a);  // AutoDelete is true
+        removeAssoc(a);  // AutoDelete is true
         // It's okay to break out because there can only be a single
         // containing object.
         break;
--- trunk/KDE/kdesdk/umbrello/umbrello/worktoolbar.cpp #661877:661878
@@ -45,7 +45,7 @@
     m_map.insert(Uml::dt_Undefined,tbb_Arrow);
 
     slotCheckToolBar( Uml::dt_Undefined );
-    
+
 }
 
 WorkToolBar::~WorkToolBar() {
@@ -189,6 +189,11 @@
     ToolBar_Buttons tbb = (ToolBar_Buttons)b;
     if (tbb == tbb_Arrow && m_CurrentButtonID == tbb_Arrow) {
         m_actions[tbb_Arrow]->toggle();
+
+        // signal needed, in the case ( when switching diagrams ) that
+        // Arrow Button gets activated, but the toolBarState of the Views may be different
+        emit sigButtonChanged( m_CurrentButtonID );
+
         view->setCursor( currentCursor() );
         return;
     }