rpms/kdebase-workspace/devel kdebase-workspace-4.4.0-classicmenu-games.patch, NONE, 1.1 kdebase-workspace.spec, 1.373, 1.374

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21428/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.4.0-classicmenu-games.patch 
Log Message:
* Fri Feb 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.0-8
- fix the Games menu in the classic menu mixing up Name and Description

kdebase-workspace-4.4.0-classicmenu-games.patch:
 core/applicationmodel.cpp     |    4 +++-
 core/models.h                 |    4 +++-
 simpleapplet/simpleapplet.cpp |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-workspace-4.4.0-classicmenu-games.patch ---
diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/core/applicationmodel.cpp kdebase-workspace-4.4.0-classicmenu-games/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/core/applicationmodel.cpp	2009-11-13 11:57:47.000000000 +0100
+++ kdebase-workspace-4.4.0-classicmenu-games/plasma/desktop/applets/kickoff/core/applicationmodel.cpp	2010-02-26 06:53:09.000000000 +0100
@@ -315,7 +315,9 @@
 bool ApplicationModel::nameAfterDescription(const QModelIndex &index) const
 {
     AppNode *node = static_cast<AppNode*>(index.internalPointer());
-    if (node->isDir) {
+    // if ForceNameAfterDescription is set (i.e. in the classic menu which needs
+    // to know which is which), skip the games hack and return true right away
+    if (node->isDir || d->displayOrder == ForceNameAfterDescription) {
         return true;
     }
 
diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/core/models.h kdebase-workspace-4.4.0-classicmenu-games/plasma/desktop/applets/kickoff/core/models.h
--- kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/core/models.h	2009-09-16 13:40:52.000000000 +0200
+++ kdebase-workspace-4.4.0-classicmenu-games/plasma/desktop/applets/kickoff/core/models.h	2010-02-26 06:48:50.000000000 +0100
@@ -80,10 +80,12 @@
  * This enum describes the policy for displaying
  * Name of Application - Description
  * Description - Name of Application
+ * ForceNameAfterDescription enforces this even for games (for the classic menu)
  */
 enum DisplayOrder {
     NameAfterDescription,
-    NameBeforeDescription
+    NameBeforeDescription,
+    ForceNameAfterDescription
 };
 
 /**
diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.4.0-classicmenu-games/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
--- kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp	2010-01-06 18:00:18.000000000 +0100
+++ kdebase-workspace-4.4.0-classicmenu-games/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp	2010-02-26 06:54:42.000000000 +0100
@@ -613,6 +613,7 @@
                 appModel->setDuplicatePolicy(Kickoff::ApplicationModel::ShowLatestOnlyPolicy);
                 if (d->formattype == Name || d->formattype == NameDescription || d->formattype == NameDashDescription)
                     appModel->setPrimaryNamePolicy(Kickoff::ApplicationModel::AppNamePrimary);
+                appModel->setNameDisplayOrder(Kickoff::ForceNameAfterDescription);
                 appModel->setSystemApplicationPolicy(Kickoff::ApplicationModel::ShowApplicationAndSystemPolicy);
 
                 menuview->addModel(appModel, Kickoff::MenuView::None, d->relativePath);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -p -r1.373 -r1.374
--- kdebase-workspace.spec	19 Feb 2010 17:07:58 -0000	1.373
+++ kdebase-workspace.spec	26 Feb 2010 06:05:14 -0000	1.374
@@ -22,7 +22,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.4.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -59,6 +59,8 @@ Patch19: kdebase-workspace-4.3.4-kdm_ply
 Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
 # support the widgetStyle4 hack in the Qt KDE platform plugin
 Patch21: kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch
+# fix the Games menu in the classic menu mixing up Name and Description
+Patch22: kdebase-workspace-4.4.0-classicmenu-games.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -324,6 +326,7 @@ Requires: akonadi
 %endif
 %patch20 -p1 -b .xsession_errors_O_APPEND
 %patch21 -p1 -b .platformplugin-widgetstyle4
+%patch22 -p1 -b .classicmenu-games
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -684,6 +687,9 @@ fi
 
 
 %changelog
+* Fri Feb 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.0-8
+- fix the Games menu in the classic menu mixing up Name and Description
+
 * Fri Feb 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-7
 - version solid-bluetooth(-devel) better