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

[Andi Fischer]

SVN commit 1268842 by fischer:

Some changes from trunk applied here.

 M  +1 -1      CMakeLists.txt  
 M  +3 -1      codeimpwizard/codeimpselectpage.cpp  
 M  +3 -3      uml.h  


--- branches/work/soc-umbrello/umbrello/CMakeLists.txt #1268841:1268842
@@ -476,7 +476,7 @@
     ${libumbrello_SRCS}
 )
 
-kde4_add_app_icon(umbrello_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-umbrello.png")
+kde4_add_app_icon(umbrello_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/global/hi*-app-umbrello.png")
 kde4_add_executable(umbrello-soc ${umbrello_SRCS})
 target_link_libraries(umbrello-soc  ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBUUID} )
 install(TARGETS umbrello-soc ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- branches/work/soc-umbrello/umbrello/codeimpwizard/codeimpselectpage.cpp #1268841:1268842
@@ -33,7 +33,7 @@
 /**
  * Keep the last clicked directory for setting it the next time.
  */
-QString CodeImpSelectPage::s_recentPath = QString();
+QString CodeImpSelectPage::s_recentPath = "";
 
 /**
  * Constructor.
@@ -64,6 +64,8 @@
     connect(ui_deselectAllButton, SIGNAL(clicked()), this, SLOT(deselectAll()));
 
     setupToolTips();
+    // update file extensions
+    changeLanguage();
 }
 
 /**
--- branches/work/soc-umbrello/umbrello/uml.h #1268841:1268842
@@ -34,7 +34,6 @@
 class XhtmlGenerator;
 class StatusBarToolButton;
 class DiagramPrintPage;
-class QPrinter;
 
 // KDE forward declarations
 class KActionMenu;
@@ -417,8 +416,6 @@
     StatusBarToolButton* m_pZoomFullSBTB;
     QSlider* m_pZoomSlider;
     QLabel* m_statusBarMessage;
-    DiagramPrintPage *m_printSettings;
-    QPrinter *m_printer;
     /**
      * The running XHTML documentation generator. Null when no generation is running.
      */
@@ -428,6 +425,9 @@
 
     bool m_hasBegunMacro;  ///< Macro creation flag.
 
+    DiagramPrintPage *m_printSettings; ///< printer diagram settings
+    QPrinter *m_printer;               ///< print instance
+
 signals:
     void sigCutSuccessful();