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

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

SVN commit 575757 by helio:

- Setting module to use system defaults

 M  +11 -2     kthememanager.cpp  
 M  +1 -0      kthememanager.h  


--- branches/KDE/3.5/kdebase/kcontrol/kthememanager/kthememanager.cpp #575756:575757
@@ -118,10 +118,18 @@
 
 void kthememanager::load()
 {
+	load( false );
+}
+
+void kthememanager::load(bool useDefaults)
+{
     listThemes();
 
     // Load the current theme name
     KConfig conf("kcmthememanagerrc", false, false);
+
+	 conf.setReadDefaults( useDefaults );
+
     conf.setGroup( "General" );
     QString themeName = conf.readEntry( "CurrentTheme" );
     QListViewItem * cur =  dlg->lvThemes->findItem( themeName, 0 );
@@ -131,12 +139,13 @@
         dlg->lvThemes->ensureItemVisible( cur );
         slotThemeChanged( cur );
     }
+
+	 emit changed( true );
 }
 
 void kthememanager::defaults()
 {
-    if ( m_origTheme )
-        m_origTheme->apply();
+	load( true );
 }
 
 void kthememanager::save()
--- branches/KDE/3.5/kdebase/kcontrol/kthememanager/kthememanager.h #575756:575757
@@ -70,6 +70,7 @@
      * Called on module startup
      */
     virtual void load();
+    virtual void load(bool useDefaults);
     /**
      * Called when applying the changes
      */
[prev in list] [next in list] [prev in thread] [next in thread]