From 74782818ae120e265bd0ba091aaa36f799ec29f1 Mon Sep 17 00:00:00 2001 From: Jaroslav Reznik Date: Feb 27 2009 08:38:30 +0000 Subject: - kio_sysinfo kick-off integration --- diff --git a/kdebase-workspace-4.2.0-kio_sysinfo.patch b/kdebase-workspace-4.2.0-kio_sysinfo.patch new file mode 100644 index 0000000..0b5eef2 --- /dev/null +++ b/kdebase-workspace-4.2.0-kio_sysinfo.patch @@ -0,0 +1,59 @@ +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(); ++ } + } + } + diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec index cbc1147..0c67f38 100644 --- a/kdebase-workspace.spec +++ b/kdebase-workspace.spec @@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspace 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 @@ Patch11: kdebase-workspace-4.1.96-font.patch 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 @@ Requires: solar-kde-theme %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 @@ popd %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 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %changelog +* Thu Feb 26 2009 Jaroslav Reznik - 4.2.0-17 +- kio_sysinfo kick-off integration + * Tue Feb 24 2009 Jaroslav Reznik - 4.2.0-16 - no klipper action on selection for Arora browser