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

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

SVN commit 575685 by helio:

- Setting module to use system defaults

 M  +9 -2      main.cpp  
 M  +1 -0      main.h  
 M  +15 -26    modifiers.cpp  
 M  +1 -2      modifiers.h  


--- branches/KDE/3.5/kdebase/kcontrol/keys/main.cpp #575684:575685
@@ -87,13 +87,20 @@
 	connect( m_pModifiers, SIGNAL(changed(bool)), SIGNAL(changed(bool)) );
 }
 
-// Called when [Reset] is pressed
 void KeyModule::load()
 {
+   load( false );
+}
+
+// Called when [Reset] is pressed
+void KeyModule::load( bool useDefaults )
+{
 	kdDebug(125) << "KeyModule::load()" << endl;
 	m_pShortcuts->load();
 	m_pCommandShortcuts->load();
-	m_pModifiers->load();
+	m_pModifiers->load( useDefaults );
+
+   emit changed( useDefaults );
 }
 
 // When [Apply] or [OK] are clicked.
--- branches/KDE/3.5/kdebase/kcontrol/keys/main.h #575684:575685
@@ -39,6 +39,7 @@
         ~KeyModule();
 
 	void load();
+	void load( bool useDefaults );
 	void save();
 	void defaults();
 
--- branches/KDE/3.5/kdebase/kcontrol/keys/modifiers.cpp #575684:575685
@@ -54,20 +54,26 @@
 ModifiersModule::ModifiersModule( QWidget *parent, const char *name )
 :	QWidget( parent, name )
 {
-	readConfig();
+	load( false );
 	initGUI();
 }
 
-void ModifiersModule::readConfig()
+void ModifiersModule::load( bool useDefaults )
 {
-	KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
+   KConfig *c = KGlobal::config();
 
-	m_sLabelCtrlOrig = KGlobal::config()->readEntry( "Label Ctrl", "Ctrl" );
-	m_sLabelAltOrig = KGlobal::config()->readEntry( "Label Alt", "Alt" );
-	m_sLabelWinOrig = KGlobal::config()->readEntry( "Label Win", "Win" );
+   c->setReadDefaults( useDefaults );
 
-	m_bMacKeyboardOrig = KGlobal::config()->readBoolEntry( "Mac Keyboard", false );
-	m_bMacSwapOrig = m_bMacKeyboardOrig && KGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
+	c->setGroup( "Keyboard" );
+
+	m_sLabelCtrlOrig = c->readEntry( "Label Ctrl", "Ctrl" );
+	m_sLabelAltOrig = c->readEntry( "Label Alt", "Alt" );
+	m_sLabelWinOrig = c->readEntry( "Label Win", "Win" );
+
+	m_bMacKeyboardOrig = c->readBoolEntry( "Mac Keyboard", false );
+	m_bMacSwapOrig = m_bMacKeyboardOrig && c->readBoolEntry( "Mac Modifier Swap", false );
+	
+   updateWidgetData();
 }
 
 // When [Apply] or [OK] are clicked.
@@ -113,28 +119,11 @@
 		m_bMacSwapOrig = bMacSwap;
 		updateWidgets();
 	}
-	readConfig();
 }
 
-// Called when [Reset] is pressed
-void ModifiersModule::load()
-{
-	kdDebug(125) << "ModifiersModule::load()" << endl;
-
-	readConfig();
-	updateWidgetData();
-}
-
 void ModifiersModule::defaults()
 {
-	m_sLabelCtrlOrig = "Ctrl";
-	m_sLabelAltOrig = "Alt";
-	m_sLabelWinOrig = "Win";
-
-	m_bMacKeyboardOrig = false;
-	m_bMacSwapOrig = false;
-
-	updateWidgetData();
+   load( true );
 }
 
 #define SET_CODE_SYM( iCode, sym ) \
--- branches/KDE/3.5/kdebase/kcontrol/keys/modifiers.h #575684:575685
@@ -14,7 +14,7 @@
  public:
 	ModifiersModule( QWidget *parent = 0, const char *name = 0 );
 
-	void load();
+	void load( bool useDefaults );
 	void save();
 	void defaults();
 
@@ -33,7 +33,6 @@
 	KListView* m_plstXMods;
 	QCheckBox* m_pchkMacSwap;
 
-	void readConfig();
 	void initGUI();
 	// Places the values in the *Orig variables into their
 	//  respective widgets.
[prev in list] [next in list] [prev in thread] [next in thread]