Ticket #44798: emulate-addTitle.patch

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/

@@ -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();