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

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/workspace/kcontrol/randr
From:       Darío Andrés Rodríguez <andresbajotierra () gmail ! co
Date:       2010-02-12 19:16:37
Message-ID: 1266002197.842840.4592.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1089244 by darioandres:

Backport to 4.4 of:
SVN commit 1080502 by darioandres:

- Do not mark the KCM as modified during the first load
(going to backport to 4.4 if no regressions are visible)

BUG: 216213


 M  +8 -1      outputconfig.cpp  


--- branches/KDE/4.4/kdebase/workspace/kcontrol/randr/outputconfig.cpp #1089243:1089244
@@ -45,6 +45,8 @@
 	connect(m_output, SIGNAL(outputChanged(RROutput, int)),
 	        this,     SLOT(outputChanged(RROutput, int)));
 		  
+	load();
+
 	connect(sizeCombo,    SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
 	connect(refreshCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
 	connect(orientationCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
@@ -63,7 +65,6 @@
 	updatePositionListTimer.setSingleShot( true );
 	connect( &updatePositionListTimer, SIGNAL( timeout()), SLOT( updatePositionListDelayed()));
 
-	load();
 }
 
 OutputConfig::~OutputConfig()
@@ -294,6 +295,9 @@
 
 void OutputConfig::updatePositionListDelayed()
 {
+	disconnect(positionCombo,    SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
+	disconnect(positionOutputCombo,    SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
+
 	bool enable = !resolution().isEmpty();
 	positionCombo->setEnabled( enable );
 	positionLabel->setEnabled( enable );
@@ -338,6 +342,9 @@
 		if(index != -1)
 			positionOutputCombo->setCurrentIndex(index);
 	}*/
+
+	connect(positionCombo,    SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
+	connect(positionOutputCombo,    SIGNAL(currentIndexChanged(int)), this, SLOT(setConfigDirty()));
 }
 
 void OutputConfig::updateRotationList(void)
[prev in list] [next in list] [prev in thread] [next in thread]