Jonathan Corwin has proposed merging lp:~j-corwin/openlp/general into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #634771 in OpenLP: "OpenLP 1.9.2+bzr1016-0ubuntu1~lucid1 does not start"
https://bugs.launchpad.net/openlp/+bug/634771
Bug #646718 in OpenLP: "Songbook, Number will not loaded, Title will not be
saved"
https://bugs.launchpad.net/openlp/+bug/646718
Bug #696013 in OpenLP: "song import from powerpoint crashes every second time"
https://bugs.launchpad.net/openlp/+bug/696013
Bug #696021 in OpenLP: "presentation loader does not work fine in Windows
using Powerpoint Viewer 2007"
https://bugs.launchpad.net/openlp/+bug/696021
Bug #696637 in OpenLP: "Alert not positioned correctly in single screen"
https://bugs.launchpad.net/openlp/+bug/696637
Bug #727732 in OpenLP: "Openlp 1.9.?? crashes on start"
https://bugs.launchpad.net/openlp/+bug/727732
Bug #735039 in OpenLP: "Cannot import PowerPoint Presentations with
PowerPoint 2010"
https://bugs.launchpad.net/openlp/+bug/735039
For more details, see:
https://code.launchpad.net/~j-corwin/openlp/general/+merge/54791
Enable Online Manual help menu
--
https://code.launchpad.net/~j-corwin/openlp/general/+merge/54791
Your team OpenLP Core is requested to review the proposed merge of
lp:~j-corwin/openlp/general into lp:openlp.
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2011-03-24 19:04:02 +0000
+++ openlp/core/ui/mainwindow.py 2011-03-24 21:28:22 +0000
@@ -256,7 +256,6 @@
u':/system/system_about.png')
mainWindow.actionList.add_action(self.HelpAboutItem, u'Help')
self.HelpOnlineHelpItem = base_action(mainWindow, u'HelpOnlineHelpItem')
- self.HelpOnlineHelpItem.setEnabled(False)
mainWindow.actionList.add_action(self.HelpOnlineHelpItem, u'Help')
self.helpWebSiteItem = base_action(mainWindow, u'helpWebSiteItem')
mainWindow.actionList.add_action(self.helpWebSiteItem, u'Help')
@@ -304,7 +303,6 @@
self.ExportLanguageItem.setVisible(False)
self.SettingsShortcutsItem.setVisible(False)
self.HelpDocumentationItem.setVisible(False)
- self.HelpOnlineHelpItem.setVisible(False)
def retranslateUi(self, mainWindow):
"""
@@ -430,6 +428,9 @@
translate('OpenLP.MainWindow', 'Ctrl+F1'))
self.HelpOnlineHelpItem.setText(
translate('OpenLP.MainWindow', '&Online Help'))
+ # Uncomment after 1.9.5 beta string freeze
+ #self.HelpOnlineHelpItem.setShortcut(
+ # translate('OpenLP.MainWindow', 'F1'))
self.helpWebSiteItem.setText(
translate('OpenLP.MainWindow', '&Web Site'))
for item in self.LanguageGroup.actions():
@@ -530,6 +531,8 @@
self.ViewThemeManagerItem.setChecked)
QtCore.QObject.connect(self.helpWebSiteItem,
QtCore.SIGNAL(u'triggered()'), self.onHelpWebSiteClicked)
+ QtCore.QObject.connect(self.HelpOnlineHelpItem,
+ QtCore.SIGNAL(u'triggered()'), self.onHelpOnLineHelpClicked)
QtCore.QObject.connect(self.HelpAboutItem,
QtCore.SIGNAL(u'triggered()'), self.onHelpAboutItemClicked)
QtCore.QObject.connect(self.ToolsOpenDataFolder,
@@ -720,6 +723,13 @@
import webbrowser
webbrowser.open_new(u'http://openlp.org/')
+ def onHelpOnLineHelpClicked(self):
+ """
+ Load the online OpenLP manual
+ """
+ import webbrowser
+ webbrowser.open_new(u'http://manual.openlp.org/')
+
def onHelpAboutItemClicked(self):
"""
Show the About form
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
