- sort items in battery applet; rel back to 1 as that was changed by mistake

diff --git a/kde4-kdebase-workspace-multibattery.patch b/kde4-kdebase-workspace-multibattery.patch
index b7f8ffad353617de6332371b75f5f0d1c2832c15..9865c515cb25b61cf07dc0f94486cf2756ab926f 100644 (file)
--- a/kde4-kdebase-workspace-multibattery.patch
+++ b/kde4-kdebase-workspace-multibattery.patch
@@ -2224,3 +2224,33 @@ index aa57ab8..0000000
 -    return false;
 -}
 -
+diff --git a/plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml b/plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml
+index 357c2dc..feda7bc 100644
+--- a/plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml
++++ b/plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml
+@@ -84,13 +84,19 @@ Item {
+         }
+     }
+ 
+-    property QtObject batteries: PlasmaCore.DataModel {
++    property QtObject batteries: PlasmaCore.SortFilterModel {
+         id: batteries
+-        dataSource: pmSource
+-        sourceFilter: "Battery[0-9]+"
+-
+-        onDataChanged: {
+-            updateLogic()
++        filterRole: "Is Power Supply"
++        sortOrder: Qt.DescendingOrder
++        sourceModel: PlasmaCore.SortFilterModel {
++            sortRole: "Pretty Name"
++            sortOrder: Qt.AscendingOrder
++            sourceModel: PlasmaCore.DataModel {
++                dataSource: pmSource
++                sourceFilter: "Battery[0-9]+"
++
++                onDataChanged: updateLogic()
++            }
+         }
+ 
+         property int cumulativePercent

diff --git a/kde4-kdebase-workspace.spec b/kde4-kdebase-workspace.spec
index fe42677c1d7df3e1cce7cb4c673da5ce3ba6a497..d87667db3d6272dc4406f7fc8e72327ff43ddb1f 100644 (file)
--- a/kde4-kdebase-workspace.spec
+++ b/kde4-kdebase-workspace.spec
@@ -8,7 +8,7 @@ Summary:        KDE 4 base workspace components
 Summary(pl.UTF-8):     Podstawowe komponenty środowiska KDE 4
 Name:          kde4-kdebase-workspace
 Version:       4.10.4
-Release:       1.1
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz