Ticket #44798: OSX-menu-fixes.patch

akregator/src/actionmanagerimpl.cpp

@@ -163 +163 @@
         return;
     else d->trayIcon = trayIcon;
 
+#ifdef Q_OS_MAC
+    KMenu* traypop = trayIcon->contextMenu();
+#else
     QMenu* traypop = trayIcon->contextMenu();
+#endif
 
     if (actionCollection()->action("feed_fetch_all"))
         traypop->addAction(actionCollection()->action("feed_fetch_all"));

kmail/kmmainwidget.cpp

@@ -3518 +3518 @@
 
   {
     KAction *action = new KAction(KIcon(QLatin1String("configure")), i18n("&Configure KMail..."), this);
+#ifdef Q_OS_MAC
+    action->setMenuRole(QAction::PreferencesRole);
+#endif
     actionCollection()->addAction(QLatin1String("kmail_configure_kmail"), action );
     connect(action, SIGNAL(triggered(bool)), kmkernel, SLOT(slotShowConfigurationDialog()));
   }

kmail/kmsystemtray.cpp

@@ -112 +112 @@
 
     contextMenu()->clear();
 
+#ifndef Q_OS_MAC
     contextMenu()->addTitle(qApp->windowIcon(), i18n("KMail"));
+#else
+    { // emulate addTitle by adding an inactive menu item.
+        KAction *act = new KAction( i18n("KMail"), this );
+        act->setEnabled(false);
+        act->setIcon(qApp->windowIcon());
+        act->setIconVisibleInMenu(true);
+        contextMenu()->addAction(act);
+        contextMenu()->addSeparator();
+    }
+#endif
     QAction * action;
     if ( ( action = mainWidget->action(QLatin1String("check_mail")) ) )
         contextMenu()->addAction( action );

kmail/messageactions.cpp

@@ -388 +388 @@
     mMailingListActionMenu->menu()->clear();
     qDeleteAll(mMailListActionList);
     mMailListActionList.clear();
+#ifndef Q_WS_MACX
     if ( !listId.isEmpty() )
       mMailingListActionMenu->menu()->addTitle( listId );
+#else
+//     // emulate addTitle by adding an inactive menu item.
+    KAction *act = new KAction( listId, this );
+    act->setEnabled(false);
+    mMailingListActionMenu->addAction( act );
+    mMailingListActionMenu->addSeparator();
+#endif
 
     if ( mailList.features() & MessageCore::MailingList::ArchivedAt )
       // IDEA: this may be something you want to copy - "Copy in submenu"?

messagelist/core/widgetbase.cpp

@@ -468 +468 @@
   themeMenuAboutToShow(menu);
 }
 
+static inline void addMenuTitle(KMenu *menu, const char *titleText, QObject *parent, bool separatorAbove=false)
+{
+#ifndef Q_WS_MACX
+  menu->addTitle( i18n( titleText ) );
+#else
+//     // emulate addTitle by adding an inactive menu item.
+  KAction *act = new KAction( i18n(titleText), parent );
+  act->setEnabled(false);
+  if( separatorAbove ){
+    menu->addSeparator();
+  }
+  menu->addAction( act );
+  menu->addSeparator();
+#endif
+}
+
 void Widget::themeMenuAboutToShow(KMenu *menu)
 {
   menu->clear();
 
-  menu->addTitle( i18n( "Theme" ) );
+  addMenuTitle( menu, "Theme", this );
 
   QActionGroup * grp = new QActionGroup( menu );
 
@@ -563 +579 @@
 {
   menu->clear();
 
-  menu->addTitle( i18n( "Aggregation" ) );
+  addMenuTitle( menu, "Aggregation" , this );
 
   QActionGroup * grp = new QActionGroup( menu );
 
@@ -647 +663 @@
 {
   menu->clear();
 
-  menu->addTitle( i18n( "Message Sort Order" ) );
+  addMenuTitle( menu, "Message Sort Order", this );
 
   QActionGroup * grp;
   QAction * act;
@@ -672 +688 @@
   options = SortOrder::enumerateMessageSortDirectionOptions( d->mSortOrder.messageSorting() );
 
   if ( options.size() >= 2 ) {
-    menu->addTitle( i18n( "Message Sort Direction" ) );
+    addMenuTitle( menu, "Message Sort Direction", this, true );
 
     grp = new QActionGroup( menu );
     end = options.constEnd();
@@ -691 +707 @@
   options = SortOrder::enumerateGroupSortingOptions( d->mAggregation->grouping() );
 
   if ( options.size() >= 2 ) {
-    menu->addTitle( i18n( "Group Sort Order" ) );
+    addMenuTitle( menu, "Group Sort Order", this, true );
 
     grp = new QActionGroup( menu );
 
@@ -712 +728 @@
                                                            d->mSortOrder.groupSorting() );
 
   if ( options.size() >= 2 ) {
-    menu->addTitle( i18n( "Group Sort Direction" ) );
+    addMenuTitle( menu, "Group Sort Direction", this, true );
 
     grp = new QActionGroup( menu );
     end = options.constEnd();