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

[Oliver Kellogg]

SVN commit 1281901 by okellogg:

Merge 1274011:1276286 from trunk (added CSharpImport and fixed bugs 291763,
291837, 291894, 230350, 292049)


 M  +40 -11    ChangeLog  
 M  +16 -2     THANKS  
 M  +2 -0      umbrello/CMakeLists.txt  
 M  +6 -0      umbrello/clipboard/umlclipboard.cpp  
 M  +3 -0      umbrello/codeimport/classimport.cpp  
 A             umbrello/codeimport/csharp (directory)  
 M  +4 -1      umbrello/codeimport/import_utils.cpp  
 M  +1 -1      umbrello/codeimport/kdevcppparser/parser.cpp  
 M  +3 -0      umbrello/codeimpwizard/codeimpselectpage.cpp  
 M  +1 -1      umbrello/codeimpwizard/codeimpstatuspage.cpp  
 M  +11 -18    umbrello/dialogs/defaultcodegenpolicypage.cpp  
 M  +3 -19     umbrello/dialogs/defaultcodegenpolicypage.h  
 M  +14 -8     umbrello/dialogs/umlviewdialog.cpp  
 M  +4 -2      umbrello/dialogs/umlwidgetcolorpage.cpp  
 M  +20 -9     umbrello/optionstate.cpp  
 M  +5 -0      umbrello/package.cpp  
 M  +23 -27    umbrello/umllistview.cpp  
 M  +1 -1      umbrello/umllistview.h  
 M  +12 -1     umbrello/umlobject.cpp  
 M  +1 -1      umbrello/umlobject.h  
 M  +3 -0      umbrello/umlscene.h  
 M  +8 -0      umbrello/umlview.cpp  
 M  +11 -6     umbrello/umlview.h  
 M  +26 -30    umbrello/widgets/activitywidget.cpp  
 M  +3 -2      umbrello/widgets/activitywidget.h  
 M  +2 -3      umbrello/widgets/actorwidget.cpp  
 M  +1 -2      umbrello/widgets/actorwidget.h  
 M  +2 -2      umbrello/widgets/artifactwidget.cpp  
 M  +1 -2      umbrello/widgets/artifactwidget.h  
 M  +2 -1      umbrello/widgets/associationline.cpp  
 M  +1 -1      umbrello/widgets/associationline.h  
 M  +28 -0     umbrello/widgets/associationwidget.cpp  
 M  +1 -0      umbrello/widgets/associationwidget.h  
 M  +1 -0      umbrello/widgets/boxwidget.h  
 M  +2 -2      umbrello/widgets/categorywidget.cpp  
 M  +1 -2      umbrello/widgets/categorywidget.h  
 M  +3 -3      umbrello/widgets/classifierwidget.cpp  
 M  +1 -1      umbrello/widgets/classifierwidget.h  
 M  +2 -2      umbrello/widgets/combinedfragmentwidget.cpp  
 M  +1 -1      umbrello/widgets/combinedfragmentwidget.h  
 M  +3 -3      umbrello/widgets/componentwidget.cpp  
 M  +1 -2      umbrello/widgets/componentwidget.h  
 M  +3 -3      umbrello/widgets/datatypewidget.cpp  
 M  +1 -2      umbrello/widgets/datatypewidget.h  
 M  +3 -10     umbrello/widgets/entitywidget.cpp  
 M  +1 -2      umbrello/widgets/entitywidget.h  
 M  +3 -3      umbrello/widgets/enumwidget.cpp  
 M  +1 -2      umbrello/widgets/enumwidget.h  
 M  +0 -1      umbrello/widgets/floatingdashlinewidget.h  
 M  +4 -4      umbrello/widgets/floatingtextwidget.cpp  
 M  +1 -1      umbrello/widgets/floatingtextwidget.h  
 M  +3 -3      umbrello/widgets/forkjoinwidget.cpp  
 M  +1 -1      umbrello/widgets/forkjoinwidget.h  
 M  +3 -3      umbrello/widgets/nodewidget.cpp  
 M  +1 -1      umbrello/widgets/nodewidget.h  
 M  +2 -2      umbrello/widgets/notewidget.cpp  
 M  +1 -1      umbrello/widgets/notewidget.h  
 M  +2 -2      umbrello/widgets/objectnodewidget.cpp  
 M  +1 -1      umbrello/widgets/objectnodewidget.h  
 M  +2 -2      umbrello/widgets/objectwidget.cpp  
 M  +1 -1      umbrello/widgets/objectwidget.h  
 M  +21 -4     umbrello/widgets/packagewidget.cpp  
 M  +6 -29     umbrello/widgets/packagewidget.h  
 M  +3 -6      umbrello/widgets/pinwidget.cpp  
 M  +0 -7      umbrello/widgets/pinwidget.h  
 M  +3 -3      umbrello/widgets/preconditionwidget.cpp  
 M  +1 -2      umbrello/widgets/preconditionwidget.h  
 M  +2 -2      umbrello/widgets/regionwidget.cpp  
 M  +1 -2      umbrello/widgets/regionwidget.h  
 M  +42 -3     umbrello/widgets/seqlinewidget.cpp  
 M  +9 -68     umbrello/widgets/seqlinewidget.h  
 M  +2 -2      umbrello/widgets/signalwidget.cpp  
 M  +1 -2      umbrello/widgets/signalwidget.h  
 M  +2 -2      umbrello/widgets/statewidget.cpp  
 M  +1 -1      umbrello/widgets/statewidget.h  
 M  +0 -1      umbrello/widgets/toolbarstateonewidget.cpp  
 M  +0 -1      umbrello/widgets/toolbarstateonewidget.h  
 M  +97 -23    umbrello/widgets/umlwidget.cpp  
 M  +14 -1     umbrello/widgets/umlwidget.h  
 M  +2 -2      umbrello/widgets/usecasewidget.cpp  
 M  +1 -2      umbrello/widgets/usecasewidget.h  
 M  +0 -1      umbrello/widgets/widget_factory.h  


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