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

[Caroline Bourdeu d'Aguerre]

SVN commit 623876 by bourdeu:

Add a new button in the toolbar of the sequence diagram. This button is for the creation of a combined fragment on the 
diagram.


 M  +1 -1      pics/CMakeLists.txt  
 AM            pics/combined_fragment.png  
 M  +1 -0      toolbarstateassociation.cpp  
 M  +1 -0      toolbarstatefactory.cpp  
 M  +5 -1      worktoolbar.cpp  
 M  +2 -0      worktoolbar.h  


--- branches/work/isi-umbrello/umbrello/umbrello/pics/CMakeLists.txt #623875:623876
@@ -1,5 +1,5 @@
 
-install( FILES actor.png  aggregation.png  align_left.png  align_right.png  align_top.png  align_bottom.png  align_vert_middle.png  align_hori_middle.png  align_vert_distribute.png  align_hori_distribute.png  anchor.png  andline.png  arrow.png  association.png  choice-rhomb.png  choice-round.png  component.png  composition.png  containment.png  CVglobal_meth.png  CVglobal_var.png  CVimplementation_meth.png  CVimplementation_signal.png  CVimplementation_slot.png  CVimplementation_var.png  CVnamespace.png  CVprivate_meth.png  CVprivate_signal.png  CVprivate_slot.png  CVprivate_var.png  CVprotected_meth.png  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  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  cursor-andline.png  cursor-choice-rhomb.png  cursor-choice-round.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-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  cursor-entity.png  cursor-relationship.png  DESTINATION  ${DATA_INSTALL_DIR}/umbrello/pics )
+install( FILES actor.png  aggregation.png  align_left.png  align_right.png  align_top.png  align_bottom.png  align_vert_middle.png  align_hori_middle.png  align_vert_distribute.png  align_hori_distribute.png  anchor.png  andline.png  arrow.png  association.png  choice-rhomb.png  choice-round.png  combined_fragment.png  component.png  composition.png  containment.png  CVglobal_meth.png  CVglobal_var.png  CVimplementation_meth.png  CVimplementation_signal.png  CVimplementation_slot.png  CVimplementation_var.png  CVnamespace.png  CVprivate_meth.png  CVprivate_signal.png  CVprivate_slot.png  CVprivate_var.png  CVprotected_meth.png  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  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  cursor-andline.png  cursor-choice-rhomb.png  cursor-choice-round.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-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  cursor-entity.png  cursor-relationship.png  DESTINATION  ${DATA_INSTALL_DIR}/umbrello/pics )
 
 kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
** branches/work/isi-umbrello/umbrello/umbrello/pics/combined_fragment.png #property svn:mime-type
   + application/octet-stream
--- branches/work/isi-umbrello/umbrello/umbrello/toolbarstateassociation.cpp #623875:623876
@@ -192,6 +192,7 @@
         case WorkToolBar::tbb_Dependency:               at = at_Dependency;        break;
         case WorkToolBar::tbb_Containment:              at = at_Containment;       break;
         case WorkToolBar::tbb_Seq_Message_Synchronous:
+        case WorkToolBar::tbb_Seq_Combined_Fragment:
         case WorkToolBar::tbb_Seq_Message_Asynchronous: at = at_Seq_Message;       break;
         case WorkToolBar::tbb_Coll_Message:             at = at_Coll_Message;      break;
         case WorkToolBar::tbb_State_Transition:         at = at_State;             break;
--- branches/work/isi-umbrello/umbrello/umbrello/toolbarstatefactory.cpp #623875:623876
@@ -85,6 +85,7 @@
         // Messages
     case WorkToolBar::tbb_Seq_Message_Synchronous:  return 2;
     case WorkToolBar::tbb_Seq_Message_Asynchronous: return 2;
+    case WorkToolBar::tbb_Seq_Combined_Fragment: return 2;
 
         // Arrow pointer
     case WorkToolBar::tbb_Arrow: return 3;
--- branches/work/isi-umbrello/umbrello/umbrello/worktoolbar.cpp #623875:623876
@@ -112,6 +112,7 @@
         insertHotBtn(tbb_Object);
         insertHotBtn(tbb_Seq_Message_Synchronous);
         insertHotBtn(tbb_Seq_Message_Asynchronous);
+        insertHotBtn(tbb_Seq_Combined_Fragment);
         break;
 
     case Uml::dt_Collaboration:
@@ -249,6 +250,7 @@
         { tbb_Object, i18n("Object"), "object.png", SLOT(slotObject()) },
         { tbb_Seq_Message_Synchronous, i18n("Synchronous Message"), "message-synchronous.png", SLOT(slotSeq_Message_Synchronous()) },
         { tbb_Seq_Message_Asynchronous, i18n("Asynchronous Message"), "message-asynchronous.png", SLOT(slotSeq_Message_Asynchronous()) },
+        { tbb_Seq_Combined_Fragment, i18n("Combined Fragment"), "combined_fragment.png", SLOT(slotSeq_Combined_Fragment()) },
         { tbb_Association, i18n("Association"), "association.png", SLOT(slotAssociation()) },
         { tbb_Containment, i18n("Containment"), "containment.png", SLOT(slotContainment()) },
         { tbb_Anchor, i18n("Anchor"), "anchor.png", SLOT(slotAnchor()) },
@@ -293,6 +295,7 @@
         { tbb_Initial_Activity, i18n("Initial Activity"), "initial_state.png", SLOT(slotInitial_Activity()) },
         { tbb_Coll_Message, i18n("Message"), "message-asynchronous.png", SLOT(slotColl_Message()) }
     };
+
     KStandardDirs * dirs = KGlobal::dirs();
     QString dataDir = dirs->findResourceDir( "data", "umbrello/pics/object.png" );
     dataDir += "/umbrello/pics/";
@@ -328,7 +331,8 @@
 void WorkToolBar::slotContainment() {buttonChanged(tbb_Containment);}
 void WorkToolBar::slotColl_Message() {buttonChanged(tbb_Coll_Message);}
 void WorkToolBar::slotSeq_Message_Synchronous() {buttonChanged(tbb_Seq_Message_Synchronous);}
-void WorkToolBar::slotSeq_Message_Asynchronous() {buttonChanged(tbb_Seq_Message_Asynchronous);}
+void WorkToolBar::slotSeq_Message_Asynchronous(){buttonChanged(tbb_Seq_Message_Asynchronous);}
+void WorkToolBar::slotSeq_Combined_Fragment(){buttonChanged(tbb_Seq_Combined_Fragment);}
 void WorkToolBar::slotComposition() {buttonChanged(tbb_Composition);}
 void WorkToolBar::slotRelationship() {buttonChanged(tbb_Relationship);}
 void WorkToolBar::slotUniAssociation() {buttonChanged(tbb_UniAssociation);}
--- branches/work/isi-umbrello/umbrello/umbrello/worktoolbar.h #623875:623876
@@ -82,6 +82,7 @@
         tbb_Coll_Message,
         tbb_Seq_Message_Synchronous,
         tbb_Seq_Message_Asynchronous,
+        tbb_Seq_Combined_Fragment,
         tbb_Composition,
         tbb_Relationship,
         tbb_UniAssociation,
@@ -195,6 +196,7 @@
     void slotColl_Message();
     void slotSeq_Message_Synchronous();
     void slotSeq_Message_Asynchronous();
+    void slotSeq_Combined_Fragment();
     void slotComposition();
     void slotRelationship();
     void slotUniAssociation();