[kdebase-workspace] Rebase battery-plasmoid-showremainingtime and classicmenu-logout patches.
Kevin Kofler
kkofler at fedoraproject.org
Sat Nov 20 19:43:24 UTC 2010
commit 5ce71c1017c06b8644bac940aefe7313a8b02390
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Nov 20 20:43:09 2010 +0100
Rebase battery-plasmoid-showremainingtime and classicmenu-logout patches.
...4.4.80-battery-plasmoid-showremainingtime.patch | 16 -----------
...4.5.80-battery-plasmoid-showremainingtime.patch | 16 +++++++++++
...ebase-workspace-4.5.80-classicmenu-logout.patch | 28 ++++++++++----------
kdebase-workspace.spec | 12 ++++----
4 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime.patch b/kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime.patch
new file mode 100644
index 0000000..ef899e8
--- /dev/null
+++ b/kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime.patch
@@ -0,0 +1,16 @@
+diff -ur kdebase-workspace-4.5.80/plasma/generic/applets/battery/battery.cpp kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime/plasma/generic/applets/battery/battery.cpp
+--- kdebase-workspace-4.5.80/plasma/generic/applets/battery/battery.cpp 2010-11-19 11:51:21.000000000 +0100
++++ kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime/plasma/generic/applets/battery/battery.cpp 2010-11-20 20:39:11.000000000 +0100
+@@ -712,7 +712,11 @@
+ m_acInfoLabel->setText(i18n("<b>Not plugged in</b>"));
+ }
+
+- if (batteryCount && showRemainingTime && m_remainingMSecs > 0) {
++ // Always show the remaining time in the popup.
++ // We don't just set m_showRemainingTime to true by default because
++ // that'd try to use the time also for the icon. That won't fit on
++ // small panels.
++ if (batteryCount && m_remainingMSecs > 0) {
+ m_remainingTimeLabel->show();
+ m_remainingInfoLabel->show();
+ // we don't have too much accuracy so only give hours and minutes
diff --git a/kdebase-workspace-4.4.0-classicmenu-logout.patch b/kdebase-workspace-4.5.80-classicmenu-logout.patch
similarity index 62%
rename from kdebase-workspace-4.4.0-classicmenu-logout.patch
rename to kdebase-workspace-4.5.80-classicmenu-logout.patch
index 422c073..a7d701e 100644
--- a/kdebase-workspace-4.4.0-classicmenu-logout.patch
+++ b/kdebase-workspace-4.5.80-classicmenu-logout.patch
@@ -1,6 +1,6 @@
-diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/core/itemhandlers.cpp
---- kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/core/itemhandlers.cpp 2010-01-06 18:00:18.000000000 +0100
-+++ kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/core/itemhandlers.cpp 2010-02-13 12:47:31.000000000 +0100
+diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/core/itemhandlers.cpp
+--- kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp 2010-01-06 18:00:18.000000000 +0100
++++ kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/core/itemhandlers.cpp 2010-11-20 20:31:20.000000000 +0100
@@ -110,7 +110,8 @@
QTimer::singleShot(0, this, SLOT(switchUser()));
return true;
@@ -22,18 +22,18 @@ diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/core/itemhandler
}
//FIXME: the proper fix is to implement the KWorkSpace methods for Windows
-diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
---- kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010-01-06 18:00:18.000000000 +0100
-+++ kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010-02-13 12:49:23.000000000 +0100
-@@ -207,6 +207,7 @@
- case Shutdown: return i18n("Shutdown");
- case Logout: return i18n("Logout");
+diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
+--- kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010-11-19 11:51:20.000000000 +0100
++++ kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010-11-20 20:31:20.000000000 +0100
+@@ -209,6 +209,7 @@
+ case Shutdown: return i18n("Shut down");
+ case Logout: return i18n("Log out");
case Leave: return i18n("Leave");
+ case LeaveDialog: return i18n("Leave...");
}
return QString();
}
-@@ -232,6 +233,7 @@
+@@ -234,6 +235,7 @@
case Shutdown: return "system-shutdown";
case Logout: return "system-log-out";
case Leave: return "system-shutdown";
@@ -41,7 +41,7 @@ diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/sim
}
return QString();
}
-@@ -727,6 +729,8 @@
+@@ -725,6 +727,8 @@
menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
} else if(vtname == "Logout") {
menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
@@ -50,9 +50,9 @@ diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/sim
} else if(vtname == "Leave") {
Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(menuview);
leavemodel->updateModel();
-diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h
---- kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h 2009-09-16 13:40:52.000000000 +0200
-+++ kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h 2010-02-13 12:47:31.000000000 +0100
+diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h
+--- kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h 2010-06-06 22:35:40.000000000 +0200
++++ kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h 2010-11-20 20:31:20.000000000 +0100
@@ -59,7 +59,8 @@
Restart, ///< Restart Action
Shutdown, ///< Shutdown Action
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index fad7ff2..702a849 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -46,12 +46,12 @@ Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
Patch15: kdebase-workspace-4.3.75-kio_sysinfo.patch
# show the remaining time in the battery plasmoid's popup (#515166)
-Patch16: kdebase-workspace-4.4.80-battery-plasmoid-showremainingtime.patch
+Patch16: kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime.patch
# allow adding a "Leave..." button which brings up the complete shutdown dialog
# to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
# default Leave submenu
-Patch17: kdebase-workspace-4.4.0-classicmenu-logout.patch
+Patch17: kdebase-workspace-4.5.80-classicmenu-logout.patch
# kubuntu kudos! bulletproof-X bits ripped out
Patch19: kdebase-workspace-4.4.92-kdm_plymouth081.patch
@@ -297,6 +297,8 @@ Requires: akonadi
%patch1 -p1 -b .redhat_startkde
# FIXME, I believe there are better ways of doing this now -- Rex
+# Well, I looked at doing this using the context menu plugin system and it
+# looked like a lot more work than this simple patch to me. -- Kevin
%patch2 -p1 -b .plasma-konsole
%patch3 -p1 -b .systemsettings_onlyshowin_kde
%patch7 -p0 -b .krdb
@@ -304,10 +306,8 @@ Requires: akonadi
%patch9 -p1 -b .rootprivs
%patch11 -p1 -b .font
%patch15 -p1 -b .kio_sysinfo
-# FIXME, rebase? -- Rex
-#patch16 -p1 -b .showremainingtime
-# FIXME, rebase? drop? -- Rex
-#patch17 -p1 -b .classicmenu-logout
+%patch16 -p1 -b .showremainingtime
+%patch17 -p1 -b .classicmenu-logout
%patch19 -p1 -b .kdm_plymouth
%patch20 -p1 -b .xsession_errors_O_APPEND
%patch21 -p1 -b .platformplugin-widgetstyle4
More information about the scm-commits
mailing list