Ticket #44944: correct-PreferencesAndSysTray-Menu.patch

kdelibs-git/kdeui/actions/kaction.cpp

@@ -142 +142 @@
   d->init(this);
 }
 
+#ifdef Q_OS_MAC
+
+#include <kaboutdata.h>
+
+static void setTextWithCorrectMenuRole( KAction *action, const QString &text )
+{
+    // texts containing "config, options, setup, settings or preferences" will get PreferencesRole
+    // from Qt unless they have a role set. We prevent that, because KDE has its own way of
+    // defining a the application preferences menu ("Configure <appName>") which should go under the OS X Preferences menu.
+    // But when a KAction is created with the standard preferences title ("Configure <appName>..."), this action
+    // is set to PreferencesRole .
+    action->setText(text);
+    if( text.contains("config", Qt::CaseInsensitive)
+        || text.contains("options", Qt::CaseInsensitive)
+        || text.contains("setup", Qt::CaseInsensitive)
+        || text.contains("settings", Qt::CaseInsensitive)
+        || text.contains("preferences", Qt::CaseInsensitive)
+    ){
+        const KAboutData *aboutData = KGlobal::mainComponent().aboutData();
+        QString prefsText = i18n( "Configure %1...", (aboutData) ? aboutData->programName() : qApp->applicationName() );
+        if( text == prefsText || text == "&" % prefsText ){
+            kDebug() << "### Setting QAction::PreferencesRole from" << action->menuRole() << "for menuAction with text" << text;
+            action->setMenuRole(QAction::PreferencesRole);
+        }
+        else{
+            kDebug() << "### Setting QAction::NoRole from" << action->menuRole() << "for menuAction with text" << text;
+            action->setMenuRole(QAction::NoRole);
+        }
+    }
+}
+#endif //Q_OS_MAC
+
 KAction::KAction(const QString &text, QObject *parent)
   : QWidgetAction(parent), d(new KActionPrivate)
 {
   d->init(this);
+#ifdef Q_OS_MAC
+  setTextWithCorrectMenuRole(this, text);
+#else
   setText(text);
+#endif
 }
 
 KAction::KAction(const KIcon &icon, const QString &text, QObject *parent)
@@ -154 +190 @@
 {
   d->init(this);
   setIcon(icon);
+#ifdef Q_OS_MAC
+  setTextWithCorrectMenuRole(this, text);
+#else
   setText(text);
+#endif
 }
 
 KAction::~KAction()

kdelibs-git/kdeui/actions/kstandardaction.cpp

@@ -170 +170 @@
       break;
     }
 
+    // Set the text before setting the MenuRole, as on OS X setText will do some heuristic setting of itself,
+    // to prevent user menu items to get promoted to one of the following special roles.
+    pAction->setText(sLabel);
+
     switch ( id ) {
     case Quit:
       pAction->setMenuRole(QAction::QuitRole);
@@ -188 +192 @@
       break;
     }
 
-    pAction->setText(sLabel);
     if (pInfo->psToolTip) {
         pAction->setToolTip(i18n(pInfo->psToolTip));
     }

kdelibs-git/kdeui/notifications/kstatusnotifieritem.cpp

@@ -683 +683 @@
 
         return false;
     }
+#else
+    Q_UNUSED(pos);
+    Q_UNUSED(perform);
 #endif
 
     return true;
@@ -722 +725 @@
 {
 }
 
+#ifdef Q_OS_MAC
+#   include <kconfiggroup.h>
+#endif
+
 void KStatusNotifierItemPrivate::init(const QString &extraId)
 {
     // Ensure that closing the last KMainWindow doesn't exit the application
@@ -745 +752 @@
 
     //create a default menu, just like in KSystemtrayIcon
     KMenu *m = new KMenu(associatedWidget);
+#ifdef Q_OS_MAC
+    // emulate addTitle/setTitle by adding an inactive menu item.
+    titleAction = new QAction( KGlobal::mainComponent().aboutData()->programName(), NULL );
+    titleAction->setEnabled(false);
+    titleAction->setIcon(qApp->windowIcon());
+    titleAction->setIconVisibleInMenu(true);
+    m->addAction( titleAction );
+    m->addSeparator();
+//     qDebug() << "### Added SystemTray titleAction=" << titleAction;
+//     qDebug() << "### SystemTray for app" << qApp << "=" << KGlobal::mainComponent().aboutData()->programName()
+//         << "/" << KGlobal::caption() << "with icon" << qApp->windowIcon().name();
+#else
     titleAction = m->addTitle(qApp->windowIcon(), KGlobal::caption());
     m->setTitle(KGlobal::mainComponent().aboutData()->programName());
+#endif
     q->setContextMenu(m);
 
     KStandardAction::quit(q, SLOT(maybeQuit()), actionCollection);

kdelibs-git/kdeui/widgets/kmenu.cpp

@@ -167 +167 @@
     delete d;
 }
 
+#ifdef Q_OS_MAC
+void KMenu::addAction(QAction *action)
+{
+    if( action ){
+        if( !action->isIconVisibleInMenu() ){
+            action->setIcon(QIcon());
+        }
+        QMenu::addAction(action);
+    }
+}
+
+#   ifdef Q_NO_USING_KEYWORD
+QAction *KMenu::addAction(const QString &text)
+{
+    return QMenu::addAction(text);
+}
+
+QAction *KMenu::addAction(const QIcon &icon, const QString &text)
+{
+    return QMenu::addAction(icon,text);
+}
+
+QAction *KMenu::addAction(const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut)
+{
+    return QMenu::addAction(text, receiver, member, shortcut);
+}
+
+QAction *KMenu::addAction(const QIcon &icon, const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut)
+{
+    return QMenu::addAction(icon, text, receiver, member, shortcut);
+}
+#   endif // Q_NO_USING_KEYWORD
+#endif // Q_OS_MAC
+
 QAction* KMenu::addTitle(const QString &text, QAction* before)
 {
     return addTitle(QIcon(), text, before);

kdelibs-git/kdeui/widgets/kmenu.h

@@ -60 +60 @@
      */
     ~KMenu();
 
+#ifdef Q_OS_MAC
+#   ifndef Q_NO_USING_KEYWORD
+    using QMenu::addAction;
+#   endif
+    /**
+     * Appends the action action to the menu's list of actions.
+     * Overloaded from QMenu to force Qt to honour action->isIconVisibleInMenu().
+     */
+    void addAction(QAction *action);
+#   ifdef Q_NO_USING_KEYWORD
+    QAction *addAction(const QString &text);
+    QAction *addAction(const QIcon &icon, const QString &text);
+    QAction *addAction(const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0);
+    QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0);
+#   endif //Q_NO_USING_KEYWORD
+#endif //Q_OS_MAC
     /**
      * Inserts a title item with no icon.
      */