|
 |
b5cc75 |
diff -U5 -r kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/models.cpp kdebase-workspace-4.3.75svn1048496.kio_sysinfo/plasma/desktop/applets/kickoff/core/models.cpp
|
|
|
b5cc75 |
--- kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/models.cpp 2009-10-15 12:33:38.000000000 -0400
|
|
|
b5cc75 |
+++ kdebase-workspace-4.3.75svn1048496.kio_sysinfo/plasma/desktop/applets/kickoff/core/models.cpp 2009-11-21 15:24:44.000000000 -0500
|
|
|
b5cc75 |
@@ -176,10 +176,12 @@
|
|
|
b5cc75 |
QStringList Kickoff::systemApplicationList()
|
|
|
b5cc75 |
{
|
|
|
b5cc75 |
KConfigGroup appsGroup = componentData().config()->group("SystemApplications");
|
|
|
b5cc75 |
QStringList apps;
|
|
|
b5cc75 |
apps << "systemsettings";
|
|
|
b5cc75 |
+ if (QFile::exists("/usr/share/kde4/services/sysinfo.protocol"))
|
|
|
b5cc75 |
+ apps << "/usr/share/kde4/services/sysinfo.protocol";
|
|
|
b5cc75 |
apps = appsGroup.readEntry("DesktopFiles", apps);
|
|
|
b5cc75 |
return apps;
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
|
|
|
b5cc75 |
#if 0
|
|
|
b5cc75 |
diff -U5 -r kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/systemmodel.cpp kdebase-workspace-4.3.75svn1048496.kio_sysinfo/plasma/desktop/applets/kickoff/core/systemmodel.cpp
|
|
|
b5cc75 |
--- kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/systemmodel.cpp 2009-11-13 05:57:47.000000000 -0500
|
|
|
b5cc75 |
+++ kdebase-workspace-4.3.75svn1048496.kio_sysinfo/plasma/desktop/applets/kickoff/core/systemmodel.cpp 2009-11-21 15:25:04.000000000 -0500
|
|
|
b5cc75 |
@@ -244,21 +244,36 @@
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
|
|
|
b5cc75 |
KService::Ptr service = d->appsList[index.row()];
|
|
|
b5cc75 |
|
|
|
b5cc75 |
- switch (role) {
|
|
|
b5cc75 |
- case Qt::DisplayRole:
|
|
|
b5cc75 |
- return service->name();
|
|
|
b5cc75 |
- case Qt::DecorationRole:
|
|
|
b5cc75 |
- return KIcon(service->icon());
|
|
|
b5cc75 |
- case SubTitleRole:
|
|
|
b5cc75 |
- return service->genericName();
|
|
|
b5cc75 |
- case UrlRole:
|
|
|
b5cc75 |
- return service->entryPath();
|
|
|
b5cc75 |
- default:
|
|
|
b5cc75 |
- return QVariant();
|
|
|
b5cc75 |
+ if (service->name()=="sysinfo") {
|
|
|
b5cc75 |
+ switch(role) {
|
|
|
b5cc75 |
+ case Qt::DisplayRole:
|
|
|
b5cc75 |
+ return i18n("System Information");
|
|
|
b5cc75 |
+ case Qt::DecorationRole:
|
|
|
b5cc75 |
+ return KIcon("hwinfo");
|
|
|
b5cc75 |
+ case SubTitleRole:
|
|
|
b5cc75 |
+ return "sysinfo:/";
|
|
|
b5cc75 |
+ case UrlRole:
|
|
|
b5cc75 |
+ return "sysinfo:/";
|
|
|
b5cc75 |
+ default:
|
|
|
b5cc75 |
+ return QVariant();
|
|
|
b5cc75 |
+ }
|
|
|
b5cc75 |
+ } else {
|
|
|
b5cc75 |
+ switch (role) {
|
|
|
b5cc75 |
+ case Qt::DisplayRole:
|
|
|
b5cc75 |
+ return service->name();
|
|
|
b5cc75 |
+ case Qt::DecorationRole:
|
|
|
b5cc75 |
+ return KIcon(service->icon());
|
|
|
b5cc75 |
+ case SubTitleRole:
|
|
|
b5cc75 |
+ return service->genericName();
|
|
|
b5cc75 |
+ case UrlRole:
|
|
|
b5cc75 |
+ return service->entryPath();
|
|
|
b5cc75 |
+ default:
|
|
|
b5cc75 |
+ return QVariant();
|
|
|
b5cc75 |
+ }
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
|
|
|
b5cc75 |
if (role == UrlRole && !d->placesModel->isHidden(mapToSource(index))) {
|
|
|
b5cc75 |
QModelIndex parent = index.parent();
|