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

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

SVN commit 575778 by helio:

- Setting module to use system defaults

 M  +10 -39    kcmstyle.cpp  
 M  +1 -0      kcmstyle.h  


--- branches/KDE/3.5/kdebase/kcontrol/style/kcmstyle.cpp #575777:575778
@@ -469,7 +469,15 @@
 
 void KCMStyle::load()
 {
+   load( false );
+}
+
+void KCMStyle::load(bool useDefaults)
+{
 	KConfig config( "kdeglobals", true, false );
+
+	config.setReadDefaults( useDefaults );
+
 	// Page1 - Build up the Style ListBox
 	loadStyle( config );
 
@@ -483,7 +491,7 @@
 	m_bStyleDirty= false;
 	m_bToolbarsDirty = false;
 
-	emit changed( false );
+	emit changed( useDefaults );
 }
 
 
@@ -659,44 +667,7 @@
 
 void KCMStyle::defaults()
 {
-	// Select default style
-	int item = 0;
-	bool found;
-
-	found = findStyle( KStyle::defaultStyle(), item );
-	if (!found)
-		found = findStyle( "highcolor", item );
-	if (!found)
-		found = findStyle( "default", item );
-	if (!found)
-		found = findStyle( "windows", item );
-	if (!found)
-		found = findStyle( "platinum", item );
-	if (!found)
-		found = findStyle( "motif", item );
-
-	cbStyle->setCurrentItem( item );
-
-	m_bStyleDirty = true;
-	switchStyle( currentStyle() );	// make resets visible
-
-	// Effects..
-	cbEnableEffects->setChecked(false);
-	comboTooltipEffect->setCurrentItem(0);
-	comboComboEffect->setCurrentItem(0);
-	comboMenuEffect->setCurrentItem(0);
-	comboMenuHandle->setCurrentItem(0);
-	comboMenuEffectType->setCurrentItem(0);
-	slOpacity->setValue(90);
-	cbMenuShadow->setChecked(false);
-
-	// Miscellanous
-	cbHoverButtons->setChecked(true);
-	cbTransparentToolbars->setChecked(true);
-	cbEnableTooltips->setChecked(true);
-	comboToolbarIcons->setCurrentItem(0);
-	cbIconsOnButtons->setChecked(false);
-	cbTearOffHandles->setChecked(false);
+   load( true );
 }
 
 void KCMStyle::setEffectsDirty()
--- branches/KDE/3.5/kdebase/kcontrol/style/kcmstyle.h #575777:575778
@@ -68,6 +68,7 @@
 	~KCMStyle();
 
 	virtual void load();
+	virtual void load(bool useDefaults);
 	virtual void save();
 	virtual void defaults();
 
[prev in list] [next in list] [prev in thread] [next in thread]