[Uml-devel] branches/work/isi-umbrello/umbrello/umbrello
Caroline Bourdeu d'Aguerre
cbda at free.fr
Wed Feb 21 16:10:44 UTC 2007
SVN commit 635991 by bourdeu:
Change the expansion_region_widget in region_widget.
M +1 -1 CMakeLists.txt
D expansionregionwidget.cpp
D expansionregionwidget.h
M +2 -2 pics/CMakeLists.txt
D pics/cursor-expansion_region.png
AM pics/cursor-region.png
D pics/expansion_region.png
AM pics/region.png
AM regionwidget.cpp [License: GPL (v2+)]
AM regionwidget.h [License: GPL (v2+)]
M +3 -3 toolbarstateother.cpp
M +9 -9 widget_factory.cpp
M +3 -3 worktoolbar.cpp
M +2 -2 worktoolbar.h
--- branches/work/isi-umbrello/umbrello/umbrello/CMakeLists.txt #635990:635991
@@ -286,7 +286,7 @@
entity.cpp
entityattribute.cpp
entitywidget.cpp
- expansionregionwidget.cpp
+ regionwidget.cpp
enum.cpp
enumliteral.cpp
enumwidget.cpp
--- branches/work/isi-umbrello/umbrello/umbrello/pics/CMakeLists.txt #635990:635991
@@ -1,7 +1,7 @@
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 expansion_region.png composition.png containment.png CVglobal_meth.png CVglobal_var.png CVimplementation_meth.png
+andline.png arrow.png association.png choice-rhomb.png choice-round.png combined_fragment.png component.png region.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
@@ -17,7 +17,7 @@
cursor-class.png cursor-artifact.png cursor-dependency.png cursor-message-synchronous.png
cursor-uniassociation.png cursor-association.png cursor-end_state.png cursor-final_activity.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 cursor-send_signal.png cursor-accept_signal.png cursor-accept_time_event.png cursor-expansion_region.png
+cursor-entity.png cursor-relationship.png precondition.png cursor-precondition.png cursor-send_signal.png cursor-accept_signal.png cursor-accept_time_event.png cursor-region.png
cursor-message-found.png message-lost.png cursor-message-lost.png end_of_life.png cursor-end_of_life.png exception.png
cursor-exception.png DESTINATION
${DATA_INSTALL_DIR}/umbrello/pics )
** branches/work/isi-umbrello/umbrello/umbrello/pics/cursor-region.png #property svn:mime-type
+ application/octet-stream
** branches/work/isi-umbrello/umbrello/umbrello/pics/region.png #property svn:mime-type
+ application/octet-stream
** branches/work/isi-umbrello/umbrello/umbrello/regionwidget.cpp #property svn:executable
+ *
** branches/work/isi-umbrello/umbrello/umbrello/regionwidget.h #property svn:executable
+ *
--- branches/work/isi-umbrello/umbrello/umbrello/toolbarstateother.cpp #635990:635991
@@ -21,7 +21,7 @@
#include "activitywidget.h"
#include "boxwidget.h"
#include "dialog_utils.h"
-#include "expansionregionwidget.h"
+#include "regionwidget.h"
#include "floatingtextwidget.h"
#include "forkjoinwidget.h"
#include "notewidget.h"
@@ -152,8 +152,8 @@
umlWidget = new SignalWidget(m_pUMLView, SignalWidget::Time);
break;
- case WorkToolBar::tbb_Expansion_Region:
- umlWidget = new ExpansionRegionWidget(m_pUMLView);
+ case WorkToolBar::tbb_Region:
+ umlWidget = new RegionWidget(m_pUMLView);
break;
case WorkToolBar::tbb_Seq_Combined_Fragment:
--- branches/work/isi-umbrello/umbrello/umbrello/widget_factory.cpp #635990:635991
@@ -37,7 +37,7 @@
#include "enum.h"
#include "entitywidget.h"
#include "entity.h"
-#include "expansionregionwidget.h"
+#include "regionwidget.h"
#include "actorwidget.h"
#include "actor.h"
#include "usecasewidget.h"
@@ -167,13 +167,13 @@
|| tag == "preconditionwidget" || tag == "endoflifewidget"
|| tag == "combinedFragmentwidget" || tag == "signalwidget"
|| tag == "objectflowwidget" || tag == "floatingdashlinewidget"
- || tag == "expansionregionwidget" ||
+ || tag == "regionwidget"
// tests for backward compatibility:
- tag == "UML:StateWidget" || tag == "UML:NoteWidget"
- || tag=="UML:CombinedFragmentWidget"|| tag == "UML:FloatingTextWidget"
- || tag == "UML:SignalWidget" || tag == "UML:ActivityWidget"
- || tag == "UML:EndOfLifeWidget" ||tag == "UML:PreconditionWidget"
- ||tag == "UML:FloatingDashLineWidget" || tag == "UML:ObjectFlowWidget" ) {
+ || tag == "UML:StateWidget" || tag == "UML:NoteWidget"
+ || tag =="UML:CombinedFragmentWidget" || tag == "UML:FloatingTextWidget"
+ || tag == "UML:SignalWidget" || tag == "UML:ActivityWidget"
+ || tag == "UML:EndOfLifeWidget" || tag == "UML:PreconditionWidget"
+ || tag == "UML:FloatingDashLineWidget" || tag == "UML:ObjectFlowWidget" ) {
// Loading of widgets which do NOT represent any UMLObject,
// just graphic stuff with no real model information
//FIXME while boxes and texts are just diagram objects, activities and
@@ -212,8 +212,8 @@
} else if (tag == "objectflowwidget"
|| tag == "UML:ObjectFlowWidget" ) {
widget = new ObjectFlowWidget(view,Uml::id_Reserved);
- } else if (tag == "expansionregionwidget" ) {
- widget = new ExpansionRegionWidget(view, Uml::id_Reserved);
+ } else if (tag == "regionwidget" ) {
+ widget = new RegionWidget(view, Uml::id_Reserved);
}
}
else
--- branches/work/isi-umbrello/umbrello/umbrello/worktoolbar.cpp #635990:635991
@@ -151,7 +151,7 @@
insertHotBtn(tbb_Send_Signal);
insertHotBtn(tbb_Accept_Signal);
insertHotBtn(tbb_Accept_Time_Event);
- insertHotBtn(tbb_Expansion_Region);
+ insertHotBtn(tbb_Region);
break;
case Uml::dt_Component:
@@ -281,7 +281,7 @@
{ tbb_UseCase, i18n("Use Case"), "usecase.png", SLOT(slotUseCase()) },
{ tbb_Class, i18n("Class"), "class.png", SLOT(slotClass()) },
{ tbb_Initial_State, i18n("Initial State"), "initial_state.png", SLOT(slotInitial_State()) },
- { tbb_Expansion_Region, i18n("Expansion Region"), "expansion_region.png", SLOT(slotExpansion_Region()) },
+ { tbb_Region, i18n("Region"), "region.png", SLOT(slotRegion()) },
{ tbb_End_State, i18n("End State"), "end_state.png", SLOT(slotEnd_State()) },
{ tbb_Branch, i18n("Branch/Merge"), "branch.png", SLOT(slotBranch()) },
{ tbb_Send_Signal, i18n("Send signal"), "send_signal.png", SLOT(slotSend_Signal()) },
@@ -385,7 +385,7 @@
void WorkToolBar::slotAccept_Signal() {buttonChanged(tbb_Accept_Signal);}
void WorkToolBar::slotAccept_Time_Event() {buttonChanged(tbb_Accept_Time_Event);}
void WorkToolBar::slotEnd_State() {buttonChanged(tbb_End_State);}
-void WorkToolBar::slotExpansion_Region() {buttonChanged(tbb_Expansion_Region);}
+void WorkToolBar::slotRegion() {buttonChanged(tbb_Region);}
void WorkToolBar::slotInitial_Activity() {buttonChanged(tbb_Initial_Activity);}
void WorkToolBar::slotActivity() {buttonChanged(tbb_Activity);}
void WorkToolBar::slotObject_Flow() {buttonChanged(tbb_Object_Flow);}
--- branches/work/isi-umbrello/umbrello/umbrello/worktoolbar.h #635990:635991
@@ -113,7 +113,7 @@
tbb_Object,
tbb_Initial_State,
tbb_State,
- tbb_Expansion_Region,
+ tbb_Region,
tbb_End_State,
tbb_Initial_Activity,
tbb_Activity,
@@ -233,7 +233,7 @@
void slotNode();
void slotArtifact();
void slotObject();
- void slotExpansion_Region();
+ void slotRegion();
void slotInitial_State();
void slotState();
void slotEnd_State();
More information about the umbrello-devel
mailing list