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

[Hassan Kouch]

SVN commit 632733 by kouch:

Add of Object flow button in the toolbar (activity diagram, UML2.0)


 M  +2 -2      pics/CMakeLists.txt  
 AM            pics/cursor-object_flow.png  
 AM            pics/object_flow.png  
 M  +3 -0      worktoolbar.cpp  
 M  +2 -0      worktoolbar.h  


--- branches/work/isi-umbrello/umbrello/umbrello/pics/CMakeLists.txt #632732:632733
@@ -8,13 +8,13 @@
 CVprotected_signal.png  CVprotected_slot.png  CVprotected_var.png  CVpublic_meth.png  CVpublic_signal.png  
 CVpublic_slot.png  CVpublic_var.png  CVstruct.png  deep-history.png  shallow-history.png  dependency.png  
 end_state.png  generalisation.png  initial_state.png  interface.png  join.png  junction.png  datatype.png  enum.png  
-message-synchronous.png  message-asynchronous.png  note.png  object.png  startlogo.png  template.png  text.png  
+message-synchronous.png  message-asynchronous.png  note.png  object_flow.png  object.png  startlogo.png  template.png  text.png  
 class.png  uniassociation.png  usecase.png  branch.png  fork.png  state-fork.png  package.png  artifact.png  
 box.png  node.png  entity.png  relationship.png  subsystem.png cursor-actor.png  message-found.png  accept_signal.png  accept_time_event.png  send_signal.png    cursor-andline.png  
 cursor-choice-rhomb.png  cursor-choice-round.png  cursor-combined_fragment.png  cursor-deep-history.png  cursor-join.png  cursor-junction.png  
 cursor-shallow-history.png  cursor-state-fork.png  cursor-usecase.png  cursor-initial_state.png  cursor-package.png  
 cursor-aggregation.png  cursor-component.png  cursor-containment.png  cursor-interface.png  cursor-datatype.png  
-cursor-enum.png  cursor-text.png  cursor-anchor.png  cursor-composition.png  cursor-message-asynchronous.png  
+cursor-enum.png  cursor-text.png  cursor-anchor.png  cursor-object_flow.png  cursor-composition.png  cursor-message-asynchronous.png  
 cursor-class.png  cursor-artifact.png  cursor-dependency.png  cursor-message-synchronous.png  
 cursor-uniassociation.png  cursor-association.png  cursor-end_state.png  cursor-node.png  cursor-box.png  
 cursor-fork.png  cursor-note.png  cursor-branch.png  cursor-generalisation.png  cursor-object.png  
** branches/work/isi-umbrello/umbrello/umbrello/pics/cursor-object_flow.png #property svn:executable
   + *
** branches/work/isi-umbrello/umbrello/umbrello/pics/cursor-object_flow.png #property svn:mime-type
   + application/octet-stream
** branches/work/isi-umbrello/umbrello/umbrello/pics/object_flow.png #property svn:executable
   + *
** branches/work/isi-umbrello/umbrello/umbrello/pics/object_flow.png #property svn:mime-type
   + application/octet-stream
--- branches/work/isi-umbrello/umbrello/umbrello/worktoolbar.cpp #632732:632733
@@ -145,6 +145,7 @@
         insertHotBtn(tbb_Branch);
         insertHotBtn(tbb_Fork);
         insertHotBtn(tbb_Activity_Transition);
+        insertHotBtn(tbb_Object_Flow);
         insertHotBtn(tbb_Send_Signal);
         insertHotBtn(tbb_Accept_Signal);
         insertHotBtn(tbb_Accept_Time_Event);
@@ -305,6 +306,7 @@
         { tbb_Activity, i18n("Activity"), "usecase.png", SLOT(slotActivity()) },
         { tbb_State, i18n("State"), "usecase.png", SLOT(slotState()) },
         { tbb_End_Activity, i18n("End Activity"), "end_state.png", SLOT(slotEnd_Activity()) },
+        { tbb_Object_Flow, i18n("Object Flow"), "object_flow.png", SLOT(slotObject_Flow()) },
         { tbb_Initial_Activity, i18n("Initial Activity"), "initial_state.png", SLOT(slotInitial_Activity()) },
         { tbb_Coll_Message, i18n("Message"), "message-asynchronous.png", SLOT(slotColl_Message()) }
     };
@@ -379,6 +381,7 @@
 void WorkToolBar::slotEnd_State() {buttonChanged(tbb_End_State);}
 void WorkToolBar::slotInitial_Activity() {buttonChanged(tbb_Initial_Activity);}
 void WorkToolBar::slotActivity() {buttonChanged(tbb_Activity);}
+void WorkToolBar::slotObject_Flow() {buttonChanged(tbb_Object_Flow);}
 void WorkToolBar::slotEnd_Activity() {buttonChanged(tbb_End_Activity);}
 void WorkToolBar::slotBranch() {buttonChanged(tbb_Branch);}
 void WorkToolBar::slotFork() {buttonChanged(tbb_Fork);}
--- branches/work/isi-umbrello/umbrello/umbrello/worktoolbar.h #632732:632733
@@ -117,6 +117,7 @@
         tbb_Initial_Activity,
         tbb_Activity,
         tbb_End_Activity,
+        tbb_Object_Flow,
         tbb_Branch,
         tbb_Fork,
         tbb_DeepHistory,
@@ -235,6 +236,7 @@
     void slotInitial_Activity();
     void slotActivity();
     void slotEnd_Activity();
+    void slotObject_Flow();
     void slotBranch();
     void slotSend_Signal();
     void slotAccept_Signal();