forked from openlp/openlp
Head
This commit is contained in:
commit
9cc06d3e29
@ -276,31 +276,22 @@ class Ui_MainWindow(object):
|
||||
u'settingsConfigureItem', u':/system/system_settings.png',
|
||||
category=UiStrings().Settings)
|
||||
action_list.add_category(UiStrings().Help, CategoryOrder.standardMenu)
|
||||
self.helpDocumentationItem = icon_action(mainWindow,
|
||||
u'helpDocumentationItem', u':/system/system_help_contents.png',
|
||||
category=None)#UiStrings().Help)
|
||||
self.helpDocumentationItem.setEnabled(False)
|
||||
self.helpAboutItem = shortcut_action(mainWindow, u'helpAboutItem',
|
||||
[QtGui.QKeySequence(u'Ctrl+F1')], self.onHelpAboutItemClicked,
|
||||
self.aboutItem = shortcut_action(mainWindow, u'aboutItem',
|
||||
[QtGui.QKeySequence(u'Ctrl+F1')], self.onAboutItemClicked,
|
||||
u':/system/system_about.png', category=UiStrings().Help)
|
||||
if os.name == u'nt':
|
||||
self.localHelpFile = os.path.join(
|
||||
AppLocation.get_directory(AppLocation.AppDir), 'OpenLP.chm')
|
||||
self.helpLocalHelpItem = shortcut_action(
|
||||
mainWindow, u'helpLocalHelpItem', [QtGui.QKeySequence(u'F1')],
|
||||
self.onHelpLocalHelpClicked, u':/system/system_about.png',
|
||||
category=UiStrings().Help)
|
||||
self.helpOnlineHelpItem = shortcut_action(
|
||||
mainWindow, u'helpOnlineHelpItem', [QtGui.QKeySequence(u'Alt+F1')],
|
||||
self.onHelpOnlineHelpClicked, u':/system/system_online_help.png',
|
||||
category=UiStrings().Help)
|
||||
else:
|
||||
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)
|
||||
self.offlineHelpItem = shortcut_action(
|
||||
mainWindow, u'offlineHelpItem', [QtGui.QKeySequence(u'F1')],
|
||||
self.onOfflineHelpClicked,
|
||||
u':/system/system_help_contents.png', category=UiStrings().Help)
|
||||
self.onlineHelpItem = shortcut_action(
|
||||
mainWindow, u'onlineHelpItem',
|
||||
[QtGui.QKeySequence(u'Alt+F1')], self.onOnlineHelpClicked,
|
||||
u':/system/system_online_help.png', category=UiStrings().Help)
|
||||
self.webSiteItem = base_action(
|
||||
mainWindow, u'webSiteItem', category=UiStrings().Help)
|
||||
add_actions(self.fileImportMenu,
|
||||
(self.importThemeItem, self.importLanguageItem))
|
||||
add_actions(self.fileExportMenu,
|
||||
@ -333,14 +324,13 @@ class Ui_MainWindow(object):
|
||||
add_actions(self.toolsMenu, (self.toolsAddToolItem, None))
|
||||
add_actions(self.toolsMenu, (self.toolsOpenDataFolder, None))
|
||||
add_actions(self.toolsMenu, [self.updateThemeImages])
|
||||
add_actions(self.helpMenu, (self.helpDocumentationItem, None))
|
||||
if os.name == u'nt':
|
||||
add_actions(self.helpMenu, (self.helpLocalHelpItem,
|
||||
self.helpOnlineHelpItem, None, self.helpWebSiteItem,
|
||||
self.helpAboutItem))
|
||||
add_actions(self.helpMenu, (self.offlineHelpItem,
|
||||
self.onlineHelpItem, None, self.webSiteItem,
|
||||
self.aboutItem))
|
||||
else:
|
||||
add_actions(self.helpMenu, (self.helpOnlineHelpItem, None,
|
||||
self.helpWebSiteItem, self.helpAboutItem))
|
||||
add_actions(self.helpMenu, (self.onlineHelpItem, None,
|
||||
self.webSiteItem, self.aboutItem))
|
||||
add_actions(self.menuBar, (self.fileMenu.menuAction(),
|
||||
self.viewMenu.menuAction(), self.toolsMenu.menuAction(),
|
||||
self.settingsMenu.menuAction(), self.helpMenu.menuAction()))
|
||||
@ -355,7 +345,6 @@ class Ui_MainWindow(object):
|
||||
self.toolsAddToolItem.setVisible(False)
|
||||
self.importLanguageItem.setVisible(False)
|
||||
self.exportLanguageItem.setVisible(False)
|
||||
self.helpDocumentationItem.setVisible(False)
|
||||
self.setLockPanel(panelLocked)
|
||||
|
||||
def retranslateUi(self, mainWindow):
|
||||
@ -456,17 +445,15 @@ class Ui_MainWindow(object):
|
||||
'&Plugin List'))
|
||||
self.settingsPluginListItem.setStatusTip(
|
||||
translate('OpenLP.MainWindow', 'List the Plugins'))
|
||||
self.helpDocumentationItem.setText(
|
||||
translate('OpenLP.MainWindow', '&User Guide'))
|
||||
self.helpAboutItem.setText(translate('OpenLP.MainWindow', '&About'))
|
||||
self.helpAboutItem.setStatusTip(
|
||||
self.aboutItem.setText(translate('OpenLP.MainWindow', '&About'))
|
||||
self.aboutItem.setStatusTip(
|
||||
translate('OpenLP.MainWindow', 'More information about OpenLP'))
|
||||
if os.name == u'nt':
|
||||
self.helpLocalHelpItem.setText(
|
||||
translate('OpenLP.MainWindow', '&Help'))
|
||||
self.helpOnlineHelpItem.setText(
|
||||
self.offlineHelpItem.setText(
|
||||
translate('OpenLP.MainWindow', '&User Guide'))
|
||||
self.onlineHelpItem.setText(
|
||||
translate('OpenLP.MainWindow', '&Online Help'))
|
||||
self.helpWebSiteItem.setText(
|
||||
self.webSiteItem.setText(
|
||||
translate('OpenLP.MainWindow', '&Web Site'))
|
||||
for item in self.languageGroup.actions():
|
||||
item.setText(item.objectName())
|
||||
@ -555,7 +542,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||
QtCore.QObject.connect(self.themeManagerDock,
|
||||
QtCore.SIGNAL(u'visibilityChanged(bool)'),
|
||||
self.viewThemeManagerItem.setChecked)
|
||||
QtCore.QObject.connect(self.helpWebSiteItem,
|
||||
QtCore.QObject.connect(self.webSiteItem,
|
||||
QtCore.SIGNAL(u'triggered()'), self.onHelpWebSiteClicked)
|
||||
QtCore.QObject.connect(self.toolsOpenDataFolder,
|
||||
QtCore.SIGNAL(u'triggered()'), self.onToolsOpenDataFolderClicked)
|
||||
@ -762,20 +749,20 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||
import webbrowser
|
||||
webbrowser.open_new(u'http://openlp.org/')
|
||||
|
||||
def onHelpLocalHelpClicked(self):
|
||||
def onOfflineHelpClicked(self):
|
||||
"""
|
||||
Load the local OpenLP help file
|
||||
"""
|
||||
os.startfile(self.localHelpFile)
|
||||
|
||||
def onHelpOnlineHelpClicked(self):
|
||||
def onOnlineHelpClicked(self):
|
||||
"""
|
||||
Load the online OpenLP manual
|
||||
"""
|
||||
import webbrowser
|
||||
webbrowser.open_new(u'http://manual.openlp.org/')
|
||||
|
||||
def onHelpAboutItemClicked(self):
|
||||
def onAboutItemClicked(self):
|
||||
"""
|
||||
Show the About form
|
||||
"""
|
||||
|
@ -53,6 +53,7 @@ APPLICATION_VERSION = {}
|
||||
IMAGES_FILTER = None
|
||||
UNO_CONNECTION_TYPE = u'pipe'
|
||||
#UNO_CONNECTION_TYPE = u'socket'
|
||||
VERSION_SPLITTER = re.compile(r'([0-9]+).([0-9]+).([0-9]+)(?:-bzr([0-9]+))?')
|
||||
|
||||
class VersionThread(QtCore.QThread):
|
||||
"""
|
||||
@ -61,8 +62,6 @@ class VersionThread(QtCore.QThread):
|
||||
"""
|
||||
def __init__(self, parent):
|
||||
QtCore.QThread.__init__(self, parent)
|
||||
self.version_splitter = re.compile(
|
||||
r'([0-9]+).([0-9]+).([0-9]+)(?:-bzr([0-9]+))?')
|
||||
|
||||
def run(self):
|
||||
"""
|
||||
@ -73,7 +72,7 @@ class VersionThread(QtCore.QThread):
|
||||
version = check_latest_version(app_version)
|
||||
remote_version = {}
|
||||
local_version = {}
|
||||
match = self.version_splitter.match(version)
|
||||
match = VERSION_SPLITTER.match(version)
|
||||
if match:
|
||||
remote_version[u'major'] = int(match.group(1))
|
||||
remote_version[u'minor'] = int(match.group(2))
|
||||
@ -82,7 +81,7 @@ class VersionThread(QtCore.QThread):
|
||||
remote_version[u'revision'] = int(match.group(4))
|
||||
else:
|
||||
return
|
||||
match = self.version_splitter.match(app_version[u'full'])
|
||||
match = VERSION_SPLITTER.match(app_version[u'full'])
|
||||
if match:
|
||||
local_version[u'major'] = int(match.group(1))
|
||||
local_version[u'minor'] = int(match.group(2))
|
||||
|
@ -27,8 +27,7 @@
|
||||
The bible import functions for OpenLP
|
||||
"""
|
||||
import logging
|
||||
import os.path
|
||||
import re
|
||||
import os
|
||||
import shutil
|
||||
|
||||
from PyQt4 import QtCore, QtGui
|
||||
@ -70,8 +69,7 @@ class BibleUpgradeForm(OpenLPWizard):
|
||||
self.mediaItem = bibleplugin.mediaItem
|
||||
self.suffix = u'.sqlite'
|
||||
self.settingsSection = u'bibles'
|
||||
self.path = AppLocation.get_section_data_path(
|
||||
self.settingsSection)
|
||||
self.path = AppLocation.get_section_data_path(self.settingsSection)
|
||||
self.files = self.manager.old_bible_databases
|
||||
self.success = {}
|
||||
self.newbibles = {}
|
||||
|
@ -37,6 +37,8 @@ from editversedialog import Ui_EditVerseDialog
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
VERSE_REGEX = re.compile(r'---\[(.+):\D*(\d*)\D*.*\]---')
|
||||
|
||||
class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
|
||||
"""
|
||||
This is the form that is used to edit the verses of the song.
|
||||
@ -60,7 +62,6 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
|
||||
QtCore.QObject.connect(self.verseTypeComboBox,
|
||||
QtCore.SIGNAL(u'currentIndexChanged(int)'),
|
||||
self.onVerseTypeComboBoxChanged)
|
||||
self.verse_regex = re.compile(r'---\[(.+):\D*(\d*)\D*.*\]---')
|
||||
|
||||
def contextMenu(self, point):
|
||||
item = self.serviceManagerList.itemAt(point)
|
||||
@ -105,7 +106,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
|
||||
if position == -1:
|
||||
return
|
||||
text = text[:position + 4]
|
||||
match = self.verse_regex.match(text)
|
||||
match = VERSE_REGEX.match(text)
|
||||
if match:
|
||||
verse_tag = match.group(1)
|
||||
try:
|
||||
@ -136,7 +137,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
|
||||
if position == -1:
|
||||
return
|
||||
text = text[:position + 4]
|
||||
match = self.verse_regex.match(text)
|
||||
match = VERSE_REGEX.match(text)
|
||||
if match:
|
||||
verse_type = match.group(1)
|
||||
verse_type_index = VerseType.from_loose_input(verse_type)
|
||||
|
@ -73,6 +73,8 @@ from openlp.core.utils import get_application_version
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
CHORD_REGEX = re.compile(u'<chord name=".*?"/>')
|
||||
|
||||
class SongXML(object):
|
||||
"""
|
||||
This class builds and parses the XML used to describe songs.
|
||||
@ -234,7 +236,6 @@ class OpenLyrics(object):
|
||||
IMPLEMENTED_VERSION = u'0.7'
|
||||
def __init__(self, manager):
|
||||
self.manager = manager
|
||||
self.chord_regex = re.compile(u'<chord name=".*?"/>')
|
||||
|
||||
def song_to_xml(self, song):
|
||||
"""
|
||||
@ -319,7 +320,7 @@ class OpenLyrics(object):
|
||||
if xml[:5] == u'<?xml':
|
||||
xml = xml[38:]
|
||||
# Remove chords from xml.
|
||||
xml = self.chord_regex.sub(u'', xml)
|
||||
xml = CHORD_REGEX.sub(u'', xml)
|
||||
song_xml = objectify.fromstring(xml)
|
||||
if hasattr(song_xml, u'properties'):
|
||||
properties = song_xml.properties
|
||||
|
@ -78,40 +78,34 @@ OPTIONAL_MODULES = [
|
||||
|
||||
w = sys.stdout.write
|
||||
|
||||
|
||||
def check_vers(version, required, text):
|
||||
if type(version) is str:
|
||||
version = version.split('.')
|
||||
version = [int(x) for x in version]
|
||||
version = map(int, version)
|
||||
if type(required) is str:
|
||||
required = required.split('.')
|
||||
required = [int(x) for x in required]
|
||||
w(' %s >= %s ... ' % (text, '.'.join([str(x) for x in required])))
|
||||
required = map(int, required)
|
||||
w(' %s >= %s ... ' % (text, '.'.join(map(str, required))))
|
||||
if version >= required:
|
||||
w('.'.join([str(x) for x in version]) + os.linesep)
|
||||
w('.'.join(map(str, version)) + os.linesep)
|
||||
return True
|
||||
else:
|
||||
w('FAIL' + os.linesep)
|
||||
return False
|
||||
|
||||
|
||||
def print_vers_fail(required, text):
|
||||
print(' %s >= %s ... FAIL' % (text, required))
|
||||
|
||||
|
||||
def verify_python():
|
||||
if not check_vers(list(sys.version_info), VERS['Python'], text='Python'):
|
||||
exit(1)
|
||||
|
||||
|
||||
def verify_versions():
|
||||
print('Verifying version of modules...')
|
||||
try:
|
||||
from PyQt4 import QtCore
|
||||
check_vers(QtCore.PYQT_VERSION_STR, VERS['PyQt4'],
|
||||
'PyQt4')
|
||||
check_vers(QtCore.qVersion(), VERS['Qt4'],
|
||||
'Qt4')
|
||||
check_vers(QtCore.PYQT_VERSION_STR, VERS['PyQt4'], 'PyQt4')
|
||||
check_vers(QtCore.qVersion(), VERS['Qt4'], 'Qt4')
|
||||
except ImportError:
|
||||
print_vers_fail(VERS['PyQt4'], 'PyQt4')
|
||||
print_vers_fail(VERS['Qt4'], 'Qt4')
|
||||
@ -126,7 +120,6 @@ def verify_versions():
|
||||
except ImportError:
|
||||
print_vers_fail(VERS['enchant'], 'enchant')
|
||||
|
||||
|
||||
def check_module(mod, text='', indent=' '):
|
||||
space = (30 - len(mod) - len(text)) * ' '
|
||||
w(indent + '%s%s... ' % (mod, text) + space)
|
||||
@ -137,7 +130,6 @@ def check_module(mod, text='', indent=' '):
|
||||
w('FAIL')
|
||||
w(os.linesep)
|
||||
|
||||
|
||||
def verify_pyenchant():
|
||||
w('Enchant (spell checker)... ')
|
||||
try:
|
||||
@ -150,14 +142,13 @@ def verify_pyenchant():
|
||||
except ImportError:
|
||||
w('FAIL' + os.linesep)
|
||||
|
||||
|
||||
def verify_pyqt():
|
||||
w('Qt4 image formats... ')
|
||||
try:
|
||||
from PyQt4 import QtGui
|
||||
read_f = ', '.join([unicode(format).lower() \
|
||||
read_f = ', '.join([unicode(format).lower()
|
||||
for format in QtGui.QImageReader.supportedImageFormats()])
|
||||
write_f= ', '.join([unicode(format).lower() \
|
||||
write_f = ', '.join([unicode(format).lower()
|
||||
for format in QtGui.QImageWriter.supportedImageFormats()])
|
||||
w(os.linesep)
|
||||
print(' read: %s' % read_f)
|
||||
@ -165,9 +156,7 @@ def verify_pyqt():
|
||||
except ImportError:
|
||||
w('FAIL' + os.linesep)
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
verify_python()
|
||||
|
||||
print('Checking for modules...')
|
||||
@ -187,6 +176,5 @@ def main():
|
||||
verify_pyqt()
|
||||
verify_pyenchant()
|
||||
|
||||
|
||||
if __name__ == u'__main__':
|
||||
main()
|
||||
|
Loading…
Reference in New Issue
Block a user