From 1797848d6ea42e85160cdcc182adf6e7f82d46da Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Wed, 25 May 2011 08:56:33 +0200
Subject: [PATCH] Updated online help action to use utility functions, and
 added an icon needed by the utility functions.

---
 openlp/core/ui/mainwindow.py            |  12 +++++-------
 resources/images/openlp-2.qrc           |   1 +
 resources/images/system_online_help.png | Bin 0 -> 953 bytes
 3 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 resources/images/system_online_help.png

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 4e3b115ea..2c90e6d76 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -268,8 +268,10 @@ class Ui_MainWindow(object):
         self.HelpAboutItem = shortcut_action(mainWindow, u'HelpAboutItem',
             [QtGui.QKeySequence(u'Ctrl+F1')], self.onHelpAboutItemClicked,
             u':/system/system_about.png', category=UiStrings().Help)
-        self.HelpOnlineHelpItem = base_action(
-            mainWindow, u'HelpOnlineHelpItem', category=UiStrings().Help)
+        self.HelpOnlineHelpItem = shortcut_action(
+            mainWindow, u'HelpOnlineHelpItem', [QtGui.QKeySequence(u'F1')],
+            self.onHelpOnlineHelpClicked, u':/system/system_online_help.png',
+            category=UiStrings().Help)
         self.helpWebSiteItem = base_action(
             mainWindow, u'helpWebSiteItem', category=UiStrings().Help)
         add_actions(self.FileImportMenu,
@@ -416,8 +418,6 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', 'More information about OpenLP'))
         self.HelpOnlineHelpItem.setText(
             translate('OpenLP.MainWindow', '&Online Help'))
-        self.HelpOnlineHelpItem.setShortcut(
-            translate('OpenLP.MainWindow', 'F1'))
         self.helpWebSiteItem.setText(
             translate('OpenLP.MainWindow', '&Web Site'))
         for item in self.LanguageGroup.actions():
@@ -509,8 +509,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             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.ToolsOpenDataFolder,
             QtCore.SIGNAL(u'triggered()'), self.onToolsOpenDataFolderClicked)
         QtCore.QObject.connect(self.updateThemeImages,
@@ -696,7 +694,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         import webbrowser
         webbrowser.open_new(u'http://openlp.org/')
 
-    def onHelpOnLineHelpClicked(self):
+    def onHelpOnlineHelpClicked(self):
         """
         Load the online OpenLP manual
         """
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index a32d15940..ba865c8f2 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -113,6 +113,7 @@
     <file>clear_shortcut.png</file>
     <file>system_about.png</file>
     <file>system_help_contents.png</file>
+    <file>system_online_help.png</file>
     <file>system_mediamanager.png</file>
     <file>system_contribute.png</file>
     <file>system_servicemanager.png</file>
diff --git a/resources/images/system_online_help.png b/resources/images/system_online_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..670c0716f6b7ad8188916f43c4ce6607eb76dcbd
GIT binary patch
literal 953
zcmV;q14jIbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H112#!SK~#9!O_M!u990-b&%HA{yR){}_U<~iV>@AEu!U{b6o>#4
z1W{1Yzz+x%G$0{Cnp9w02ni{Y1uYVPfr1u<D2PH41r!_`FgX5Puj7x|ubJ7IJ994^
zipZyVs`os4idPt8IL}yRWv*0qmtEI+#rNZ)5JILpJr0BDPSiD@A8jxH!8x7?rlxLW
zhc1raa&yiHZ@fNZH=7|Ro{x$RajZy;W_QO+Tg}clR@C`qZ*MhvB6xh99V*{lT$q@D
z`<+E`VWP;7KmEmT8%JE39mn^Y5Gj;~?SD_$dwBe}6}765B@!S%Jo-g-esaFLI3dQT
zN@Q{lnSnf$l`_2<)V-Jkugm^%n}rvzP`pr>>B{`q0CI3_WlmbwM+?u5is{)=3PX9q
z)X?ar%*;>Hies9wA`p^CZN=7sN06jA+1&esqsvuU=(9hZt_(XG$ul!!#2QirFJG<n
znnP-xl+<x(CK~DXGSo~zUtz3Lwj4))DvjaV;Uk~zdYewDNVLJtWzcB+D8e{4%E=&H
z7vttggzin~r#xB0vaGANiuDv3!P?ddTl)>_t(cLKJ`T=8Mn?<GTQ(1N&(MLwwjpn2
z$rlEQg9xQ4+ZbVjP?76*xqZLJOD|mJzzf+t>*7TTU8VnT7FZw!L99r1LShU8fi0xi
zNt79iQbX-5;JaUUs617sk%BKRRK_AZATd&)O-i35S=*=+)lSf<KC}h$=QK<g2ONuL
zm@rbZ**FgP_^oH@D8ny1P5wM+(lvr&*1|h%5coc6J0j|;J606Fx{ERI<w`lHYf1Ws
z`>D>3uyCmemPM(Mqg=>xspwLB)TY@8NE$xgh8Kqod0ocw(z;USmR}2W*0yMOx@^`v
z?6*RO^EP9HS*jNY@DpeU5w_8^wpu1=#a}74v?c*sp7&*=*16l>IMq4VAy6sxcFcHx
zhLN5mPEt~nAf&~~y}D^_H-C@(&SwBNfHA9)5I0`ao7`+4-Me}D+SB=?;Xbx{&8Kn7
zgZp*XZ$IRp@7JR6)L)G{?G<CrJ=1xFSeeV^c{h`_-jtb4B{5n^t#_gz{vi(Kx5g~3
bbB_N27>~2?SfW3;00000NkvXXu0mjf7<sfQ

literal 0
HcmV?d00001