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

[Florence Mattler]

SVN commit 628377 by mattler:

Add a new button in sequence diagram toolbar to notify the end of life of an object.


 M  +1 -1      pics/CMakeLists.txt  
 AM            pics/cursor-end_of_life.png  
 AM            pics/end_of_life.png  
 M  +1 -0      toolbarstatefactory.cpp  
 M  +2 -1      umlnamespace.h  
 M  +2 -7      umlview.cpp  
 M  +3 -0      worktoolbar.cpp  
 M  +2 -0      worktoolbar.h  


--- branches/work/isi-umbrello/umbrello/umbrello/pics/CMakeLists.txt #628376:628377
@@ -19,7 +19,7 @@
 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 message-found.png 
-cursor-message-found.png message-lost.png cursor-message-lost.png DESTINATION  
+cursor-message-found.png message-lost.png cursor-message-lost.png end_of_life.png cursor-end_of_life.png DESTINATION  
 ${DATA_INSTALL_DIR}/umbrello/pics )
 
 kde4_install_icons( ${ICON_INSTALL_DIR}   )
** branches/work/isi-umbrello/umbrello/umbrello/pics/cursor-end_of_life.png #property svn:mime-type
   + application/octet-stream
** branches/work/isi-umbrello/umbrello/umbrello/pics/end_of_life.png #property svn:mime-type
   + application/octet-stream
--- branches/work/isi-umbrello/umbrello/umbrello/toolbarstatefactory.cpp #628376:628377
@@ -91,6 +91,7 @@
     case WorkToolBar::tbb_Seq_Message_Lost: 	    return 2;
     
     case WorkToolBar::tbb_Seq_Precondition: return 4;
+    case WorkToolBar::tbb_Seq_End_Of_Life: return 4;
     
     	// Arrow pointer
     case WorkToolBar::tbb_Arrow: return 3;
--- branches/work/isi-umbrello/umbrello/umbrello/umlnamespace.h #628376:628377
@@ -106,7 +106,8 @@
     wt_Association,             // has UMLObject representation
     wt_ForkJoin,                 // does not have UMLObject representation
     wt_Precondition,		// does not have UMLObject representation
-    wt_Combined_Fragment	// does not have UMLObject representation
+    wt_Combined_Fragment,	// does not have UMLObject representation
+    wt_End_Of_Life		
 };
 
 enum Diagram_Type
--- branches/work/isi-umbrello/umbrello/umbrello/umlview.cpp #628376:628377
@@ -98,7 +98,6 @@
 #include "object_factory.h"
 #include "umlwidget.h"
 #include "toolbarstatefactory.h"
-#include "preconditionwidget.h"
 
 
 // control the manual DoubleBuffering of QCanvas
@@ -3130,12 +3129,8 @@
 
     QString tag  = widgetElement.tagName();
     QString idstr  = widgetElement.attribute( "xmi.id", "-1" );
-    if (tag == "preconditionwidget") {
-	widget = new PreconditionWidget(this,NULL,Uml::id_Reserved);
-    }
-    else {
-	widget = Widget_Factory::makeWidgetFromXMI(tag, idstr, this);
-    }
+    widget = Widget_Factory::makeWidgetFromXMI(tag, idstr, this);
+    
     if (widget == NULL)
         return NULL;
     if (!widget->loadFromXMI(widgetElement)) {
--- branches/work/isi-umbrello/umbrello/umbrello/worktoolbar.cpp #628376:628377
@@ -116,6 +116,7 @@
 	insertHotBtn(tbb_Seq_Message_Lost);
         insertHotBtn(tbb_Seq_Combined_Fragment);
 	insertHotBtn(tbb_Seq_Precondition);
+	insertHotBtn(tbb_Seq_End_Of_Life);
         break;
 
     case Uml::dt_Collaboration:
@@ -256,6 +257,7 @@
         { tbb_Seq_Message_Found, i18n("Found Message"), "message-found.png", SLOT(slotSeq_Message_Found()) },
         { tbb_Seq_Message_Lost, i18n("Lost Message"), "message-lost.png", SLOT(slotSeq_Message_Lost()) },
         { tbb_Seq_Combined_Fragment, i18n("Combined Fragment"), "combined_fragment.png", SLOT(slotSeq_Combined_Fragment()) },
+	{ tbb_Seq_End_Of_Life, i18n("End of life"), "end_of_life.png", SLOT(slotSeq_End_Of_Life()) },
 	{ 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()) },
@@ -342,6 +344,7 @@
 void WorkToolBar::slotSeq_Message_Lost(){buttonChanged(tbb_Seq_Message_Lost);}
 void WorkToolBar::slotSeq_Combined_Fragment(){buttonChanged(tbb_Seq_Combined_Fragment);}
 void WorkToolBar::slotSeq_Precondition(){buttonChanged(tbb_Seq_Precondition);}
+void WorkToolBar::slotSeq_End_Of_Life(){buttonChanged(tbb_Seq_End_Of_Life);}
 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 #628376:628377
@@ -86,6 +86,7 @@
 	tbb_Seq_Message_Lost,
         tbb_Seq_Combined_Fragment,
         tbb_Seq_Precondition,
+	tbb_Seq_End_Of_Life,
 	tbb_Composition,
         tbb_Relationship,
         tbb_UniAssociation,
@@ -203,6 +204,7 @@
     void slotSeq_Message_Lost();
     void slotSeq_Combined_Fragment();
     void slotSeq_Precondition();
+    void slotSeq_End_Of_Life();
     void slotComposition();
     void slotRelationship();
     void slotUniAssociation();