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

List:       kde-commits
Subject:    KDE/kdebase/workspace/powerdevil/daemon
From:       Dario Freddi <drf () kde ! org>
Date:       2010-12-09 7:22:15
Message-ID: 20101209072215.3D525AC8A7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204812 by dafre:

Add the possibility of upgrading profiles, and notify the user in case.

 M  +6 -1      powerdevilcore.cpp  
 M  +11 -1     powerdevilprofilegenerator.cpp  
 M  +7 -1      powerdevilprofilegenerator.h  


--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilcore.cpp #1204811:1204812
@@ -98,7 +98,12 @@
     // Is it brand new?
     if (m_profilesConfig->groupList().isEmpty()) {
         // Generate defaults
-        ProfileGenerator::generateProfiles();
+        if (ProfileGenerator::generateProfiles(true) == \
ProfileGenerator::ResultUpgraded) { +            // Notify the user
+            emitNotification("warningnot", i18n("Your Power Profiles have been \
updated to be used with the new KDE Power " +                                         \
"Management System. You can tweak them or generate a new set of defaults from " +     \
"System Settings."), "system-software-update"); +        }
         m_profilesConfig->reparseConfiguration();
     }
 
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilprofilegenerator.cpp \
#1204811:1204812 @@ -36,8 +36,16 @@
 
 namespace PowerDevil {
 
-void ProfileGenerator::generateProfiles()
+ProfileGenerator::GeneratorResult ProfileGenerator::generateProfiles(bool \
tryUpgrade)  {
+    if (tryUpgrade) {
+        KSharedConfigPtr oldProfilesConfig = \
KSharedConfig::openConfig("powerdevilprofilesrc", KConfig::SimpleConfig); +        if \
(!oldProfilesConfig->groupList().isEmpty()) { +            // We can upgrade, let's \
do that. +            upgradeProfiles();
+            return ResultUpgraded;
+        }
+    }
     QSet< Solid::PowerManagement::SleepState > methods = \
Solid::PowerManagement::supportedSleepStates();  
     // Let's change some defaults
@@ -199,6 +207,8 @@
     // Save and be happy
     PowerDevilSettings::self()->writeConfig();
     profilesConfig->sync();
+
+    return ResultGenerated;
 }
 
 void ProfileGenerator::upgradeProfiles()
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilprofilegenerator.h \
#1204811:1204812 @@ -25,7 +25,13 @@
 
 namespace ProfileGenerator
 {
-    void generateProfiles();
+    enum GeneratorResult {
+        ResultFailed = 0,
+        ResultGenerated = 1,
+        ResultUpgraded = 2
+    };
+
+    GeneratorResult generateProfiles(bool tryUpgrade = false);
     void upgradeProfiles();
 }
 


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