[Uml-devel] branches/work/isi-umbrello/umbrello/umbrello

[Hassan Kouch]

SVN commit 633723 by kouch:

Add of the Object flow widget in the activity diagram (UML2.0) (Not finished yet)


 M  +1 -0      CMakeLists.txt  
 AM            objectflowwidget.cpp   [License: GPL (v2+)]
 AM            objectflowwidget.h   [License: GPL (v2+)]
 M  +11 -1     toolbarstateother.cpp  
 M  +1 -0      umlnamespace.h  


--- branches/work/isi-umbrello/umbrello/umbrello/CMakeLists.txt #633722:633723
@@ -325,6 +325,7 @@
    seqlinewidget.cpp 
    statewidget.cpp 
    signalwidget.cpp
+   objectflowwidget.cpp
    stereotype.cpp 
    template.cpp 
    textblock.cpp 
** branches/work/isi-umbrello/umbrello/umbrello/objectflowwidget.cpp #property svn:executable
   + *
** branches/work/isi-umbrello/umbrello/umbrello/objectflowwidget.h #property svn:executable
   + *
--- branches/work/isi-umbrello/umbrello/umbrello/toolbarstateother.cpp #633722:633723
@@ -33,7 +33,10 @@
 #include "umlview.h"
 #include "umldoc.h"
 #include "objectwidget.h"
+#include "objectflowwidget.h"
 
+
+
 using namespace Uml;
 
 ToolBarStateOther::ToolBarStateOther(UMLView *umlView) : ToolBarStatePool(umlView) {
@@ -148,6 +151,10 @@
             umlWidget = new CombinedFragmentWidget(m_pUMLView);
             break;
 
+        case WorkToolBar::tbb_Object_Flow:
+            umlWidget = new ObjectFlowWidget(m_pUMLView);
+            break;
+
         default:
             break;
     }
@@ -183,7 +190,10 @@
         // It is pretty invisible otherwise.
         FloatingTextWidget* ft = (FloatingTextWidget*) umlWidget;
         ft->changeTextDlg();
-    }
+    } /*else if (getButton() == WorkToolBar::tbb_Object_Flow) {
+        Dialog_Utils::askNameForWidgetType(umlWidget, i18n("Enter Object Flow Name"),
+            i18n("Enter the Object Flow"), i18n("new Object Flow"));
+    } */
     // Create the widget. Some setup functions can remove the widget.
     if (umlWidget != NULL) {
         m_pUMLView->setupNewWidget(umlWidget);
--- branches/work/isi-umbrello/umbrello/umbrello/umlnamespace.h #633722:633723
@@ -107,6 +107,7 @@
     wt_ForkJoin,                // does not have UMLObject representation
     wt_Precondition,		// does not have UMLObject representation
     wt_CombinedFragment,	// does not have UMLObject representation
+    wt_Object_Flow,             // does not have UMLObject representation
     wt_FloatingDashLine,        // does not have UMLObject representation
     wt_Signal,	                // does not have UMLObject representation
     wt_EndOfLife