[Uml-devel] branches/work/isi-umbrello/umbrello/umbrello
Florence Mattler
florence.mattler at libertysurf.fr
Tue Jan 16 17:35:30 UTC 2007
SVN commit 624186 by mattler:
new button in sequence diagram for preconditions
M +21 -1 pics/CMakeLists.txt
AM pics/cursor-precondition.png
AM pics/precondition.png
M +2 -1 toolbarstateassociation.cpp
M +3 -2 toolbarstatefactory.cpp
M +3 -0 worktoolbar.cpp
M +3 -1 worktoolbar.h
--- branches/work/isi-umbrello/umbrello/umbrello/pics/CMakeLists.txt #624185:624186
@@ -1,5 +1,25 @@
-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 )
+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 precondition.png cursor-precondition.png DESTINATION
+${DATA_INSTALL_DIR}/umbrello/pics )
kde4_install_icons( ${ICON_INSTALL_DIR} )
** branches/work/isi-umbrello/umbrello/umbrello/pics/cursor-precondition.png #property svn:mime-type
+ application/octet-stream
** branches/work/isi-umbrello/umbrello/umbrello/pics/precondition.png #property svn:mime-type
+ application/octet-stream
--- branches/work/isi-umbrello/umbrello/umbrello/toolbarstateassociation.cpp #624185:624186
@@ -193,7 +193,8 @@
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_Seq_Precondition:
+ 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;
case WorkToolBar::tbb_Activity_Transition: at = at_Activity; break;
--- branches/work/isi-umbrello/umbrello/umbrello/toolbarstatefactory.cpp #624185:624186
@@ -86,8 +86,9 @@
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_Seq_Precondition: return 2;
+
+ // Arrow pointer
case WorkToolBar::tbb_Arrow: return 3;
// Other.
--- branches/work/isi-umbrello/umbrello/umbrello/worktoolbar.cpp #624185:624186
@@ -113,6 +113,7 @@
insertHotBtn(tbb_Seq_Message_Synchronous);
insertHotBtn(tbb_Seq_Message_Asynchronous);
insertHotBtn(tbb_Seq_Combined_Fragment);
+ insertHotBtn(tbb_Seq_Precondition);
break;
case Uml::dt_Collaboration:
@@ -251,6 +252,7 @@
{ 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_Seq_Precondition, i18n("Precondition"),"precondition.png",SLOT(slotSeq_Precondition()) },
{ tbb_Association, i18n("Association"), "association.png", SLOT(slotAssociation()) },
{ tbb_Containment, i18n("Containment"), "containment.png", SLOT(slotContainment()) },
{ tbb_Anchor, i18n("Anchor"), "anchor.png", SLOT(slotAnchor()) },
@@ -333,6 +335,7 @@
void WorkToolBar::slotSeq_Message_Synchronous() {buttonChanged(tbb_Seq_Message_Synchronous);}
void WorkToolBar::slotSeq_Message_Asynchronous(){buttonChanged(tbb_Seq_Message_Asynchronous);}
void WorkToolBar::slotSeq_Combined_Fragment(){buttonChanged(tbb_Seq_Combined_Fragment);}
+void WorkToolBar::slotSeq_Precondition(){buttonChanged(tbb_Seq_Precondition);}
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 #624185:624186
@@ -83,7 +83,8 @@
tbb_Seq_Message_Synchronous,
tbb_Seq_Message_Asynchronous,
tbb_Seq_Combined_Fragment,
- tbb_Composition,
+ tbb_Seq_Precondition,
+ tbb_Composition,
tbb_Relationship,
tbb_UniAssociation,
tbb_State_Transition,
@@ -197,6 +198,7 @@
void slotSeq_Message_Synchronous();
void slotSeq_Message_Asynchronous();
void slotSeq_Combined_Fragment();
+ void slotSeq_Precondition();
void slotComposition();
void slotRelationship();
void slotUniAssociation();
More information about the umbrello-devel
mailing list