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

[Andi Fischer]

SVN commit 1274704 by fischer:

Changes taken from trunk applied.

 M  +5 -1      CMakeLists.txt  
 M  +2 -2      cmds/widget/cmd_changeTextColor.cpp  
 M  +8 -38     dialogs/activitydialog.cpp  
 M  +5 -20     dialogs/activitydialog.h  
 M  +28 -39    dialogs/assocpropdlg.cpp  
 M  +5 -4      dialogs/assocpropdlg.h  
 M  +15 -25    dialogs/classpropdlg.cpp  
 M  +6 -8      dialogs/classpropdlg.h  
 A             dialogs/codeimportoptionspage.cpp   [License: GPL (v2+)]
 A             dialogs/codeimportoptionspage.h   [License: GPL (v2+)]
 A             dialogs/codeimportoptionspage.ui  
 A             dialogs/dialogbase.cpp   [License: GPL (v2+)]
 A             dialogs/dialogbase.h   [License: GPL (v2+)]
 M  +8 -37     dialogs/objectnodedialog.cpp  
 M  +5 -22     dialogs/objectnodedialog.h  
 M  +1 -2      dialogs/selectopdlg.cpp  
 M  +1 -1      dialogs/selectopdlg.h  
 M  +71 -17    dialogs/settingsdlg.cpp  
 M  +9 -1      dialogs/settingsdlg.h  
 M  +7 -39     dialogs/statedialog.cpp  
 M  +4 -19     dialogs/statedialog.h  
 M  +16 -16    dialogs/umlviewdialog.cpp  
 M  +4 -4      dialogs/umlviewdialog.h  
 D             dialogs/umlwidgetcolorpage.cpp  
 D             dialogs/umlwidgetcolorpage.h  
 A             dialogs/umlwidgetstylepage.cpp   [License: GPL (v2+)]
 A             dialogs/umlwidgetstylepage.h   [License: GPL (v2+)]
 M  +21 -21    docwindow.cpp  
 M  +1 -1      docwindow.h  
 M  +1 -1      main.cpp  
 M  +6 -3      umlviewimageexportermodel.cpp  


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