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

List:       kde-commits
Subject:    playground/base/guidance/displayconfig
From:       Sebastian Kügler <sebas () kde ! nl>
Date:       2006-08-31 21:51:26
Message-ID: 1157061086.090271.3766.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 579356 by sebas:

Fix stuppid bug in displayconfig's readDpms() - it now actually sets thecombo to the \
right value initially.

 M  +10 -7     displayconfig.py  


--- trunk/playground/base/guidance/displayconfig/displayconfig.py #579355:579356
@@ -1612,21 +1612,24 @@
             if line.strip().startswith("DPMS is"):
                 self.dpms_enabled = line.strip().split()[2]=="Enabled"
         
+        print "DPMS min:", self.dpms_min
+        print "DPMS ena:", self.dpms_enabled
         if self.dpms_min==0:    # 0 also means don't use Standby mode.
             self.dpms_enabled = False
             self.dpms_min = 1800
         
         self.dpmsgroup.setChecked(self.dpms_enabled)
 
-        found = False
         for i in range(len(self.intervals)):
-            if self.dpms_min >= self.intervals[i][0]:
-                self.dpmscombo.setCurrentItem(i)
-                last_time = self.intervals[i][0]
-                self.dpms_min = last_time
-            else:
+            diff = abs(self.intervals[i][0] - self.dpms_min)
+            if i==0: 
+                last_diff = diff
+            if (last_diff <= diff and i!=0) or (last_diff < diff):
+                i = i-1
                 break
-        
+            last_diff = diff
+        self.dpmscombo.setCurrentItem(i)
+
     def isChanged(self):
         """ Check if something has changed since startup or last apply(). """
         if self.dpmsgroup.isChecked():


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