diff --git a/documentation/manual/source/pics/configurethemes.png b/documentation/manual/source/pics/configurethemes.png
deleted file mode 100644
index 8696cfd7e..000000000
Binary files a/documentation/manual/source/pics/configurethemes.png and /dev/null differ
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 5f2c63c23..dfa313cc1 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -380,18 +380,21 @@ class SlideController(QtGui.QWidget):
action_list.add_action(self.previousItem)
action_list.add_action(self.nextItem)
self.previousService = shortcut_action(parent, u'previousService',
- [QtCore.Qt.Key_Left], self.servicePrevious, UiStrings().LiveToolbar)
- self.previousService.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
+ [QtCore.Qt.Key_Left], self.servicePrevious,
+ category=UiStrings().LiveToolbar,
+ context=QtCore.Qt.WidgetWithChildrenShortcut)
self.previousService.setText(
translate('OpenLP.SlideController', 'Previous Service'))
self.nextService = shortcut_action(parent, 'nextService',
- [QtCore.Qt.Key_Right], self.serviceNext, UiStrings().LiveToolbar)
- self.nextService.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
+ [QtCore.Qt.Key_Right], self.serviceNext,
+ category=UiStrings().LiveToolbar,
+ context=QtCore.Qt.WidgetWithChildrenShortcut)
self.nextService.setText(
translate('OpenLP.SlideController', 'Next Service'))
self.escapeItem = shortcut_action(parent, 'escapeItem',
- [QtCore.Qt.Key_Escape], self.liveEscape, UiStrings().LiveToolbar)
- self.escapeItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
+ [QtCore.Qt.Key_Escape], self.liveEscape,
+ category=UiStrings().LiveToolbar,
+ context=QtCore.Qt.WidgetWithChildrenShortcut)
self.escapeItem.setText(
translate('OpenLP.SlideController', 'Escape Item'))
@@ -1150,4 +1153,5 @@ class SlideController(QtGui.QWidget):
elif self.desktopScreen.isChecked():
return HideMode.Screen
else:
- return None
\ No newline at end of file
+ return None
+
diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py
index e2eb25b4f..a080524eb 100644
--- a/openlp/plugins/bibles/lib/osis.py
+++ b/openlp/plugins/bibles/lib/osis.py
@@ -37,6 +37,9 @@ from openlp.plugins.bibles.lib.db import BibleDB
log = logging.getLogger(__name__)
+def replacement(match):
+ return match.group(2).upper()
+
class OSISBible(BibleDB):
"""
`OSIS `_ Bible format importer class.
@@ -60,6 +63,7 @@ class OSISBible(BibleDB):
self.lg_regex = re.compile(r'')
self.l_regex = re.compile(r'')
self.w_regex = re.compile(r'')
+ self.q_regex = re.compile(r'')
self.q1_regex = re.compile(r'')
self.q2_regex = re.compile(r'')
self.trans_regex = re.compile(r'(.*?)')
@@ -106,6 +110,7 @@ class OSISBible(BibleDB):
detect_file.close()
try:
osis = codecs.open(self.filename, u'r', details['encoding'])
+ repl = replacement
for file_record in osis:
if self.stop_import_flag:
break
@@ -148,12 +153,13 @@ class OSISBible(BibleDB):
verse_text = self.rf_regex.sub(u'', verse_text)
verse_text = self.lb_regex.sub(u' ', verse_text)
verse_text = self.lg_regex.sub(u'', verse_text)
- verse_text = self.l_regex.sub(u'', verse_text)
+ verse_text = self.l_regex.sub(u' ', verse_text)
verse_text = self.w_regex.sub(u'', verse_text)
verse_text = self.q1_regex.sub(u'"', verse_text)
verse_text = self.q2_regex.sub(u'\'', verse_text)
+ verse_text = self.q_regex.sub(u'', verse_text)
+ verse_text = self.divine_name_regex.sub(repl, verse_text)
verse_text = self.trans_regex.sub(u'', verse_text)
- verse_text = self.divine_name_regex.sub(u'', verse_text)
verse_text = verse_text.replace(u'', u'')\
.replace(u'
', u'').replace(u'', u'')\
.replace(u'', u'').replace(u'', u'')\