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

[Rafael Fernández López]

SVN commit 853352 by ereslibre:

Backport revision 853351. Correctly use kdelibs for restoring window toolbar positions & dock windows


 M  +0 -5      umbrello.kcfg  
 M  +5 -9      uml.cpp  


--- branches/KDE/4.1/kdesdk/umbrello/umbrello/umbrello.kcfg #853351:853352
@@ -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/KDE/4.1/kdesdk/umbrello/umbrello/uml.cpp #853351:853352
@@ -134,7 +134,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();
@@ -163,6 +165,8 @@
     m_refactoringAssist   = NULL;
     m_commoncodegenpolicy = new CodeGenerationPolicy();
     m_imageExporterAll    = new UMLViewImageExporterAll();
+
+    setAutoSaveSettings();
 }
 
 UMLApp::~UMLApp()
@@ -646,10 +650,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)
@@ -848,8 +848,6 @@
 
 bool UMLApp::queryClose()
 {
-    QByteArray dockConfig = saveState();
-    UmbrelloSettings::setDockConfig( dockConfig );
     return m_doc->saveModified();
 }
 
@@ -1040,8 +1038,6 @@
 {
     slotStatusMsg(i18n("Exiting..."));
     if (m_doc->saveModified()) {
-        QByteArray dockConfig = saveState();
-        UmbrelloSettings::setDockConfig( dockConfig );
         saveOptions();
         qApp->quit();
     }