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

[Andi Fischer]

SVN commit 1285938 by fischer:

Apply some changes from trunk.

 M  +5 -0      CMakeLists.txt  
 M  +1 -1      assocrules.cpp  
 A             dialogs/umlfiledialog.cpp   [License: GPL (v2+)]
 A             dialogs/umlfiledialog.h   [License: GPL (v2+)]
 A             dotgenerator.h   [License: GPL (v2+)]
 A             layoutgenerator.h   [License: GPL (v2+)]
 A             layouts (directory)  
 A             layouts/class-export.desktop  
 A             layouts/class-horizontal.desktop  
 A             layouts/class-vertical.desktop  
 A             layouts/state-export.desktop  
 A             layouts/usecase-default.desktop  
 M  +15 -0     listpopupmenu.cpp  
 M  +10 -0     listpopupmenu.h  
 M  +2 -2      main.cpp  
 M  +18 -0     model_utils.cpp  
 M  +2 -0      model_utils.h  
 M  +1 -1      umbrello.kcfg  
 M  +1 -1      umlcanvasobject.cpp  
 M  +9 -2      umllistview.cpp  
 M  +24 -0     umlscene.cpp  
 M  +2 -0      umlscene.h  
 M  +8 -2      umlviewimageexporter.cpp  
 M  +5 -2      umlviewimageexporter.h  
 M  +85 -54    umlviewimageexportermodel.cpp  
 M  +2 -1      umlviewimageexportermodel.h  
 M  +0 -1      version.h  
 M  +4 -4      widgets/associationwidget.cpp  
 M  +13 -13    widgets/associationwidget.h  
 M  +8 -0      widgets/statewidget.h  


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