Fixed bug #800047 where the Preferences menu item in OS X was incorrect.

This commit is contained in:
Raoul Snyman 2011-06-21 08:10:03 +02:00
parent de769ce066
commit faa9aca78b

View File

@ -27,6 +27,7 @@
import logging
import os
import sys
from tempfile import gettempdir
from PyQt4 import QtCore, QtGui
@ -291,6 +292,14 @@ class Ui_MainWindow(object):
# i18n add Language Actions
add_actions(self.settingsLanguageMenu, (self.autoLanguageItem, None))
add_actions(self.settingsLanguageMenu, self.languageGroup.actions())
# Order things differently in OS X so that Preferences menu item in the
# app menu is correct (this gets picked up automatically by Qt).
if sys.platform == u'darwin':
add_actions(self.settingsMenu, (self.settingsPluginListItem,
self.settingsLanguageMenu.menuAction(), None,
self.settingsConfigureItem, self.settingsShortcutsItem,
self.displayTagItem))
else:
add_actions(self.settingsMenu, (self.settingsPluginListItem,
self.settingsLanguageMenu.menuAction(), None,
self.displayTagItem, self.settingsShortcutsItem,