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

[Andi Fischer]

SVN commit 962898 by fischer:

sync between trunk and branch to reduce the difference.

 M  +1 -1      clipboard/umlclipboard.cpp  
 M  +2 -2      cmds/widget/cmd_changeFillColor.cpp  
 M  +0 -1      codegenerators/cpp/cppcodegenerationformbase.ui  
 M  +0 -1      codegenerators/d/dcodegenerationformbase.ui  
 M  +0 -1      codegenerators/java/javacodegenerationformbase.ui  
 M  +0 -1      codegenerators/ruby/rubycodegenerationformbase.ui  
 M  +0 -1      codegenwizard/codegenoptionspage.ui  
 M  +37 -12    controller/floatingtextwidgetcontroller.cpp  
 M  +4 -12     controller/floatingtextwidgetcontroller.h  
 M  +1 -1      dialogs/activitydialog.cpp  
 M  +1 -1      dialogs/assocrolepage.cpp  
 M  +2 -2      dialogs/classgenpage.cpp  
 M  +2 -2      dialogs/classoptionspage.cpp  
 M  +1 -1      dialogs/classpropdlg.cpp  
 M  +0 -1      dialogs/codevieweroptionsbase.ui  
 M  +0 -1      dialogs/diagrampropertiespage.ui  
 M  +0 -1      dialogs/exportallviewsdialogbase.ui  
 M  +1 -1      dialogs/objectnodedialog.cpp  
 M  +2 -2      dialogs/statedialog.cpp  
 M  +0 -1      dialogs/umlrolepropertiesbase.ui  
 M  +1 -1      dialogs/umlwidgetcolorpage.cpp  
 M  +2 -2      dialogs/umlwidgetcolorpage.h  
 M  +2 -3      optionstate.cpp  
 M  +14 -6     petaltree2uml.cpp  
 M  +1 -2      petaltree2uml.h  
 M  +1 -1      toolbarstate.cpp  
 M  +1 -1      toolbarstateassociation.cpp  
 M  +1 -1      toolbarstatemessages.cpp  
 M  +1 -1      uml.cpp  
 M  +1 -1      umldoc.cpp  
 M  +1 -2      widgets/activitywidget.cpp  
 M  +1 -2      widgets/activitywidget.h  
 M  +1 -2      widgets/actorwidget.cpp  
 M  +1 -2      widgets/artifactwidget.cpp  
 M  +1 -1      widgets/associationwidget.cpp  
 M  +1 -1      widgets/categorywidget.cpp  
 M  +1 -2      widgets/classifierwidget.cpp  
 M  +1 -2      widgets/classifierwidget.h  
 M  +1 -2      widgets/combinedfragmentwidget.cpp  
 M  +1 -2      widgets/componentwidget.cpp  
 M  +1 -2      widgets/datatypewidget.cpp  
 M  +1 -2      widgets/entitywidget.cpp  
 M  +1 -2      widgets/enumwidget.cpp  
 M  +1 -2      widgets/floatingdashlinewidget.cpp  
 M  +1 -2      widgets/messagewidget.h  
 M  +1 -2      widgets/nodewidget.cpp  
 M  +1 -1      widgets/notewidget.cpp  
 M  +1 -2      widgets/objectnodewidget.cpp  
 M  +1 -2      widgets/objectwidget.h  
 M  +2 -3      widgets/packagewidget.cpp  
 M  +1 -2      widgets/preconditionwidget.cpp  
 M  +1 -2      widgets/seqlinewidget.cpp  
 M  +1 -1      widgets/signalwidget.cpp  
 M  +1 -1      widgets/statewidget.h  
 M  +1 -1      widgets/toolbarstateonewidget.cpp  
 M  +1 -2      widgets/usecasewidget.cpp