Re: branches/KDE/4.6/kdebase/workspace/powerdevil
On Monday 24 January 2011 11:17:17 Dario Freddi wrote:
SVN commit 1216708 by dafre:
CCMAIL: Dirk Mueller muel...@kde.org
CCMAIL: release-team@kde.org
Backporting r1216705
This commit is critical and needs to be released in 4.6.0; otherwise it
needs to be reverted.
I don't understand this sentence, if the commit is not included in 4.6.0,
/what/ needs to be reverted?
Please add it to the tag or this issue might cause
troubles in the future.
What bug report, so we can look for downstream dupes from the RCs?
M +6 -40 daemon/actions/bundled/handlebuttonevents.cpp
M +9 -7 daemon/actions/bundled/handlebuttoneventsconfig.cpp
M +2 -1 daemon/actions/bundled/suspendsession.h
M +1 -1 daemon/powerdevilaction.cpp
M +1 -1 kcmodule/global/GeneralPage.cpp
---
branches/KDE/4.6/kdebase/workspace/powerdevil/daemon/actions/bundled/handl
ebuttonevents.cpp #1216707:1216708 @@ -19,6 +19,8 @@
#include handlebuttonevents.h
+#include suspendsession.h
+
#include powerdevilactionpool.h
#include KConfigGroup
@@ -87,33 +89,13 @@
void HandleButtonEvents::processAction(uint action)
{
// Basically, we simply trigger other actions :)
-switch (action) {
-case 1:
-// Sleep
-triggerAction(SuspendSession, qVariantFromValue uint (1));
-break;
-case 2:
-// Hibernate
-triggerAction(SuspendSession, qVariantFromValue uint (2));
-break;
-case 3:
-// Turn off PC
-triggerAction(SuspendSession, qVariantFromValue uint (8));
-break;
-case 4:
-// Lock
-triggerAction(SuspendSession, qVariantFromValue uint
(32)); -break;
-case 5:
-// Shutdown dialog
-triggerAction(SuspendSession, qVariantFromValue uint
(16)); -break;
-case 6:
+switch ((SuspendSession::Mode)action) {
+case SuspendSession::TurnOffScreenMode:
// Turn off screen
triggerAction(DPMSControl, qVariantFromValue QString
(TurnOff)); break;
default:
-// Do nothing
+triggerAction(SuspendSession, qVariantFromValue uint
(action)); break;
}
}
@@ -134,25 +116,9 @@
{
// For now, let's just accept the phantomatic 32 button.
if (args[Button].toInt() == 32) {
-switch (args[Button].toUInt()) {
-case 1:
-// Sleep
-triggerAction(SuspendSession, qVariantFromValue uint (1));
// To RAM -break;
-case 2:
-// Hibernate
-triggerAction(SuspendSession, qVariantFromValue uint (2));
// To disk -break;
-case 3:
-// Turn off PC
-triggerAction(SuspendSession, qVariantFromValue uint (8));
// Shutdown -break;
-default:
-// Do nothing
-break;
+triggerAction(SuspendSession, args[Button]);
}
}
-}
bool HandleButtonEvents::loadAction(const KConfigGroup config)
{
---
branches/KDE/4.6/kdebase/workspace/powerdevil/daemon/actions/bundled/handl
ebuttoneventsconfig.cpp #1216707:1216708 @@ -19,6 +19,8 @@
#include handlebuttoneventsconfig.h
+#include suspendsession.h
+
#include Solid/PowerManagement
#include KLocalizedString
@@ -72,19 +74,19 @@
QSet Solid::PowerManagement::SleepState methods =
Solid::PowerManagement::supportedSleepStates();
foreach (KComboBox *box, boxes) {
-box-addItem(KIcon(dialog-cancel), i18n(Do nothing),
(uint)0); +box-addItem(KIcon(dialog-cancel), i18n(Do
nothing), (uint)SuspendSession::None); if
(methods.contains(Solid::PowerManagement::SuspendState)) { -
box-addItem(KIcon(system-suspend), i18n(Sleep), (uint)1); +
box-addItem(KIcon(system-suspend), i18n(Sleep),
(uint)SuspendSession::ToRamMode); }
if (methods.contains(Solid::PowerManagement::HibernateState))
{ -box-addItem(KIcon(system-suspend-hibernate),
i18n(Hibernate), (uint)2); +
box-addItem(KIcon(system-suspend-hibernate), i18n(Hibernate),
(uint)SuspendSession::ToDiskMode); }
-box-addItem(KIcon(system-shutdown), i18n(Shutdown),
(uint)3); -box-addItem(KIcon(system-lock-screen),
i18n(Lock screen), (uint)4); +
box-addItem(KIcon(system-shutdown), i18n(Shutdown),
(uint)SuspendSession::ShutdownMode); +
box-addItem(KIcon(system-lock-screen), i18n(Lock screen),
(uint)SuspendSession::LockScreenMode); if (box != m_lidCloseCombo) {
-box-addItem(KIcon(system-log-out), i18n(Prompt log out
dialog), (uint)5); +box-addItem(KIcon(system-log-out),
i18n(Prompt log out dialog), (uint)SuspendSession::LogoutDialogMode); }
-box-addItem(KIcon(preferences-desktop-screensaver),
Re: branches/KDE/4.6/kdebase/workspace/powerdevil/daemon
On Monday 24 January 2011 11:19:16 Dario Freddi wrote:
SVN commit 1216709 by dafre:
CCMAIL: Dirk Mueller muel...@kde.org
CCMAIL: release-team@kde.org
Backporting r1216706
This commit fixes a critical bug in the migrator, hence it should be
released with 4.6.0
What bug, so we can look for downstream dupes from the RCs?
M +27 -14powerdevilprofilegenerator.cpp
M +23 -0 powerdevilprofilegenerator.h
---
branches/KDE/4.6/kdebase/workspace/powerdevil/daemon/powerdevilprofilegene
rator.cpp #1216708:1216709 @@ -260,26 +260,18 @@
runScript.writeEntry uint (scriptPhase, 0);
}
// SuspendSession
-if (oldGroup.readEntry int (idleAction, 0) 0) {
+if (oldGroup.readEntry uint (idleAction, 0) 0) {
KConfigGroup suspendSession(newGroup, SuspendSession);
suspendSession.writeEntry uint (idleTime,
oldGroup.readEntry int (idleTime, 30) * 60 * 1000); -if
(!methods.contains(Solid::PowerManagement::SuspendState)) { -
suspendSession.writeEntry uint (suspendType, 2); -} else
{
-suspendSession.writeEntry uint (suspendType, 1);
+suspendSession.writeEntry uint (suspendType,
upgradeOldAction(oldGroup.readEntry uint (idleAction, 0))); }
-}
// Buttons
-if (oldGroup.readEntry int (powerButtonAction, 0) 0 ||
oldGroup.readEntry int (lidAction, 0) 0) { -KConfigGroup
suspendSession(newGroup, SuspendSession); -
suspendSession.writeEntry uint (idleTime, oldGroup.readEntry int
(idleTime, 30) * 60 * 1000); -if
(!methods.contains(Solid::PowerManagement::SuspendState)) { -
suspendSession.writeEntry uint (suspendType, 2); -} else
{
-suspendSession.writeEntry uint (suspendType, 1);
+if (oldGroup.readEntry uint (powerButtonAction, 0) 0 ||
oldGroup.readEntry uint (lidAction, 0) 0) { +
KConfigGroup handleButtons(newGroup, HandleButtonEvents); +
handleButtons.writeEntry uint (powerButtonAction,
upgradeOldAction(oldGroup.readEntry uint (powerButtonAction, 0))); +
handleButtons.writeEntry uint (lidAction,
upgradeOldAction(oldGroup.readEntry uint (lidAction, 0))); }
}
-}
// Save and be happy
profilesConfig-sync();
@@ -301,4 +293,25 @@
}
}
+uint ProfileGenerator::upgradeOldAction(uint oldAction)
+{
+switch ((OldIdleAction)oldAction) {
+case Standby:
+case S2Ram:
+return ToRamMode;
+case S2Disk:
+return ToDiskMode;
+case Shutdown:
+return ShutdownMode;
+case Lock:
+return LockScreenMode;
+case ShutdownDialog:
+return LogoutDialogMode;
+case TurnOffScreen:
+return TurnOffScreenMode;
+default:
+return 0;
}
+}
+
+}
---
branches/KDE/4.6/kdebase/workspace/powerdevil/daemon/powerdevilprofilegene
rator.h #1216708:1216709 @@ -31,8 +31,31 @@
ResultUpgraded = 2
};
+enum OldIdleAction {
+None = 0,
+Standby = 1,
+S2Ram = 2,
+S2Disk = 4,
+Shutdown = 8,
+Lock = 16,
+ShutdownDialog = 32,
+TurnOffScreen = 64
+};
+
+enum NewMode {
+NoneMode = 0,
+ToRamMode = 1,
+ToDiskMode = 2,
+SuspendHybridMode = 4,
+ShutdownMode = 8,
+LogoutDialogMode = 16,
+LockScreenMode = 32,
+TurnOffScreenMode = 64
+};
+
GeneratorResult generateProfiles(bool tryUpgrade = false);
void upgradeProfiles();
+unsigned int upgradeOldAction(unsigned int actionId);
}
}
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team
Re: branches/KDE/4.6/kdebase/workspace/powerdevil/daemon
On Tuesday 25 January 2011 12:52:14 Will Stephenson wrote: On Monday 24 January 2011 11:19:16 Dario Freddi wrote: SVN commit 1216709 by dafre: CCMAIL: Dirk Mueller muel...@kde.org CCMAIL: release-team@kde.org Backporting r1216706 This commit fixes a critical bug in the migrator, hence it should be released with 4.6.0 What bug, so we can look for downstream dupes from the RCs? From 1216706: The profile migrator didn't know how to migrate actions (yet). Make him learn just in time for the final release. ___ release-team mailing list release-team@kde.org https://mail.kde.org/mailman/listinfo/release-team
Re: branches/KDE/4.6/kdebase/workspace/powerdevil
On Tuesday 25 January 2011 12:51:52 Will Stephenson wrote: n Monday 24 January 2011 11:17:17 Dario Freddi wrote: SVN commit 1216708 by dafre: CCMAIL: Dirk Mueller muel...@kde.org CCMAIL: release-team@kde.org Backporting r1216705 This commit is critical and needs to be released in 4.6.0; otherwise it needs to be reverted. I don't understand this sentence, if the commit is not included in 4.6.0, what needs to be reverted? Please add it to the tag or this issue might cause troubles in the future. What bug report, so we can look for downstream dupes from the RCs? from 1216705: Move handling of button events config to the same format of suspendsession's one. This greatly facilitates code sharing and allows to remove quite a lot of redundant code. Bad news for beta/RC users willing to upgrade though: this might break your profiles' button actions. What's the critical part though? ___ release-team mailing list release-team@kde.org https://mail.kde.org/mailman/listinfo/release-team
Re: KDE 4.6.0 tarballs (try#1) uploaded
On Friday 21 January 2011, Eric Hameleers wrote: I just finished uploading the first set of KDE 4.6.0 tarballs. It includes a hotfix for the last showstopper bug, so we can continue. Thanks to Sebastian and Will for debugging and working on the issue Hi, had to update kdebase-workspace again for one plasma fix and for powerdevil migration fixes that can't be delayed until 4.6.1: ae1fd9f2d7db74ffb19cb7ccc9eac2d7 kdebase-workspace-4.6.0.tar.bz2 Announcement is delayed until tomorrow morning. sorry for the late update. Thanks, Dirk ___ release-team mailing list release-team@kde.org https://mail.kde.org/mailman/listinfo/release-team
