Fix macOS Preferences menu hijacking

qgis · Dec 28, 2016 · 94dd1f4 · nyalldawson · Dec 28, 2016 · dakcarto
1 parent 12a4a9c
commit 94dd1f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/python/plugins/processing/ProcessingPlugin.py b/python/plugins/processing/ProcessingPlugin.py
@@ -96,6 +96,8 @@ def initGui(self):
             QIcon(os.path.join(cmd_folder, 'images', 'config.png')),
             self.tr('&Options...'), self.iface.mainWindow())
         self.configAction.setObjectName('configAction')
+        self.configAction.setMenuRole(QAction.NoRole)
+
         self.configAction.triggered.connect(self.openConfig)
         self.iface.registerMainWindowAction(self.configAction, 'Ctrl+Alt+C')
         self.menu.addAction(self.configAction)

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2028,7 +2028,11 @@ void QgisApp::createMenus()
   // keep plugins from hijacking About and Preferences application menus
   // these duplicate actions will be moved to application menus by Qt
   mProjectMenu->addAction( mActionAbout );
-  mProjectMenu->addAction( mActionOptions );
+  QAction* actionPrefs = new QAction( tr( "Preferences..." ), this );
+  actionPrefs->setMenuRole( QAction::PreferencesRole );
+  actionPrefs->setIcon( mActionOptions->icon() );
+  connect( actionPrefs, SIGNAL( triggered() ), this, SLOT( options() ) );
+  mProjectMenu->addAction( actionPrefs );
 
   // Window Menu
 

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -1583,7 +1583,7 @@
     <string>&amp;Options...</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::PreferencesRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="mActionCustomProjection">