forked from openlp/openlp
Contains fix to allow QT to move place About, Exit and Preference Menu
Items into the Application menu per Apple UI guidelines.
This commit is contained in:
parent
e31c64ef7c
commit
8100a66622
@ -210,6 +210,8 @@ class Ui_MainWindow(object):
|
|||||||
icon=u':/system/system_exit.png',
|
icon=u':/system/system_exit.png',
|
||||||
shortcuts=[QtGui.QKeySequence(u'Alt+F4')],
|
shortcuts=[QtGui.QKeySequence(u'Alt+F4')],
|
||||||
category=UiStrings().File, triggers=mainWindow.close)
|
category=UiStrings().File, triggers=mainWindow.close)
|
||||||
|
# Give QT Extra Hint that this is the Exit Menu Item
|
||||||
|
self.fileExitItem.setMenuRole( QtGui.QAction.QuitRole )
|
||||||
action_list.add_category(unicode(UiStrings().Import),
|
action_list.add_category(unicode(UiStrings().Import),
|
||||||
CategoryOrder.standardMenu)
|
CategoryOrder.standardMenu)
|
||||||
self.importThemeItem = create_action(mainWindow,
|
self.importThemeItem = create_action(mainWindow,
|
||||||
@ -304,6 +306,8 @@ class Ui_MainWindow(object):
|
|||||||
self.settingsConfigureItem = create_action(mainWindow,
|
self.settingsConfigureItem = create_action(mainWindow,
|
||||||
u'settingsConfigureItem', icon=u':/system/system_settings.png',
|
u'settingsConfigureItem', icon=u':/system/system_settings.png',
|
||||||
category=UiStrings().Settings)
|
category=UiStrings().Settings)
|
||||||
|
# Give QT Extra Hint that this is the Preferences Menu Item
|
||||||
|
self.settingsConfigureItem.setMenuRole( QtGui.QAction.PreferencesRole )
|
||||||
self.settingsImportItem = create_action(mainWindow,
|
self.settingsImportItem = create_action(mainWindow,
|
||||||
u'settingsImportItem', category=UiStrings().Settings)
|
u'settingsImportItem', category=UiStrings().Settings)
|
||||||
self.settingsExportItem = create_action(mainWindow,
|
self.settingsExportItem = create_action(mainWindow,
|
||||||
@ -314,6 +318,8 @@ class Ui_MainWindow(object):
|
|||||||
icon=u':/system/system_about.png',
|
icon=u':/system/system_about.png',
|
||||||
shortcuts=[QtGui.QKeySequence(u'Ctrl+F1')],
|
shortcuts=[QtGui.QKeySequence(u'Ctrl+F1')],
|
||||||
category=UiStrings().Help, triggers=self.onAboutItemClicked)
|
category=UiStrings().Help, triggers=self.onAboutItemClicked)
|
||||||
|
# Give QT Extra Hint that this is an About Menu Item
|
||||||
|
self.aboutItem.setMenuRole( QtGui.QAction.AboutRole )
|
||||||
if os.name == u'nt':
|
if os.name == u'nt':
|
||||||
self.localHelpFile = os.path.join(
|
self.localHelpFile = os.path.join(
|
||||||
AppLocation.get_directory(AppLocation.AppDir), 'OpenLP.chm')
|
AppLocation.get_directory(AppLocation.AppDir), 'OpenLP.chm')
|
||||||
|
Loading…
Reference in New Issue
Block a user