rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.0-kio_sysinfo.patch, NONE, 1.1 kdebase-workspace.spec, 1.133, 1.134

[Jaroslav Reznik]

Author: jreznik

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28682

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-kio_sysinfo.patch 
Log Message:
* Fri Feb 27 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-12
- kio_sysinfo kick-off integration


kdebase-workspace-4.2.0-kio_sysinfo.patch:

--- NEW FILE kdebase-workspace-4.2.0-kio_sysinfo.patch ---
diff -up kdebase-workspace-4.2.0/plasma/applets/kickoff/core/models.cpp.kio_sysinfo kdebase-workspace-4.2.0/plasma/applets/kickoff/core/models.cpp
--- kdebase-workspace-4.2.0/plasma/applets/kickoff/core/models.cpp.kio_sysinfo	2008-11-19 11:18:14.000000000 +0100
+++ kdebase-workspace-4.2.0/plasma/applets/kickoff/core/models.cpp	2009-02-26 15:09:17.000000000 +0100
@@ -154,6 +154,8 @@ QStringList Kickoff::systemApplicationLi
     KConfigGroup appsGroup = componentData().config()->group("SystemApplications");
     QStringList apps;
     apps << "systemsettings";
+    if (QFile::exists("/usr/share/kde4/services/sysinfo.protocol"))  
+        apps << "/usr/share/kde4/services/sysinfo.protocol";
     apps = appsGroup.readEntry("DesktopFiles", apps);
     return apps;
 }
diff -up kdebase-workspace-4.2.0/plasma/applets/kickoff/core/systemmodel.cpp.kio_sysinfo kdebase-workspace-4.2.0/plasma/applets/kickoff/core/systemmodel.cpp
--- kdebase-workspace-4.2.0/plasma/applets/kickoff/core/systemmodel.cpp.kio_sysinfo	2008-11-19 11:18:14.000000000 +0100
+++ kdebase-workspace-4.2.0/plasma/applets/kickoff/core/systemmodel.cpp	2009-02-26 15:04:57.000000000 +0100
@@ -245,17 +245,32 @@ QVariant SystemModel::data(const QModelI
 
         KService::Ptr service = d->appsList[index.row()];
 
-        switch (role) {
-        case Qt::DisplayRole:
-            return service->name();
-        case Qt::DecorationRole:
-            return KIcon(service->icon());
-        case SubTitleRole:
-            return service->genericName();
-        case UrlRole:
-            return service->entryPath();
-        default:
-            return QVariant();
+        if (service->name()=="sysinfo") {  
+            switch(role) {  
+            case Qt::DisplayRole:  
+                return i18n("System Information");  
+            case Qt::DecorationRole:  
+                return KIcon("hwinfo");  
+            case SubTitleRole:  
+                return "sysinfo:/";  
+            case UrlRole:  
+                return "sysinfo:/";  
+            default:  
+                return QVariant();  
+            }  
+        } else {  
+            switch (role) {
+            case Qt::DisplayRole:
+                return service->name();
+            case Qt::DecorationRole:
+                return KIcon(service->icon());
+            case SubTitleRole:
+                return service->genericName();
+            case UrlRole:
+                return service->entryPath();
+            default:
+                return QVariant();
+            }
         }
     }
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- kdebase-workspace.spec	24 Feb 2009 14:39:33 -0000	1.133
+++ kdebase-workspace.spec	27 Feb 2009 12:22:40 -0000	1.134
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -29,6 +29,7 @@
 Patch11: kdebase-workspace-4.1.96-font.patch
 Patch12: kdebase-workspace-4.2.0-default_applets.patch
 Patch13: kdebase-workspace-4.2.0-klipper-arora.patch
+Patch14: kdebase-workspace-4.2.0-kio_sysinfo.patch
 
 # upstream patches:
 # trunk
@@ -119,6 +120,8 @@
 %define default_face_icon default1.png
 %endif
 
+Requires: kio_sysinfo
+
 %description
 The KDE Workspace consists of what is the desktop of the
 KDE Desktop Environment.
@@ -203,6 +206,9 @@
 %patch11 -p1 -b .font
 %patch12 -p1 -b .default_applets
 %patch13 -p1 -b .klipper-arora
+# kio_sysinfo based on OpenSUSE's patch
+%patch14 -p1 -b .kio_sysinfo
+
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
@@ -339,6 +345,9 @@
 
 
 %changelog
+* Fri Feb 27 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-12
+- kio_sysinfo kick-off integration
+
 * Tue Feb 24 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-11
 - no klipper action on selection for Arora browser