summaryrefslogtreecommitdiffstats
path: root/opensuse/core/tdebase/kickoff-install-software.diff
diff options
context:
space:
mode:
authorRobert Xu <rxu@linux-zdwj.site>2012-02-01 00:31:59 -0500
committerRobert Xu <rxu@linux-zdwj.site>2012-02-01 00:31:59 -0500
commitf599f39717d771b8b7a2aff006cda6c31e8b12da (patch)
treef601e3c0303a193cda6f8c6f956619dda9673c70 /opensuse/core/tdebase/kickoff-install-software.diff
parentead369ac94473139a2320a1c90cda64dd887b94a (diff)
parent27c9e783c6283f8916ebee3a23c6d1ba909a5126 (diff)
downloadtde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.tar.gz
tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.zip
Merge branch 'suse'
Diffstat (limited to 'opensuse/core/tdebase/kickoff-install-software.diff')
-rw-r--r--opensuse/core/tdebase/kickoff-install-software.diff25
1 files changed, 25 insertions, 0 deletions
diff --git a/opensuse/core/tdebase/kickoff-install-software.diff b/opensuse/core/tdebase/kickoff-install-software.diff
new file mode 100644
index 000000000..f053a45fb
--- /dev/null
+++ b/opensuse/core/tdebase/kickoff-install-software.diff
@@ -0,0 +1,25 @@
+--- kicker/kicker/ui/k_new_mnu.cpp 2007/08/08 15:14:50 1.141
++++ kicker/kicker/ui/k_new_mnu.cpp 2007/08/08 15:39:58
+@@ -1345,6 +1345,9 @@
+ KService::Ptr p = KService::serviceByStorageId("/usr/share/applications/YaST.desktop");
+ m_systemView->insertMenuItem(p, nId++, index++);
+
++ p = KService::serviceByStorageId("/usr/share/applications/package-manager.desktop");
++ m_systemView->insertMenuItem(p, nId++, index++);
++
+ m_systemView->insertItem( "info", i18n( "System Information" ),
+ "sysinfo:/", "sysinfo:/", nId++, index++ );
+
+--- kicker/kicker/ui/itemview.cpp 2007/08/08 15:14:50 1.141
++++ kicker/kicker/ui/itemview.cpp 2007/08/08 15:59:35
+@@ -139,7 +139,9 @@
+ void KMenuItem::setIcon(const QString& icon, int size)
+ {
+ m_icon = icon;
+- QListViewItem::setPixmap(0, KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
++ QPixmap pixmap = KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size, KIcon::DefaultState, 0L, true);
++ if (!pixmap.isNull())
++ QListViewItem::setPixmap(0, pixmap);
+ }
+
+ void KMenuItem::setHasChildren( bool flag )