raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Changed helpfile check to Windows condition check. Modified build script to create OpenLP.chm

Browse Source
This commit is contained in:
Stevan Pettit 2011-06-29 10:42:14 -04:00
parent f7f20f9722
commit 0612a93964
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/core/ui/mainwindow.py
View File

@ -269,10 +269,9 @@ 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.localHelpFile = os.path.join( if sys.platform[:3] == u'win':
AppLocation.get_directory(AppLocation.AppDir), 'Openlp.chm') self.localHelpFile = os.path.join(
self.haveHelpFile = os.path.isfile(self.localHelpFile) AppLocation.get_directory(AppLocation.AppDir), 'OpenLP.chm')
if self.haveHelpFile:
self.helpLocalHelpItem = shortcut_action( self.helpLocalHelpItem = shortcut_action(
mainWindow, u'helpLocalHelpItem', [QtGui.QKeySequence(u'F1')], mainWindow, u'helpLocalHelpItem', [QtGui.QKeySequence(u'F1')],
self.onHelpLocalHelpClicked, u':/system/system_about.png', self.onHelpLocalHelpClicked, u':/system/system_about.png',
@ -321,7 +320,7 @@ class Ui_MainWindow(object):
add_actions(self.toolsMenu, (self.toolsOpenDataFolder, None)) add_actions(self.toolsMenu, (self.toolsOpenDataFolder, None))
add_actions(self.toolsMenu, [self.updateThemeImages]) add_actions(self.toolsMenu, [self.updateThemeImages])
add_actions(self.helpMenu, (self.helpDocumentationItem, None)) add_actions(self.helpMenu, (self.helpDocumentationItem, None))
if self.haveHelpFile: if sys.platform[:3] == u'win':
add_actions(self.helpMenu, (self.helpLocalHelpItem, add_actions(self.helpMenu, (self.helpLocalHelpItem,
self.helpOnlineHelpItem, None, self.helpWebSiteItem, self.helpOnlineHelpItem, None, self.helpWebSiteItem,
self.helpAboutItem)) self.helpAboutItem))
@ -443,7 +442,7 @@ class Ui_MainWindow(object):
self.helpAboutItem.setText(translate('OpenLP.MainWindow', '&About')) self.helpAboutItem.setText(translate('OpenLP.MainWindow', '&About'))
self.helpAboutItem.setStatusTip( self.helpAboutItem.setStatusTip(
translate('OpenLP.MainWindow', 'More information about OpenLP')) translate('OpenLP.MainWindow', 'More information about OpenLP'))
if self.haveHelpFile: if sys.platform[:3] == u'win':
self.helpLocalHelpItem.setText( self.helpLocalHelpItem.setText(
translate('OpenLP.MainWindow', '&Help')) translate('OpenLP.MainWindow', '&Help'))
self.helpOnlineHelpItem.setText( self.helpOnlineHelpItem.setText(

6
scripts/windows-builder.py
View File

@ -242,10 +242,10 @@ def copy_windows_files():
os.path.join(dist_path, u'LICENSE.txt')) os.path.join(dist_path, u'LICENSE.txt'))
copy(os.path.join(winres_path, u'psvince.dll'), copy(os.path.join(winres_path, u'psvince.dll'),
os.path.join(dist_path, u'psvince.dll')) os.path.join(dist_path, u'psvince.dll'))
if os.path.isfile(os.path.join(helpfile_path, u'Openlp.chm')): if os.path.isfile(os.path.join(helpfile_path, u'OpenLP.chm')):
print u' Windows help file found' print u' Windows help file found'
copy(os.path.join(helpfile_path, u'Openlp.chm'), copy(os.path.join(helpfile_path, u'OpenLP.chm'),
os.path.join(dist_path, u'Openlp.chm')) os.path.join(dist_path, u'OpenLP.chm'))
else: else:
print u' WARNING ---- Windows help file not found ---- WARNING' print u' WARNING ---- Windows help file not found ---- WARNING'