rpms/kdebase-workspace/devel kdebase-workspace-4.2.0-kio_sysinfo.patch, NONE, 1.1 kdebase-workspace.spec, 1.190, 1.191
Jaroslav Reznik
jreznik at fedoraproject.org
Fri Feb 27 08:39:01 UTC 2009
Author: jreznik
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14424
Modified Files:
kdebase-workspace.spec
Added Files:
kdebase-workspace-4.2.0-kio_sysinfo.patch
Log Message:
* Thu Feb 26 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-17
- 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/devel/kdebase-workspace.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- kdebase-workspace.spec 24 Feb 2009 14:20:06 -0000 1.190
+++ kdebase-workspace.spec 27 Feb 2009 08:38:30 -0000 1.191
@@ -8,7 +8,7 @@
Name: kdebase-workspace
Version: 4.2.0
-Release: 16%{?dist}
+Release: 17%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -30,6 +30,7 @@
Patch12: kdebase-workspace-4.2.0-default_applets.patch
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
# 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.
@@ -217,6 +220,8 @@
%patch12 -p1 -b .default_applets
%patch13 -p1 -b .pykde4
%patch14 -p1 -b .klipper-arora
+# kio_sysinfo based on OpenSUSE's patch
+%patch15 -p1 -b .kio_sysinfo
# upstream patches
%patch100 -p1 -b .AllowExternalPaths
@@ -378,6 +383,9 @@
%changelog
+* Thu Feb 26 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-17
+- kio_sysinfo kick-off integration
+
* Tue Feb 24 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-16
- no klipper action on selection for Arora browser
More information about the fedora-extras-commits
mailing list