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

Gopala Krishna A krishna.ggk at gmail.com
Thu Aug 28 17:22:06 UTC 2008


SVN commit 854015 by gopala:

Merged revisions 853351 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r853351 | ereslibre | 2008-08-27 21:13:00 +0530 (Wed, 27 Aug 2008) | 2 lines
  
  Correctly make the toolbars & docks be restored through kdelibs
........


 _M            . (directory)  
 M  +0 -5      umbrello/umbrello.kcfg  
 M  +5 -9      umbrello/uml.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-851837,853060,853300
   + /trunk/KDE/kdesdk/umbrello:1-851837,853060,853300,853351
--- branches/work/soc-umbrello/umbrello/umbrello.kcfg #854014:854015
@@ -14,11 +14,6 @@
          <whatisthis>Geometry</whatisthis>
          <default></default>
        </entry>
-       <entry name="DockConfig" type="String">
-         <label>DockConfig</label>
-         <whatisthis>The Configuration of the Dock Widgets</whatisthis>
-         <default></default>
-       </entry>
        <entry name="imageMimeType" type="String">
          <label>Image Mime Type</label>
          <whatisthis>The Mime Type of the Images</whatisthis>
--- branches/work/soc-umbrello/umbrello/uml.cpp #854014:854015
@@ -132,7 +132,9 @@
     // call this here because the statusBar is shown/hidden by setupGUI()
     initStatusBar();
     // use the absolute path to your umbrelloui.rc file for testing purpose in setupGUI();
-    setupGUI();
+    StandardWindowOptions opt = Default;
+    opt &= ~Save;
+    setupGUI( opt );
     initView();
     initClip();
     readOptions();
@@ -161,6 +163,8 @@
     m_refactoringAssist   = NULL;
     m_commoncodegenpolicy = new CodeGenerationPolicy();
     m_imageExporterAll    = new UMLViewImageExporterAll();
+
+    setAutoSaveSettings();
 }
 
 UMLApp::~UMLApp()
@@ -661,10 +665,6 @@
 
     tabifyDockWidget(m_documentationDock, m_cmdHistoryDock);
     //tabifyDockWidget(m_cmdHistoryDock, m_propertyDock);
-
-    QByteArray dockConfig;
-    dockConfig += UmbrelloSettings::dockConfig().toAscii();
-    restoreState(dockConfig); //reposition all the DockWindows to their saved positions
 }
 
 void UMLApp::openDocumentFile(const KUrl& url)
@@ -863,8 +863,6 @@
 
 bool UMLApp::queryClose()
 {
-    QByteArray dockConfig = saveState();
-    UmbrelloSettings::setDockConfig( dockConfig );
     return m_doc->saveModified();
 }
 
@@ -1055,8 +1053,6 @@
 {
     slotStatusMsg(i18n("Exiting..."));
     if (m_doc->saveModified()) {
-        QByteArray dockConfig = saveState();
-        UmbrelloSettings::setDockConfig( dockConfig );
         saveOptions();
         qApp->quit();
     }




More information about the umbrello-devel mailing list