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

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

SVN commit 575781 by helio:

- Setting module to use system defaults

 M  +10 -16    kcmxinerama.cpp  
 M  +1 -0      kcmxinerama.h  


--- branches/KDE/3.5/kdebase/kcontrol/xinerama/kcmxinerama.cpp #575780:575781
@@ -125,8 +125,13 @@
 #define KWIN_XINERAMA_FULLSCREEN   "XineramaFullscreenEnabled"
 
 void KCMXinerama::load() {
+   load( false );
+}
+
+void KCMXinerama::load(bool useDefaults) {
 	if (QApplication::desktop()->isVirtualDesktop()) {
 		int item = 0;
+		config->setReadDefaults( useDefaults );
 		config->setGroup("Windows");
 		xw->_enableXinerama->setChecked(config->readBoolEntry(KWIN_XINERAMA, true));
 		xw->_enableResistance->setChecked(config->readBoolEntry(KWIN_XINERAMA_MOVEMENT, true));
@@ -145,9 +150,11 @@
 		if (item < 0 || item >= _displays)
 			xw->_ksplashDisplay->setCurrentItem(QApplication::desktop()->primaryScreen());
 		else xw->_ksplashDisplay->setCurrentItem(item);
-
+		
+		emit changed(useDefaults);
 	}
-	emit changed(false);
+	else
+		emit changed( false );
 }
 
 
@@ -183,20 +190,7 @@
 }
 
 void KCMXinerama::defaults() {
-	if (QApplication::desktop()->isVirtualDesktop()) {
-		xw->_enableXinerama->setChecked(true);
-		xw->_enableResistance->setChecked(true);
-		xw->_enablePlacement->setChecked(true);
-		xw->_enableMaximize->setChecked(true);
-		xw->_enableFullscreen->setChecked(true);
-		xw->_unmanagedDisplay->setCurrentItem(
-				QApplication::desktop()->primaryScreen());
-		xw->_ksplashDisplay->setCurrentItem(
-				QApplication::desktop()->primaryScreen());
-		emit changed(true);
-	} else {
-		emit changed(false);
-	}
+	load( true );
 }
 
 void KCMXinerama::indicateWindows() {
--- branches/KDE/3.5/kdebase/kcontrol/xinerama/kcmxinerama.h #575780:575781
@@ -37,6 +37,7 @@
 	virtual ~KCMXinerama();
 
 	void load();
+	void load(bool useDefaults );
 	void save();
 	void defaults();
 
[prev in list] [next in list] [prev in thread] [next in thread]