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

List:       kde-commits
Subject:    koffice/kspread/dialogs
From:       Stefan Nikolaus <nikolaus4 () googlemail ! com>
Date:       2008-07-08 8:10:22
Message-ID: 1215504622.634277.20815.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 829344 by nikolaus:

UI	Preferences
	Reload the function modules on OK.
	Default and Reset are now per page.


 M  +19 -7     PreferenceDialog.cpp  


--- trunk/koffice/kspread/dialogs/PreferenceDialog.cpp #829343:829344
@@ -55,6 +55,7 @@
 #include "CalculationSettings.h"
 #include "Doc.h"
 #include "Editors.h"
+#include "FunctionModuleRegistry.h"
 #include "Localization.h"
 #include "Map.h"
 #include "Sheet.h"
@@ -373,7 +374,7 @@
 
     d->resetOpenSaveOptions(); // initialize values
 
-    // Interface Options Widget
+    // Plugin Options Widget
     d->pluginSelector = new KPluginSelector(this);
     const QString serviceType = QString::fromLatin1("KSpread/Plugin");
     const QString query = QString::fromLatin1("[X-KSpread-Version] >= 2");
@@ -421,7 +422,10 @@
     d->applyInterfaceOptions();
     d->applyOpenSaveOptions();
 
+    // Plugin Options
     d->pluginSelector->save();
+    FunctionModuleRegistry::instance()->loadFunctions();
+
     d->spellCheckPage->save();
     d->localePage->apply();
 
@@ -431,10 +435,11 @@
 
 void PreferenceDialog::slotDefault()
 {
-    d->defaultInterfaceOptions();
-    d->defaultOpenSaveOptions();
-
-    if (currentPage() == d->page4) {
+    if (currentPage() == d->page2) {
+        d->defaultInterfaceOptions();
+    } else if (currentPage() == d->page3) {
+        d->defaultOpenSaveOptions();
+    } else if (currentPage() == d->page4) {
         d->spellCheckPage->slotDefault();
     } else if (currentPage() == d->pluginPage) {
         d->pluginSelector->load();
@@ -443,8 +448,15 @@
 
 void PreferenceDialog::slotReset()
 {
-    d->resetInterfaceOptions();
-    d->resetOpenSaveOptions();
+    if (currentPage() == d->page2) {
+        d->resetInterfaceOptions();
+    } else if (currentPage() == d->page3) {
+        d->resetOpenSaveOptions();
+    } else if (currentPage() == d->page4) {
+        // TODO
+    } else if (currentPage() == d->pluginPage) {
+        d->pluginSelector->load(); // FIXME
+    }
 }
 
 void PreferenceDialog::unitChanged(int index)
[prev in list] [next in list] [prev in thread] [next in thread]