#
# Add the menu item format which was in KDE3 but is not currently in Kickoff,
# "Name - Description".
#

Index: workspace/plasma/applets/kickoff/simpleapplet/menuview.cpp
===================================================================
--- workspace/plasma/applets/kickoff/simpleapplet/menuview.cpp	(revision 842039)
+++ workspace/plasma/applets/kickoff/simpleapplet/menuview.cpp	(revision 842040)
@@ -130,6 +130,7 @@
                 action->setText(text);
             } break;
             case NameDescription: // fall through
+            case NameDashDescription: // fall through
             case DescriptionName: {
                 if (!name.isEmpty()) { // seems we have a program, but some of them don't define a name at all
                     if (text.contains(name,Qt::CaseInsensitive)) { // sometimes the description contains also the name
@@ -139,6 +140,8 @@
                     } else { // seems we have a perfect desktop-file (likely a KDE one, heh) and name+description are clear separated
                         if (d->formattype == NameDescription) {
                             action->setText(QString("%1 %2").arg(name).arg(text));
+                        } else if (d->formattype == NameDashDescription) {
+                            action->setText(QString("%1 - %2").arg(name).arg(text));
                         } else {
                             action->setText(QString("%1 (%2)").arg(text).arg(name));
                         }
Index: workspace/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
===================================================================
--- workspace/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	(revision 842039)
+++ workspace/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	(revision 842040)
@@ -276,6 +276,7 @@
     d->addItem(d->formatComboBox, i18nc("@item:inlistbox Format:", "Description Only"), MenuLauncherApplet::Description);
     d->addItem(d->formatComboBox, i18nc("@item:inlistbox Format:", "Name Description"), MenuLauncherApplet::NameDescription);
     d->addItem(d->formatComboBox, i18nc("@item:inlistbox Format:", "Description (Name)"), MenuLauncherApplet::DescriptionName);
+    d->addItem(d->formatComboBox, i18nc("@item:inlistbox Format:", "Name - Description"), MenuLauncherApplet::NameDashDescription);
     l->addWidget(d->formatComboBox, 1, 1);
 
     l->setColumnStretch(1,1);
Index: workspace/plasma/applets/kickoff/simpleapplet/menuview.h
===================================================================
--- workspace/plasma/applets/kickoff/simpleapplet/menuview.h	(revision 842039)
+++ workspace/plasma/applets/kickoff/simpleapplet/menuview.h	(revision 842040)
@@ -87,7 +87,8 @@
         Name = 0, ///< Name only
         Description, ///< Description only
         NameDescription, ///< Name (Description)
-        DescriptionName ///< Description (Name)
+        DescriptionName, ///< Description (Name)
+        NameDashDescription ///< Name - Description
     };
     /** \return the format type. */
     FormatType formatType() const;
Index: workspace/plasma/applets/kickoff/simpleapplet/simpleapplet.h
===================================================================
--- workspace/plasma/applets/kickoff/simpleapplet/simpleapplet.h	(revision 842039)
+++ workspace/plasma/applets/kickoff/simpleapplet/simpleapplet.h	(revision 842040)
@@ -56,7 +56,8 @@
             Name = 0, ///< Name only
             Description, ///< Description only
             NameDescription, ///< Name Description
-            DescriptionName ///< Description (Name)
+            DescriptionName, ///< Description (Name)
+            NameDashDescription ///< Name - Description
         };
 
         /**