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

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

SVN commit 575680 by helio:

- Setting module to use system defaults

 M  +9 -4      core/themepage.cpp  
 M  +1 -0      core/themepage.h  
 M  +11 -27    mouse.cpp  
 M  +1 -0      mouse.h  
 M  +7 -1      xcursor/themepage.cpp  
 M  +1 -0      xcursor/themepage.h  


--- branches/KDE/3.5/kdebase/kcontrol/input/core/themepage.cpp #575679:575680
@@ -107,12 +107,19 @@
 				"CursorSettingsChanged" );
 }
 
-
 void ThemePage::load()
 {
+	load( false );
+}
+
+void ThemePage::load( bool useDefaults )
+{
 	bool largeCursor, whiteCursor;
 
 	KConfig c( "kcminputrc" );
+
+	c.setReadDefaults( useDefaults );
+
 	c.setGroup( "Mouse" );
 	largeCursor = c.readBoolEntry( "LargeCursor", false );
 	whiteCursor = c.readBoolEntry( "WhiteCursor", false );
@@ -130,9 +137,7 @@
 
 void ThemePage::defaults()
 {
-	currentTheme = selectedTheme = "SmallBlack";
-	QListViewItem *item = listview->findItem( currentTheme, DirColumn );
-	item->setSelected( true );
+	load( true );
 }
 
 
--- branches/KDE/3.5/kdebase/kcontrol/input/core/themepage.h #575679:575680
@@ -33,6 +33,7 @@
 		// Called by the KCM
 		void save();
 		void load();
+		void load( bool useDefaults );
 		void defaults();
 
 	signals:
--- branches/KDE/3.5/kdebase/kcontrol/input/mouse.cpp #575679:575680
@@ -477,7 +477,16 @@
 
 void MouseConfig::load()
 {
+   load( false );
+}
+
+void MouseConfig::load( bool useDefaults )
+{
+
   KConfig config( "kcminputrc", true );
+
+  config.setReadDefaults( useDefaults );
+
   settings->load(&config);
 
   tab1->rightHanded->setEnabled(settings->handedEnabled);
@@ -538,7 +547,7 @@
   themetab->load();
 
   checkAccess();
-  changed();
+  changed( useDefaults );
 }
 
 void MouseConfig::save()
@@ -590,32 +599,7 @@
 
 void MouseConfig::defaults()
 {
-    setThreshold(2);
-    setAccel(2);
-    setHandedness(RIGHT_HANDED);
-    tab1->cbScrollPolarity->setChecked( false );
-    doubleClickInterval->setValue(400);
-    dragStartTime->setValue(500);
-    dragStartDist->setValue(4);
-    wheelScrollLines->setValue(3);
-    tab1->doubleClick->setChecked( !KDE_DEFAULT_SINGLECLICK );
-    tab1->cbAutoSelect->setChecked( KDE_DEFAULT_AUTOSELECTDELAY != -1 );
-    tab1->slAutoSelect->setValue( KDE_DEFAULT_AUTOSELECTDELAY == -1 ? 50 : \
                KDE_DEFAULT_AUTOSELECTDELAY );
-    tab1->singleClick->setChecked( KDE_DEFAULT_SINGLECLICK );
-    tab1->cbVisualActivate->setChecked( KDE_DEFAULT_VISUAL_ACTIVATE );
-    tab1->cb_pointershape->setChecked(KDE_DEFAULT_CHANGECURSOR);
-    slotClick();
-
-  mouseKeys->setChecked(false);
-  mk_delay->setValue(160);
-  mk_interval->setValue(5);
-  mk_time_to_max->setValue(5000);
-  mk_max_speed->setValue(1000);
-  mk_curve->setValue(0);
-
-  checkAccess();
-
-  changed();
+   load( true );
 }
 
 void MouseConfig::slotClick()
--- branches/KDE/3.5/kdebase/kcontrol/input/mouse.h #575679:575680
@@ -98,6 +98,7 @@
 
   void save();
   void load();
+  void load( bool useDefaults );
   void defaults();
 
 private slots:
--- branches/KDE/3.5/kdebase/kcontrol/input/xcursor/themepage.cpp #575679:575680
@@ -143,15 +143,20 @@
 	currentTheme = selectedTheme;
 }
 
-
 void ThemePage::load()
 {
+	load( false );
+}
+
+void ThemePage::load( bool useDefaults )
+{
 	// Get the name of the theme libXcursor currently uses
 	const char *theme = XcursorGetTheme( x11Display() );
 	currentTheme = theme;
 
 	// Get the name of the theme KDE is configured to use
 	KConfig c( "kcminputrc" );
+	c.setReadDefaults( useDefaults );
 	c.setGroup( "Mouse" );
 	currentTheme = c.readEntry( "cursorTheme", currentTheme );
         if( currentTheme.isEmpty())
@@ -177,6 +182,7 @@
 
 void ThemePage::defaults()
 {
+	load( true );
 }
 
 
--- branches/KDE/3.5/kdebase/kcontrol/input/xcursor/themepage.h #575679:575680
@@ -43,6 +43,7 @@
 		// Called by the KCM
 		void save();
 		void load();
+		void load( bool useDefaults );
 		void defaults();
 
 	signals:


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