rpms/kdebase-workspace/devel kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch, NONE, 1.1 kdebase-workspace.spec, 1.259, 1.260

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18898/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch 
Log Message:
* Mon Aug 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-3
- show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)

kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch:
 battery.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch ---
diff -ur kdebase-workspace-4.3.0/plasma/applets/battery/battery.cpp kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime/plasma/applets/battery/battery.cpp
--- kdebase-workspace-4.3.0/plasma/applets/battery/battery.cpp	2009-07-08 16:45:03.000000000 +0200
+++ kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime/plasma/applets/battery/battery.cpp	2009-08-03 06:43:04.000000000 +0200
@@ -530,7 +530,11 @@
             QString state = battery_data.value()["State"].toString();
             m_remainingMSecs = battery_data.value()["Remaining msec"].toInt();
             //kDebug() << "time left:" << m_remainingMSecs;
-            if (state == "Discharging" && m_remainingMSecs > 0 && m_showRemainingTime) {
+            // Always show the remaining time in the popup (like KDE 4.2.x did).
+            // 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 and wasn't the default in 4.2 either.
+            if (state == "Discharging" && m_remainingMSecs > 0) {
 
                 // FIXME: Somehow, m_extenderApplet is null here, so the label never becomes visible
                 if (m_extenderApplet) {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- kdebase-workspace.spec	1 Aug 2009 23:44:19 -0000	1.259
+++ kdebase-workspace.spec	3 Aug 2009 04:46:19 -0000	1.260
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -25,6 +25,8 @@ Patch12: kdebase-workspace-4.2.95-defaul
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
+# show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
+Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
 
 # upstream patches:
 # 4.3 branch
@@ -222,6 +224,7 @@ Requires: PyKDE4 >= %{version}
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
+%patch16 -p1 -b .showremainingtime
 
 # upstream patches
 
@@ -512,6 +515,9 @@ fi
 
 
 %changelog
+* Mon Aug 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-3
+- show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
+
 * Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - move designer plugins to -libs, fixes
   Multilib conflicts for index.cache.bz2 (#515088)