[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdewebdev/quanta/src
From:       Andras Mantia <amantia () kde ! org>
Date:       2004-03-31 20:59:13
Message-ID: 20040331205913.B98E390E3 () office ! kde ! org
[Download RAW message or body]

CVS commit by amantia: 

Temporary fix for handling older quanta_be.rc version gracefully.


  M +3 -5      quanta.cpp   1.479
  M +5 -7      quanta_init.cpp   1.462


--- kdewebdev/quanta/src/quanta.cpp  #1.478:1.479
@@ -1262,6 +1262,4 @@ void QuantaApp::slotOptions()
     qConfig.spellConfig->setClient(spellOptions->client());
 
-//    checkCommand( ID_VIEW_PREVIEW, false );
-
     slotShowPreviewWidget(false);
     qConfig.previewPosition = previewOptions->position();
@@ -3732,4 +3730,5 @@ void QuantaApp::saveOptions()
     m_config->writeEntry("Version", VERSION); // version
     m_config->writeEntry("Close Buttons", qConfig.showCloseButtons);
+    m_config->writeEntry("MDI mode", "IDEAl"); //FIXME: save the actual mode
 
     m_config->deleteGroup("RecentFiles");
@@ -3744,10 +3743,9 @@ void QuantaApp::saveOptions()
     m_config->writeEntry("Show DTD Select Dialog", qConfig.showDTDSelectDialog);
 
-    m_config->setGroup("Quanta View");
     Project::ref()->writeConfig(m_config); // project
     manager()->writeConfig(m_config);
-    //saveMainWindowSettings(m_config);
-    writeDockConfig(m_config);
+//    saveMainWindowSettings(m_config);
     SpellChecker::ref()->writeConfig(m_config);
+    writeDockConfig(m_config);
     m_config->sync();
   }

--- kdewebdev/quanta/src/quanta_init.cpp  #1.461:1.462
@@ -189,5 +189,5 @@ void QuantaInit::initQuanta()
   }
 
-//  applyMainWindowSettings(m_config);
+  //m_quanta->applyMainWindowSettings(m_config);
 
   m_quanta->m_tagsMenu = new QPopupMenu(m_quanta);
@@ -581,7 +581,4 @@ void QuantaInit::readOptions()
   qConfig.showDTDSelectDialog = m_config->readBoolEntry("Show DTD Select Dialog", true);
 
-  m_config->setGroup("Quanta View");
-  m_quanta->manager()->readConfig(m_config);
-
   m_quanta->m_previewVisible = false;
   m_quanta->m_noFramesPreview = false;
@@ -591,11 +588,12 @@ void QuantaInit::readOptions()
 
   Project::ref()->readConfig(m_config); // project
-
-  m_config->setGroup  ("General Options");
   SpellChecker::ref()->readConfig(m_config);
-  m_quanta->readDockConfig(m_config);
 
   m_config->setGroup  ("General Options");
   QString layout = m_config->readEntry("Window layout", "Custom");
+  QString mdiMode = m_config->readEntry("MDI mode", "");
+  if (!mdiMode.isEmpty())
+      m_quanta->readDockConfig(m_config);
+
   m_quanta->layoutDockWidgets(layout);
   qConfig.windowLayout = layout;


[prev in list] [next in list] [prev in thread] [next in thread]