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

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

SVN commit 575765 by helio:

- Setting module to use system defaults

 M  +17 -6     kcmperformance.cpp  
 M  +2 -0      kcmperformance.h  
 M  +3 -7      konqueror.cpp  
 M  +1 -1      konqueror.h  
 M  +3 -2      system.cpp  
 M  +1 -1      system.h  


--- branches/KDE/3.5/kdebase/kcontrol/performance/kcmperformance.cpp #575764:575765
@@ -64,8 +64,14 @@
 
 void Config::load()
     {
-    konqueror_widget->load();
-    system_widget->load();
+    load( false );
+	 }
+
+void Config::load( bool useDefaults)
+    {
+    konqueror_widget->load( useDefaults );
+    system_widget->load( useDefaults );
+	 emit changed( useDefaults );
     }
 
 void Config::save()
@@ -76,8 +82,7 @@
 
 void Config::defaults()
     {
-    konqueror_widget->defaults();
-    system_widget->defaults();
+		 load( true );
     }
 
 KonquerorConfig::KonquerorConfig( QWidget* parent_P, const char* )
@@ -97,7 +102,13 @@
 
 void KonquerorConfig::load()
     {
-    widget->load();
+		 load( false );
+	 }
+
+void KonquerorConfig::load(bool useDefaults)
+    {
+    widget->load( useDefaults );
+	 emit changed( useDefaults );
     }
 
 void KonquerorConfig::save()
@@ -107,7 +118,7 @@
 
 void KonquerorConfig::defaults()
     {
-    widget->defaults();
+		 load( true );
     }
 
 } // namespace
--- branches/KDE/3.5/kdebase/kcontrol/performance/kcmperformance.h #575764:575765
@@ -34,6 +34,7 @@
     public:
         Config( QWidget* parent_P, const char* name_P );
         virtual void load();
+        virtual void load( bool useDefaults );
         virtual void save();
         virtual void defaults();
     private:
@@ -48,6 +49,7 @@
     public:
         KonquerorConfig( QWidget* parent_P, const char* name_P );
         virtual void load();
+        virtual void load( bool useDefaults );
         virtual void save();
         virtual void defaults();
     private:
--- branches/KDE/3.5/kdebase/kcontrol/performance/konqueror.cpp #575764:575765
@@ -94,9 +94,10 @@
     cb_always_have_preloaded->setEnabled( count >= 2 );
     }
 
-void Konqueror::load()
+void Konqueror::load( bool useDefaults )
     {
     KConfig cfg( "konquerorrc", true );
+	 cfg.setReadDefaults( useDefaults );
     cfg.setGroup( "Reusing" );
     allowed_parts = cfg.readEntry( "SafeParts", "SAFE" );
     if( allowed_parts == "ALL" )
@@ -138,12 +139,7 @@
 
 void Konqueror::defaults()
     {
-    rb_file_browsing_reuse->setChecked( true );
-    allowed_parts = "SAFE";
-    sb_preload_count->setValue( 1 );
-    cb_preload_on_startup->setChecked( false );
-    cb_always_have_preloaded->setChecked( false );
-    preload_count_changed( sb_preload_count->value());
+		 load( true );
     }
 
 } // namespace
--- branches/KDE/3.5/kdebase/kcontrol/performance/konqueror.h #575764:575765
@@ -30,7 +30,7 @@
     Q_OBJECT
     public:
         Konqueror( QWidget* parent_P = NULL );
-        void load();
+        void load(bool useDefaults);
         void save();
         void defaults();
     signals:
--- branches/KDE/3.5/kdebase/kcontrol/performance/system.cpp #575764:575765
@@ -55,9 +55,10 @@
     defaults();
     }
 
-void SystemWidget::load()
+void SystemWidget::load(bool useDefaults )
     {
     KConfig cfg( "kdedrc", true );
+	 cfg.setReadDefaults( useDefaults );
     cfg.setGroup( "General" );
     cb_disable_kbuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false ));
     }
@@ -71,7 +72,7 @@
 
 void SystemWidget::defaults()
     {
-    cb_disable_kbuildsycoca->setChecked( false );
+		 load( true );
     }
 
 } // namespace
--- branches/KDE/3.5/kdebase/kcontrol/performance/system.h #575764:575765
@@ -32,7 +32,7 @@
     Q_OBJECT
     public:
         SystemWidget( QWidget* parent_P = NULL );
-        void load();
+        void load( bool useDefaults );
         void save();
         void defaults();
     signals:
[prev in list] [next in list] [prev in thread] [next in thread]