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

[Caroline Bourdeu d'Aguerre]

SVN commit 625065 by bourdeu:

Add the tbb_Seq_Combined_Fragment in the file


 M  +5 -2      toolbarstateother.cpp  


--- branches/work/isi-umbrello/umbrello/umbrello/toolbarstateother.cpp #625064:625065
@@ -147,10 +147,14 @@
         Dialog_Utils::askNameForWidget(
             umlWidget, i18n("Enter Activity Name"),
             i18n("Enter the name of the new activity:"), i18n("new activity"));
-    } /* Florence MATTLER */else if (getButton() == WorkToolBar::tbb_Seq_Precondition) {
+    } else if (getButton() == WorkToolBar::tbb_Seq_Precondition) {
         Dialog_Utils::askNameForWidget(
             umlWidget, i18n("Enter Precondition Name"),
             i18n("Enter the precondition"), i18n("new precondition"));
+    } else if (getButton() == WorkToolBar::tbb_Seq_Combined_Fragment) {
+        Dialog_Utils::askNameForWidget(
+            umlWidget, i18n("Enter Combined Fragment Name"),
+            i18n("Enter the Combined Fragment"), i18n("new Combined Fragment"));
     } else if (getButton() == WorkToolBar::tbb_State) {
         Dialog_Utils::askNameForWidget(
             umlWidget, i18n("Enter State Name"),
@@ -160,7 +164,6 @@
         FloatingTextWidget* ft = (FloatingTextWidget*) umlWidget;
         ft->changeTextDlg();
     }
-
     // Create the widget. Some setup functions can remove the widget.
     if (umlWidget != NULL) {
         m_pUMLView->setupNewWidget(umlWidget);