rpms/kdebase-workspace/F-10 kdebase-workspace-4.2.0-kio_sysinfo.patch, NONE, 1.1 kdebase-workspace.spec, 1.160, 1.161
Jaroslav Reznik
jreznik at fedoraproject.org
Fri Feb 27 11:26:49 UTC 2009
- Previous message: rpms/alexandria/F-10 alexandria-0.6.3-library-utf8-string.patch, NONE, 1.1 alexandria.spec, 1.16, 1.17
- Next message: rpms/gnome-applet-timer/devel .cvsignore, 1.8, 1.9 gnome-applet-timer.spec, 1.27, 1.28 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jreznik
Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14802
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-15
- 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-10/kdebase-workspace.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kdebase-workspace.spec 24 Feb 2009 14:33:39 -0000 1.160
+++ kdebase-workspace.spec 27 Feb 2009 11:26:18 -0000 1.161
@@ -8,7 +8,7 @@
Name: kdebase-workspace
Version: 4.2.0
-Release: 14%{?dist}
+Release: 15%{?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
@@ -118,6 +119,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.
@@ -216,6 +219,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
@@ -377,6 +382,9 @@
%changelog
+* Fri Feb 27 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-15
+- kio_sysinfo kick-off integration
+
* Tue Feb 24 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-14
- no klipper action on selection for Arora browser
- Previous message: rpms/alexandria/F-10 alexandria-0.6.3-library-utf8-string.patch, NONE, 1.1 alexandria.spec, 1.16, 1.17
- Next message: rpms/gnome-applet-timer/devel .cvsignore, 1.8, 1.9 gnome-applet-timer.spec, 1.27, 1.28 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list