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

List:       kde-commits
Subject:    KDE/kdebase/kate/app
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2007-01-30 19:40:05
Message-ID: 1170186005.024544.6596.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 628643 by cullmann:

store plugins per session, how has this ever worked, this weired mix :(

 M  +5 -0      katemainwindow.cpp  
 M  +1 -6      katepluginmanager.cpp  
 M  +9 -17     katesession.cpp  


--- trunk/KDE/kdebase/kate/app/katemainwindow.cpp #628642:628643
@@ -852,7 +852,12 @@
   QString grp=config->group();
 
   startRestore(config, grp);
+
+  KatePluginManager::self()->disableAllPluginsGUI (this);
+  KatePluginManager::self()->enableAllPluginsGUI (this, config);
+
   finishRestore ();
+
   m_viewManager->restoreViewConfiguration (config, grp);
 
   config->setGroup(grp);
--- trunk/KDE/kdebase/kate/app/katepluginmanager.cpp #628642:628643
@@ -28,6 +28,7 @@
 
 #include <KConfig>
 #include <QStringList>
+
 //Added by qt3to4:
 #include <QList>
 #include <KMessageBox>
@@ -47,16 +48,10 @@
 {
   m_pluginManager = new Kate::PluginManager (this);
   setupPluginList ();
-
-  loadConfig (KGlobal::config().data());
-  loadAllEnabledPlugins ();
 }
 
 KatePluginManager::~KatePluginManager()
 {
-  // first write config
-  storeGeneralConfig (KGlobal::config().data());
-
   // than unload the plugins
   unloadAllPlugins ();
 }
--- trunk/KDE/kdebase/kate/app/katesession.cpp #628642:628643
@@ -270,9 +270,7 @@
 
   // really close last
   if (closeLast)
-  {
     KateDocManager::self()->closeAllDocuments ();
-  }
 
   // set the new session
   m_activeSession = session;
@@ -280,14 +278,16 @@
   if (loadNew)
   {
     // open the new session
-#ifdef __GNUC__
-#warning fixme later
-#endif
-	  //KTextEditor::Document::setOpenErrorDialogsActivated (false);
-
     KConfig *sc = activeSession()->configRead();
 
+    // load plugin config
     if (sc)
+      KatePluginManager::self()->loadConfig (sc);
+
+    // load all needed plugins....
+    KatePluginManager::self()->loadAllEnabledPlugins ();
+
+    if (sc)
       KateApp::self()->documentManager()->restoreDocumentList (sc);
 
     // if we have no session config object, try to load the default
@@ -321,21 +321,13 @@
         }
       }
 
+      // remove mainwindows we need no longer...
       if (wCount > 0)
       {
         while (wCount < KateApp::self()->mainWindows())
-        {
-          KateMainWindow *w = KateApp::self()->mainWindow(KateApp::self()->mainWindows()-1);
-          KateApp::self()->removeMainWindow (w);
-          delete w;
-        }
+          delete KateApp::self()->mainWindow(KateApp::self()->mainWindows()-1);
       }
     }
-
-#ifdef __GNUC__
-#warning fixme later
-#endif
-	//KTextEditor::Document::setOpenErrorDialogsActivated (true);
   }
 }
 

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