Blob Blame History Raw
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);