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

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

SVN commit 575673 by helio:

- Setting module to use system defaults

 M  +9 -5      icons.cpp  
 M  +1 -0      icons.h  


--- branches/KDE/3.5/kdebase/kcontrol/icons/icons.cpp #575672:575673
@@ -329,12 +329,19 @@
 
 void KIconConfig::load()
 {
+    load( false );
+}
+
+void KIconConfig::load( bool useDefaults )
+{
+    mpConfig = KGlobal::config();
+    mpConfig->setReadDefaults( useDefaults );
     read();
     apply();
-    emit changed(false);
     for (int i=0; i<KIcon::LastGroup; i++)
 	mbChanged[i] = false;
     preview();
+    emit changed( useDefaults );
 }
 
 
@@ -397,10 +404,7 @@
 
 void KIconConfig::defaults()
 {
-    initDefaults();
-    apply();
-    preview();
-    emit changed(true);
+    load( true );
 }
 
 void KIconConfig::slotUsage(int index)
--- branches/KDE/3.5/kdebase/kcontrol/icons/icons.h #575672:575673
@@ -61,6 +61,7 @@
     ~KIconConfig();
 
     virtual void load();
+    virtual void load( bool useDefaults );
     virtual void save();
     virtual void defaults();
     void preview();
[prev in list] [next in list] [prev in thread] [next in thread]