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

List:       kde-commits
Subject:    KDE/kdebase/workspace/powerdevil
From:       Dario Freddi <drf () kde ! org>
Date:       2010-10-21 11:22:41
Message-ID: 20101021112241.89FC2AC898 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1188087 by dafre:

Bring back profile icons and profile generation.

 M  +3 -0      daemon/powerdevilprofilegenerator.cpp  
 M  +3 -0      kcmodule/CMakeLists.txt  
 M  +12 -23    kcmodule/EditPage.cpp  
 M  +4 -4      kcmodule/GeneralPage.cpp  


--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilprofilegenerator.cpp \
#1188086:1188087 @@ -56,6 +56,7 @@
 
     // Let's start: performance profile before anything else
     KConfigGroup performance(profilesConfig, i18nc("Name of a power profile", \
"Performance")); +    performance.writeEntry("icon", \
"preferences-system-performance");  
     // We want to dim the screen after a while, definitely
     {
@@ -105,6 +106,7 @@
 
         // Powersave
         KConfigGroup powersave(profilesConfig, i18nc("Name of a power profile", \
"Powersave")); +        powersave.writeEntry("icon", \
"preferences-system-power-management");  // Less brightness.
         {
             KConfigGroup brightnessControl(&powersave, "BrightnessControl");
@@ -146,6 +148,7 @@
 
         // Ok, now for aggressive powersave
         KConfigGroup aggrPowersave(profilesConfig, i18nc("Name of a power profile", \
"Aggressive powersave")); +        aggrPowersave.writeEntry("icon", "battery-low");
         // Less brightness.
         {
             KConfigGroup brightnessControl(&aggrPowersave, "BrightnessControl");
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/CMakeLists.txt #1188086:1188087
@@ -1,11 +1,14 @@
 set( kcm_powerdevil_profiles_SRCS
      EditPage.cpp
      actionconfigwidget.cpp
+     ../daemon/powerdevilprofilegenerator.cpp
 )
 
 kde4_add_ui_files(kcm_powerdevil_profiles_SRCS
     profileEditPage.ui)
 
+kde4_add_kcfg_files(kcm_powerdevil_profiles_SRCS ../PowerDevilSettings.kcfgc)
+
 kde4_add_plugin(kcm_powerdevilprofilesconfig ${kcm_powerdevil_profiles_SRCS})
 
 target_link_libraries(kcm_powerdevilprofilesconfig
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/EditPage.cpp #1188086:1188087
@@ -50,6 +50,7 @@
 #include <daemon/powerdevilactionconfig.h>
 #include <QtGui/QGroupBox>
 #include "actionconfigwidget.h"
+#include <daemon/powerdevilprofilegenerator.h>
 
 K_PLUGIN_FACTORY(PowerDevilProfilesKCMFactory,
                  registerPlugin<EditPage>();
@@ -80,22 +81,9 @@
     m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", \
KConfig::SimpleConfig);  
     if (m_profilesConfig->groupList().isEmpty()) {
-        // Let's add some basic profiles, huh?
-
-        KConfigGroup *performance = new KConfigGroup(m_profilesConfig, \
                "Performance");
-
-        performance->writeEntry("brightness", 100);
-        performance->writeEntry("idleAction", 0);
-        performance->writeEntry("idleTime", 50);
-        performance->writeEntry("lidAction", 0);
-        performance->writeEntry("turnOffIdle", false);
-        performance->writeEntry("turnOffIdleTime", 120);
-
-        performance->sync();
-
-        kDebug() << performance->readEntry("brightness");
-
-        delete performance;
+        // Use the generator
+        PowerDevil::ProfileGenerator::generateProfiles();
+        m_profilesConfig->reparseConfiguration();
     }
 
     m_toolBar = new KToolBar(this);
@@ -268,7 +256,7 @@
 
     foreach (const QString &ent, m_profilesConfig->groupList()) {
         KConfigGroup *group = new KConfigGroup(m_profilesConfig, ent);
-        QListWidgetItem *itm = new \
QListWidgetItem(KIcon(group->readEntry("iconname")), ent); +        QListWidgetItem \
*itm = new QListWidgetItem(KIcon(group->readEntry("icon")), ent);  \
profilesList->addItem(itm);  delete group;
     }
@@ -297,6 +285,7 @@
         return;
     }
     KConfigGroup group(m_profilesConfig, name);
+    group.writeEntry("icon", icon);
 
     group.sync();
 
@@ -343,7 +332,7 @@
 
     KConfigGroup group(m_profilesConfig, prevname);
 
-    group.writeEntry("iconname", icon);
+    group.writeEntry("icon", icon);
 
     group.sync();
 
@@ -379,7 +368,7 @@
 
     KConfigGroup *group = new KConfigGroup(m_profilesConfig, \
profilesList->currentItem()->text());  
-    ibt->setIcon(group->readEntry("iconname"));
+    ibt->setIcon(group->readEntry("icon"));
 
     lay->addRow(lb);
     lay->addRow(ibt, ed);
@@ -399,8 +388,8 @@
 
 void EditPage::importProfiles()
 {
-    QString fileName = KFileDialog::getOpenFileName(KUrl(), \
                "*.powerdevilprofiles|PowerDevil Profiles "
-                       "(*.powerdevilprofiles)", this, i18n("Import PowerDevil \
Profiles")); +    QString fileName = KFileDialog::getOpenFileName(KUrl(), \
"*.kpmsprofiles|KDE Power Management System Profiles " +                       \
"(*.kpmsprofiles)", this, i18n("Import Power Management Profiles"));  
     if (fileName.isEmpty()) {
         return;
@@ -422,8 +411,8 @@
 
 void EditPage::exportProfiles()
 {
-    QString fileName = KFileDialog::getSaveFileName(KUrl(), \
                "*.powerdevilprofiles|PowerDevil Profiles "
-                       "(*.powerdevilprofiles)", this, i18n("Export PowerDevil \
Profiles")); +    QString fileName = KFileDialog::getSaveFileName(KUrl(), \
"*.kpmsprofiles|KDE Power Management System Profiles " +                       \
"(*.kpmsprofiles)", this, i18n("Export Power Management Profiles"));  
     if (fileName.isEmpty()) {
         return;
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/GeneralPage.cpp #1188086:1188087
@@ -167,10 +167,10 @@
     foreach(const QString &ent, profilesConfig->groupList()) {
         KConfigGroup *group = new KConfigGroup(profilesConfig, ent);
 
-        acProfile->addItem(KIcon(group->readEntry("iconname")), ent);
-        batteryProfile->addItem(KIcon(group->readEntry("iconname")), ent);
-        lowProfile->addItem(KIcon(group->readEntry("iconname")), ent);
-        warningProfile->addItem(KIcon(group->readEntry("iconname")), ent);
+        acProfile->addItem(KIcon(group->readEntry("icon")), ent);
+        batteryProfile->addItem(KIcon(group->readEntry("icon")), ent);
+        lowProfile->addItem(KIcon(group->readEntry("icon")), ent);
+        warningProfile->addItem(KIcon(group->readEntry("icon")), ent);
         delete group;
     }
 


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