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

List:       kde-commits
Subject:    playground/utils/kde4powersave
From:       Thomas J. Gillespie <tomjamesgillespie () googlemail ! com>
Date:       2008-05-29 1:16:31
Message-ID: 1212023791.712223.17422.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 813992 by gillespie:

Some more kde4powersave tweaks, ready for testing


 M  +21 -13    kde4powersave.cpp  
 M  +1 -0      kde4powersave.h  


--- trunk/playground/utils/kde4powersave/kde4powersave.cpp #813991:813992
@@ -48,6 +48,7 @@
     eventNotifier(Solid::Control::PowerManager::notifier()),
     actions(new KActionCollection(this)),
     configOpen(false),
+    configSetup(false),
     currentBrightness(Solid::Control::PowerManager::brightness()),
     pollTimer(new QTimer()),
     batterySvg(new KSvgRenderer(KStandardDirs::locate("data", "kde4powersave/battery-powersave.svg")))
@@ -67,7 +68,7 @@
     connect(eventNotifier, SIGNAL(batteryStateChanged(int)), this, SLOT(batteryStateChanged(int)));
     connect(eventNotifier, SIGNAL(buttonPressed(int)), this, SLOT(buttonPressed(int)));
 
-    acAdapterStateChanged(Solid::Control::PowerManager::AcAdapterState()); //apply settings
+    acAdapterStateChanged(Solid::Control::PowerManager::acAdapterState()); //apply settings
 
     drawIcon();
     systray->show();
@@ -239,7 +240,6 @@
 
 void kde4powersave::acAdapterStateChanged(int state)
 {
-    kDebug() << "Adapter state chnaged";
     using namespace Solid::Control::PowerManager;
     if(state == Plugged)
     {
@@ -255,6 +255,7 @@
         setBrightness(batBrightness);
         setCpuFreqPolicy(batCpuPolicy);
     }
+    drawIcon();
 }
 
 void kde4powersave::batteryStateChanged(int state)
@@ -336,12 +337,16 @@
 ///SLOT - Shows the configure dialog
 void kde4powersave::showConfigure()
 {
+    if(!configSetup)
+    {
+        mConfigDialog->setup(); // setup the ui in the config dialog
+        configSetup = true;
+    }
     configOpen = true;
-    mConfigDialog->setup();
     if(mConfigDialog->exec() == QDialog::Accepted)
     {
         readSettings();
-        acAdapterStateChanged(Solid::Control::PowerManager::AcAdapterState()); //apply settings
+        acAdapterStateChanged(Solid::Control::PowerManager::acAdapterState()); //apply settings
     }
 }
 
@@ -413,10 +418,11 @@
             setBrightness(currentBrightness);
         }
     }
-    //Idle action stuff
+
+/*    //Idle action stuff
     if(onAc)
     {
-        if(idle >= acIdle)
+        if(idle >= acIdle*60)
         {
             switch(acIdleAction)
             {
@@ -424,20 +430,20 @@
                     shutdown();
                     break;
                 case S2DISK:
-                    suspend(ToDisk);
+                    suspendToDisk();
                     break;
                 case S2RAM:
-                    suspend(ToRam);
+                    suspendToRam();
                     break;
                 case STANDBY:
-                    suspend(Standby);
+                    standby();
                     break;
              }
         }
     } 
     else
     {
-        if(idle >= batIdle)
+        if(idle >= batIdle*60)
         {
             switch(batIdleAction)
             {
@@ -445,17 +451,19 @@
                     shutdown();
                     break;
                 case S2DISK:
-                    suspend(ToDisk);
+                    suspendToDisk();
                     break;
                 case S2RAM:
-                    suspend(ToRam);
+                    suspendToRam();
                     break;
                 case STANDBY:
-                    suspend(Standby);
+                    standby();
                     break;
              }
         }
     }
+*/ //FIXME - Rethink this, it causes suspension, i.e. machine is suspended as soon as it is resumed
+
     //Redraw icon stuff
     if(currentBattery != batteryChargePercent())
     {
--- trunk/playground/utils/kde4powersave/kde4powersave.h #813991:813992
@@ -89,6 +89,7 @@
         ///State
         bool onAc;
         bool configOpen;
+        bool configSetup;
         int currentBrightness;
         int currentBattery;
         QTimer * pollTimer;
[prev in list] [next in list] [prev in thread] [next in thread]