[Uml-devel] branches/KDE/4.8/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 1281802 by okellogg:

Merge 1272343:1272517 and 1272519:1272553 from trunk.
Exclude r1272518,r1272519 (new feature: widget color settings) due to i18n
strings introduced.


 M  +2 -2      dialogs/umlroleproperties.cpp  
 M  +4 -4      dialogs/umlrolepropertiesbase.ui  
 U             umlrole.cpp  
 M  +1 -2      widgets/activitywidget.cpp  
 M  +1 -2      widgets/actorwidget.cpp  
 M  +1 -11     widgets/artifactwidget.cpp  
 M  +0 -1      widgets/artifactwidget.h  
 M  +8 -8      widgets/associationwidget.cpp  
 M  +4 -5      widgets/boxwidget.cpp  
 M  +1 -1      widgets/boxwidget.h  
 M  +1 -2      widgets/categorywidget.cpp  
 M  +2 -4      widgets/classifierwidget.cpp  
 M  +1 -2      widgets/combinedfragmentwidget.cpp  
 M  +1 -11     widgets/componentwidget.cpp  
 M  +0 -3      widgets/componentwidget.h  
 M  +2 -12     widgets/datatypewidget.cpp  
 M  +0 -2      widgets/datatypewidget.h  
 M  +10 -19    widgets/entitywidget.cpp  
 M  +0 -3      widgets/entitywidget.h  
 M  +13 -22    widgets/enumwidget.cpp  
 M  +0 -4      widgets/enumwidget.h  
 M  +1 -2      widgets/floatingdashlinewidget.cpp  
 M  +311 -321  widgets/floatingtextwidget.cpp  
 M  +11 -25    widgets/floatingtextwidget.h  
 M  +66 -71    widgets/forkjoinwidget.cpp  
 M  +8 -22     widgets/forkjoinwidget.h  
 M  +3 -4      widgets/messagewidget.cpp  
 M  +2 -3      widgets/nodewidget.cpp  
 M  +1 -2      widgets/notewidget.cpp  
 M  +1 -2      widgets/objectnodewidget.cpp  
 M  +1 -3      widgets/objectwidget.cpp  
 M  +1 -8      widgets/packagewidget.cpp  
 M  +0 -5      widgets/packagewidget.h  
 M  +1 -2      widgets/pinwidget.cpp  
 M  +1 -2      widgets/preconditionwidget.cpp  
 M  +2 -2      widgets/regionwidget.cpp  
 M  +1 -2      widgets/signalwidget.cpp  
 M  +1 -2      widgets/statewidget.cpp  
 M  +8 -6      widgets/umlwidget.cpp  
 M  +2 -2      widgets/umlwidget.h  
 M  +1 -2      widgets/usecasewidget.cpp  
 M  +5 -5      widgets/widgetbase.cpp  
 M  +2 -2      widgets/widgetbase.h  


http://websvn.kde.org/?view=rev&revision=1281802