Ticket #44944: streamline-systray-menu.patch

kdelibs-4.12.5/kdeui/notifications/kstatusnotifieritem.cpp

@@ -722 +722 @@
 {
 }
 
+#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 +749 @@
 
     //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);
+    m->addAction( titleAction );
+    m->addSeparator();
+#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-4.12.5/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-4.12.5/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.
      */