Updated online help action to use utility functions, and added an icon needed by the utility functions.

This commit is contained in:
Raoul Snyman 2011-05-25 08:56:33 +02:00
parent 9adc234845
commit 1797848d6e
3 changed files with 6 additions and 7 deletions

View File

@ -268,8 +268,10 @@ class Ui_MainWindow(object):
self.HelpAboutItem = shortcut_action(mainWindow, u'HelpAboutItem', self.HelpAboutItem = shortcut_action(mainWindow, u'HelpAboutItem',
[QtGui.QKeySequence(u'Ctrl+F1')], self.onHelpAboutItemClicked, [QtGui.QKeySequence(u'Ctrl+F1')], self.onHelpAboutItemClicked,
u':/system/system_about.png', category=UiStrings().Help) u':/system/system_about.png', category=UiStrings().Help)
self.HelpOnlineHelpItem = base_action( self.HelpOnlineHelpItem = shortcut_action(
mainWindow, u'HelpOnlineHelpItem', category=UiStrings().Help) mainWindow, u'HelpOnlineHelpItem', [QtGui.QKeySequence(u'F1')],
self.onHelpOnlineHelpClicked, u':/system/system_online_help.png',
category=UiStrings().Help)
self.helpWebSiteItem = base_action( self.helpWebSiteItem = base_action(
mainWindow, u'helpWebSiteItem', category=UiStrings().Help) mainWindow, u'helpWebSiteItem', category=UiStrings().Help)
add_actions(self.FileImportMenu, add_actions(self.FileImportMenu,
@ -416,8 +418,6 @@ class Ui_MainWindow(object):
translate('OpenLP.MainWindow', 'More information about OpenLP')) translate('OpenLP.MainWindow', 'More information about OpenLP'))
self.HelpOnlineHelpItem.setText( self.HelpOnlineHelpItem.setText(
translate('OpenLP.MainWindow', '&Online Help')) translate('OpenLP.MainWindow', '&Online Help'))
self.HelpOnlineHelpItem.setShortcut(
translate('OpenLP.MainWindow', 'F1'))
self.helpWebSiteItem.setText( self.helpWebSiteItem.setText(
translate('OpenLP.MainWindow', '&Web Site')) translate('OpenLP.MainWindow', '&Web Site'))
for item in self.LanguageGroup.actions(): for item in self.LanguageGroup.actions():
@ -509,8 +509,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.ViewThemeManagerItem.setChecked) self.ViewThemeManagerItem.setChecked)
QtCore.QObject.connect(self.helpWebSiteItem, QtCore.QObject.connect(self.helpWebSiteItem,
QtCore.SIGNAL(u'triggered()'), self.onHelpWebSiteClicked) QtCore.SIGNAL(u'triggered()'), self.onHelpWebSiteClicked)
QtCore.QObject.connect(self.HelpOnlineHelpItem,
QtCore.SIGNAL(u'triggered()'), self.onHelpOnLineHelpClicked)
QtCore.QObject.connect(self.ToolsOpenDataFolder, QtCore.QObject.connect(self.ToolsOpenDataFolder,
QtCore.SIGNAL(u'triggered()'), self.onToolsOpenDataFolderClicked) QtCore.SIGNAL(u'triggered()'), self.onToolsOpenDataFolderClicked)
QtCore.QObject.connect(self.updateThemeImages, QtCore.QObject.connect(self.updateThemeImages,
@ -696,7 +694,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
import webbrowser import webbrowser
webbrowser.open_new(u'http://openlp.org/') webbrowser.open_new(u'http://openlp.org/')
def onHelpOnLineHelpClicked(self): def onHelpOnlineHelpClicked(self):
""" """
Load the online OpenLP manual Load the online OpenLP manual
""" """

View File

@ -113,6 +113,7 @@
<file>clear_shortcut.png</file> <file>clear_shortcut.png</file>
<file>system_about.png</file> <file>system_about.png</file>
<file>system_help_contents.png</file> <file>system_help_contents.png</file>
<file>system_online_help.png</file>
<file>system_mediamanager.png</file> <file>system_mediamanager.png</file>
<file>system_contribute.png</file> <file>system_contribute.png</file>
<file>system_servicemanager.png</file> <file>system_servicemanager.png</file>

Binary file not shown.

After

Width:  |  Height:  |  Size: 953 B