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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/kcontrol/ebrowsing
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2006-08-21 20:07:39
Message-ID: 1156190859.002406.15124.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 575634 by helio:

- Setting module to use system defaults

 M  +2 -4      filteropts.cpp  
 M  +1 -1      filteropts.h  
 M  +1 -0      main.h  
 M  +9 -4      plugins/ikws/ikwsopts.cpp  
 M  +1 -0      plugins/ikws/ikwsopts.h  


--- branches/KDE/3.5/kdebase/kcontrol/ebrowsing/filteropts.cpp #575633:575634
@@ -34,15 +34,13 @@
 {
 
     QGridLayout *lay = new QGridLayout(this, 1, 1, 10, 5);
-    //QGroupBox =
 
     lay->addWidget(new QLabel(i18n("Under construction..."), this), 0, 0);
     lay->activate();
 
-    // load();
 }
 
-void FilterOptions::load()
+void FilterOptions::load( bool useDefaults )
 {
 	
 }
@@ -53,7 +51,7 @@
 
 void FilterOptions::defaults()
 {
-    load();
+    load( true );
 }
 
 void FilterOptions::moduleChanged(bool state)
--- branches/KDE/3.5/kdebase/kcontrol/ebrowsing/filteropts.h #575633:575634
@@ -34,7 +34,7 @@
 public:
     FilterOptions(QWidget *parent = 0, const char *name = 0);
 
-    void load();
+    void load( bool useDefaults );
     void save();
     void defaults();
 
--- branches/KDE/3.5/kdebase/kcontrol/ebrowsing/main.h #575633:575634
@@ -36,6 +36,7 @@
     KURIFilterModule(QWidget *parent, const char *name, const QStringList &);
 
     void load();
+    void load(bool useDefaults );
     void save();
     void defaults();
 
--- branches/KDE/3.5/kdebase/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp #575633:575634
@@ -106,10 +106,18 @@
 
 void FilterOptions::load()
 {
+   load( false );
+}
+
+void FilterOptions::load( bool useDefaults )
+{
     // Clear state first.
     m_dlg->lvSearchProviders->clear();
 
     KConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false );
+
+    config.setReadDefaults( useDefaults );
+
     config.setGroup("General");
 
     QString defaultSearchEngine = config.readEntry("DefaultSearchEngine");
@@ -314,10 +322,7 @@
 
 void FilterOptions::defaults()
 {
-  setDelimiter (':');
-  m_dlg->cmbDefaultEngine->setCurrentItem (0);
-  m_dlg->cbEnableShortcuts->setChecked( true );
-  setWebShortcutState();
+   load( true );
 }
 
 void FilterOptions::configChanged()
--- branches/KDE/3.5/kdebase/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h #575633:575634
@@ -38,6 +38,7 @@
     FilterOptions(KInstance *instance, QWidget *parent = 0, const char *name = 0);
 
     void load();
+    void load( bool useDefaults );
     void save();
     void defaults();
     QString quickHelp() const;
[prev in list] [next in list] [prev in thread] [next in thread]