diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index ad0da357b..6765334dc 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -42,7 +42,6 @@ class ServiceManagerList(QtGui.QTreeWidget):
def __init__(self, parent=None, name=None):
QtGui.QTreeWidget.__init__(self,parent)
self.parent = parent
- self.setExpandsOnDoubleClick(False)
def keyPressEvent(self, event):
if type(event) == QtGui.QKeyEvent:
@@ -250,6 +249,7 @@ class ServiceManager(QtGui.QWidget):
if self.serviceItemNoteForm.exec_():
self.serviceItems[item][u'service_item'].notes = \
self.serviceItemNoteForm.textEdit.toPlainText()
+ self.repaintServiceList(item, 0)
def nextItem(self):
"""
@@ -429,15 +429,29 @@ class ServiceManager(QtGui.QWidget):
for itemcount, item in enumerate(self.serviceItems):
serviceitem = item[u'service_item']
treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList)
- treewidgetitem.setText(0,serviceitem.title)
- treewidgetitem.setIcon(0,serviceitem.iconic_representation)
+ if len(serviceitem.notes) > 0:
+ icon = QtGui.QImage(serviceitem.icon)
+ icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
+ QtCore.Qt.SmoothTransformation)
+
+ overlay = QtGui.QImage(':/services/service_item_notes.png')
+ overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
+ QtCore.Qt.SmoothTransformation)
+ painter = QtGui.QPainter(icon)
+ painter.drawImage(0, 0, overlay)
+ painter.end()
+ treewidgetitem.setIcon(0, build_icon(icon))
+ else:
+ treewidgetitem.setIcon(0, serviceitem.iconic_representation)
+ treewidgetitem.setText(0, serviceitem.title)
+ treewidgetitem.setToolTip(0, serviceitem.notes)
treewidgetitem.setData(0, QtCore.Qt.UserRole,
QtCore.QVariant(item[u'order']))
treewidgetitem.setExpanded(item[u'expanded'])
for count, frame in enumerate(serviceitem.get_frames()):
treewidgetitem1 = QtGui.QTreeWidgetItem(treewidgetitem)
text = frame[u'title']
- treewidgetitem1.setText(0,text[:40])
+ treewidgetitem1.setText(0, text[:40])
treewidgetitem1.setData(0, QtCore.Qt.UserRole,
QtCore.QVariant(count))
if serviceItem == itemcount and serviceItemCount == count:
@@ -594,12 +608,12 @@ class ServiceManager(QtGui.QWidget):
self.serviceItems = []
self.isNew = True
for item in tempServiceItems:
- self.addServiceItem(item[u'service_item'], True)
+ self.addServiceItem(item[u'service_item'], False, item[u'expanded'])
#Set to False as items may have changed rendering
#does not impact the saved song so True may aslo be valid
self.parent.serviceChanged(False, self.serviceName)
- def addServiceItem(self, item, rebuild=False):
+ def addServiceItem(self, item, rebuild=False, expand=True):
"""
Add a Service item to the list
@@ -619,12 +633,12 @@ class ServiceManager(QtGui.QWidget):
if sitem == -1:
self.serviceItems.append({u'service_item': item,
u'order': len(self.serviceItems) + 1,
- u'expanded':True})
+ u'expanded':expand})
self.repaintServiceList(len(self.serviceItems) + 1, 0)
else:
self.serviceItems.insert(sitem + 1, {u'service_item': item,
u'order': len(self.serviceItems)+1,
- u'expanded':True})
+ u'expanded':expand})
self.repaintServiceList(sitem + 1, 0)
#if rebuilding list make sure live is fixed.
if rebuild:
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 187d85cd2..4083300a6 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -81,13 +81,12 @@ class AppLocation(object):
def check_latest_version(config, current_version):
version_string = current_version
#set to prod in the distribution confif file.
- environment = config.get_config(u'run environment', u'dev')
last_test = config.get_config(u'last version test', datetime.now().date())
this_test = unicode(datetime.now().date())
config.set_config(u'last version test', this_test)
if last_test != this_test:
version_string = u''
- req = urllib2.Request(u'http://www.openlp.org/files/%s_version.txt' % environment)
+ req = urllib2.Request(u'http://www.openlp.org/files/version.txt')
req.add_header(u'User-Agent', u'OpenLP/%s' % current_version)
try:
handle = urllib2.urlopen(req, None)
diff --git a/openlp/plugins/alerts/lib/alertsmanager.py b/openlp/plugins/alerts/lib/alertsmanager.py
index 6838fefa0..41fc25562 100644
--- a/openlp/plugins/alerts/lib/alertsmanager.py
+++ b/openlp/plugins/alerts/lib/alertsmanager.py
@@ -76,7 +76,7 @@ class AlertsManager(QtCore.QObject):
display text
"""
log.debug(u'display alert called %s' % text)
- self.parent.maindisplay.parent.StatusBar.showMessage(self.trUtf8(u''))
+ self.parent.maindisplay.parent.StatusBar.showMessage(u'')
self.alertList.append(text)
if self.timer_id != 0 or self.parent.maindisplay.mediaLoaded:
self.parent.maindisplay.parent.StatusBar.showMessage(\
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 830459843..75f2fd981 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -61,7 +61,7 @@ class ImageMediaItem(MediaManagerItem):
def retranslateUi(self):
self.OnNewPrompt = self.trUtf8('Select Image(s)')
self.OnNewFileMasks = \
- self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp)')
+ self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp);; All files (*)')
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index f7dafbf27..196763cce 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -25,6 +25,7 @@
# OOo API documentation:
# http://api.openoffice.org/docs/common/ref/com/sun/star/presentation/XSlideShowController.html
+# http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/Getting_Information_about_UNO_Objects#Inspecting_interfaces_during_debugging
# http://docs.go-oo.org/sd/html/classsd_1_1SlideShow.html
# http://www.oooforum.org/forum/viewtopic.phtml?t=5252
# http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/Working_with_Presentations
@@ -62,7 +63,8 @@ class ImpressController(PresentationController):
"""
log.debug(u'Initialising')
PresentationController.__init__(self, plugin, u'Impress')
- self.supports = [u'.odp', u'.ppt', u'.pps', u'.pptx', u'.ppsx']
+ self.supports = [u'.odp']
+ self.alsosupports = [u'.ppt', u'.pps', u'.pptx', u'.ppsx']
self.process = None
self.desktop = None
@@ -145,10 +147,17 @@ class ImpressController(PresentationController):
doc.close_presentation()
if os.name != u'nt':
desktop = self.get_uno_desktop()
+ else:
+ desktop = self.get_com_desktop()
+ docs = desktop.getComponents()
+ if docs.hasElements():
+ log.debug(u'OpenOffice not terminated')
+ else:
try:
desktop.terminate()
+ log.debug(u'OpenOffice killed')
except:
- pass
+ log.exception(u'Failed to terminate OpenOffice')
def add_doc(self, name):
log.debug(u'Add Doc OpenOffice')
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index 9aebb4ab5..7fed27145 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -56,7 +56,7 @@ class PresentationMediaItem(MediaManagerItem):
# be instanced by the base MediaManagerItem
self.ListViewWithDnD_class = PresentationListView
MediaManagerItem.__init__(self, parent, icon, title)
- self.message_listener = MessageListener(controllers)
+ self.message_listener = MessageListener(self)
def initPluginNameVisible(self):
self.PluginNameVisible = self.trUtf8('Presentation')
@@ -66,7 +66,8 @@ class PresentationMediaItem(MediaManagerItem):
fileType = u''
for controller in self.controllers:
if self.controllers[controller].enabled:
- for type in self.controllers[controller].supports:
+ types = self.controllers[controller].supports + self.controllers[controller].alsosupports
+ for type in types:
if fileType.find(type) == -1:
fileType += u'*%s ' % type
self.OnNewFileMasks = self.trUtf8('Presentations (%s)' % fileType)
@@ -106,6 +107,9 @@ class PresentationMediaItem(MediaManagerItem):
#load the drop down selection
if self.controllers[item].enabled:
self.DisplayTypeComboBox.addItem(item)
+ if self.DisplayTypeComboBox.count() > 1:
+ self.DisplayTypeComboBox.insertItem(0, u'Automatic')
+ self.DisplayTypeComboBox.setCurrentIndex(0)
def loadList(self, list):
currlist = self.getFileList()
@@ -145,10 +149,16 @@ class PresentationMediaItem(MediaManagerItem):
return False
service_item.title = unicode(self.DisplayTypeComboBox.currentText())
service_item.shortname = unicode(self.DisplayTypeComboBox.currentText())
- controller = self.controllers[service_item.shortname]
+ shortname = service_item.shortname
+
for item in items:
bitem = self.ListView.item(item.row())
filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
+ if shortname==u'Automatic':
+ service_item.shortname = self.findControllerByType(filename)
+ if not service_item.shortname:
+ return False
+ controller = self.controllers[service_item.shortname]
(path, name) = os.path.split(filename)
doc = controller.add_doc(filename)
if doc.get_slide_preview_file(1) is None:
@@ -159,5 +169,19 @@ class PresentationMediaItem(MediaManagerItem):
service_item.add_from_command(path, name, img)
i = i + 1
img = doc.get_slide_preview_file(i)
- controller.remove_doc(doc)
+ controller.remove_doc(doc)
return True
+
+ def findControllerByType(self, filename):
+ filetype = os.path.splitext(filename)[1]
+ if not filetype:
+ return None
+ for controller in self.controllers:
+ if self.controllers[controller].enabled:
+ if filetype in self.controllers[controller].supports:
+ return controller
+ for controller in self.controllers:
+ if self.controllers[controller].enabled:
+ if filetype in self.controllers[controller].alsosupports:
+ return controller
+ return None
diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index 4854cbb73..2b2375912 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -154,8 +154,9 @@ class MessageListener(object):
"""
log.info(u'Message Listener loaded')
- def __init__(self, controllers):
- self.controllers = controllers
+ def __init__(self, mediaitem):
+ self.controllers = mediaitem.controllers
+ self.mediaitem = mediaitem
self.previewHandler = Controller(False)
self.liveHandler = Controller(True)
# messages are sent from core.ui.slidecontroller
@@ -188,6 +189,12 @@ class MessageListener(object):
"""
log.debug(u'Startup called with message %s' % message)
self.handler, file, isLive = self.decodeMessage(message)
+ filetype = os.path.splitext(file)[1][1:]
+ if self.handler==u'Automatic':
+ self.handler = self.mediaitem.findControllerByType(file)
+ if not self.handler:
+ return
+
if isLive:
self.liveHandler.addHandler(self.controllers[self.handler], file)
else:
diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py
index 0408e2dc1..bbd2c528a 100644
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@@ -52,7 +52,7 @@ class PowerpointController(PresentationController):
"""
log.debug(u'Initialising')
PresentationController.__init__(self, plugin, u'Powerpoint')
- self.supports = [u'.ppt', u'.pps']
+ self.supports = [u'.ppt', u'.pps', u'.pptx', u'.ppsx']
self.process = None
def check_available(self):
@@ -100,6 +100,8 @@ class PowerpointController(PresentationController):
doc.close_presentation()
if self.process is None:
return
+ if self.process.Presentations.Count > 0:
+ return
try:
self.process.Quit()
except:
diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py
index 671fefe70..d3332f68c 100644
--- a/openlp/plugins/presentations/lib/pptviewcontroller.py
+++ b/openlp/plugins/presentations/lib/pptviewcontroller.py
@@ -49,7 +49,7 @@ class PptviewController(PresentationController):
log.debug(u'Initialising')
self.process = None
PresentationController.__init__(self, plugin, u'Powerpoint Viewer')
- self.supports = [u'.ppt', u'.pps']
+ self.supports = [u'.ppt', u'.pps', u'.pptx', u'.ppsx']
def check_available(self):
"""
diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py
index b862de514..0783d40f4 100644
--- a/openlp/plugins/presentations/lib/presentationcontroller.py
+++ b/openlp/plugins/presentations/lib/presentationcontroller.py
@@ -93,6 +93,7 @@ class PresentationController(object):
Name of the application, to appear in the application
"""
self.supports = []
+ self.alsosupports = []
self.docs = []
self.plugin = plugin
self.name = name
diff --git a/resources/i18n/openlp_en.ts b/resources/i18n/openlp_en.ts
index d92273c1d..6f9d4a26a 100644
--- a/resources/i18n/openlp_en.ts
+++ b/resources/i18n/openlp_en.ts
@@ -4,879 +4,2296 @@
BibleMediaItem
-
+
-
- AlertsTab
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_OpenLPExportDialog
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- AlertForm
-
-
-
-
-
-
-
- SplashScreen
-
-
-
-
-
-
-
- MediaManagerItem
-
-
-
-
-
-
-
- EditCustomForm
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- TestMediaManager:
-
-
-
-
-
-
-
- AboutForm
-
-
-
-
-
-
-
- TestMediaManager:
-
-
-
-
-
-
-
- Ui_MainWindow
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- Ui_OpenSongImportDialog
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
-
-
-
-
Ui_customEditDialog
-
-
-
-
-
-
-
-
-
-
-
- BibleImportForm
-
-
-
-
-
-
-
- Ui_OpenSongExportDialog
-
-
-
-
-
-
-
- Ui_customEditDialog
-
-
-
-
-
-
-
- Ui_OpenLPImportDialog
-
-
-
-
-
-
-
- ImageTab
-
-
-
-
-
-
-
- Ui_OpenSongExportDialog
-
-
-
-
-
-
-
- BibleMediaItem
-
-
-
-
-
-
-
- Ui_OpenSongExportDialog
-
-
-
-
-
-
-
- Ui_PluginViewDialog
-
-
-
-
-
-
-
- Ui_OpenLPImportDialog
-
-
-
-
-
-
-
- Ui_MainWindow
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_SongMaintenanceDialog
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- SongMaintenanceForm
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- Ui_MainWindow
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- MediaManagerItem
-
-
-
-
-
-
-
- BibleMediaItem
-
-
-
-
-
-
-
- Ui_SongMaintenanceDialog
-
-
-
-
-
-
-
- Ui_EditSongDialog
-
-
-
-
-
-
-
- SongsPlugin
-
-
-
-
-
-
-
- MediaManagerItem
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- Ui_BibleImportDialog
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- GeneralTab
-
-
-
-
-
-
-
- ThemeManager
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- AlertsTab
-
-
-
-
-
-
-
- Ui_OpenLPExportDialog
-
-
-
-
-
-
-
- Ui_OpenLPImportDialog
-
-
-
+
+
BiblesTab
-
-
+
+
- Ui_AuditDetailDialog
+ RemoteTab
-
-
+
+
- Ui_BibleImportDialog
+ ServiceManager
-
-
-
-
-
-
- SongBookForm
-
-
-
-
-
-
-
- Ui_OpenLPImportDialog
-
-
-
-
-
-
-
- Ui_PluginViewDialog
-
-
-
-
-
-
-
- AboutForm
-
-
-
-
-
-
-
- GeneralTab
-
-
-
+
+
Ui_AmendThemeDialog
-
-
-
-
-
-
- TopicsForm
-
-
-
-
-
-
-
- SlideController
-
-
-
-
-
-
-
- Ui_OpenLPExportDialog
-
-
-
-
-
-
-
- BibleMediaItem
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- Ui_EditSongDialog
-
-
-
-
-
-
-
- AboutForm
-
-
-
-
-
-
-
- AlertForm
-
-
-
-
-
-
-
- AuthorsForm
-
-
-
+
+
Ui_OpenSongExportDialog
-
-
-
-
-
-
- MediaManagerItem
-
-
-
-
-
-
-
- Ui_SettingsDialog
-
-
-
-
-
-
-
- BibleMediaItem
-
-
-
-
-
-
-
- Ui_OpenLPExportDialog
-
-
-
-
-
-
-
- ImageTab
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_EditSongDialog
-
-
-
-
-
-
-
- BibleMediaItem
-
-
-
-
-
-
-
- MediaTab
-
-
-
-
-
-
-
- AboutForm
-
-
+
- Ui_EditSongDialog
+ ThemeManager
-
-
-
-
-
-
- Ui_OpenLPImportDialog
-
-
-
+
+
Ui_AmendThemeDialog
-
-
+
+
- Ui_EditSongDialog
+ ImportWizardForm
-
-
-
-
-
-
- Ui_OpenSongExportDialog
-
-
-
+
+
ThemesTab
-
-
+
+
- Ui_EditSongDialog
+ BibleMediaItem
-
-
+
+
- Ui_BibleImportDialog
+ ServiceManager
-
-
+
+
- Ui_SongMaintenanceDialog
+ SongUsagePlugin
-
-
-
-
-
-
- Ui_AuditDetailDialog
-
-
-
-
-
-
-
- Ui_SongMaintenanceDialog
-
-
-
-
-
-
-
- SlideController
-
-
-
-
-
-
-
- SongMediaItem
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_BibleImportDialog
-
-
-
-
-
-
-
- Ui_customEditDialog
-
-
-
-
-
-
-
- PresentationTab
-
-
-
-
-
-
-
- ThemeManager
-
-
-
-
-
-
-
- EditSongForm
-
-
-
-
-
-
-
- Ui_SongMaintenanceDialog
-
-
-
-
-
-
-
- Ui_BibleImportDialog
-
-
-
+
+
Ui_OpenLPExportDialog
-
-
+
+
- GeneralTab
+ Ui_customEditDialog
-
-
-
-
-
-
-
+
+
- Ui_AmendThemeDialog
+ SongMediaItem
-
-
+
+
+
+
+
+
+ Ui_SongUsageDeleteDialog
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_ServiceNoteEdit
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_AlertDialog
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
SlideController
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Ui_PluginViewDialog
+
+
+
AlertsTab
-
-
+
+
+
+
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
BiblesTab
-
-
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ SplashScreen
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ SongUsageDeleteForm
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ AlertsManager
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
Ui_AmendThemeDialog
-
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ SongBookForm
+
+
+
+
+
+
+
+ Ui_AuthorsDialog
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ EditCustomForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ Ui_SongUsageDetailDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongUsageDeleteForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ CustomPlugin
+
+
+
+
+
+
+
+ AuthorsForm
+
+
+
+
+
+
+
+ SongsTab
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ PresentationMediaItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ CustomTab
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_SongUsageDetailDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ Ui_AuthorsDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ TopicsForm
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ ImageTab
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ PresentationTab
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ TopicsForm
+
+
+
+
+
+
+
+ RemoteTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_AlertDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ CustomTab
+
+
+
+
+
+
+
+ BiblePlugin
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ AlertEditForm
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ PresentationMediaItem
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ AuthorsForm
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ AmendThemeForm
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_AlertDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ CustomTab
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ Ui_SongBookDialog
+
+
+
+
+
+
+
+ Ui_AuthorsDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_SongBookDialog
+
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ Ui_SongBookDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
@@ -884,84 +2301,63 @@
SongMediaItem
-
+
- Ui_OpenSongImportDialog
+ Ui_BibleImportWizard
-
-
+
+
Ui_AmendThemeDialog
-
+
- Ui_EditSongDialog
+ Ui_BibleImportWizard
-
-
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ MediaMediaItem
+
+
+
+
+
+
+
+ PresentationMediaItem
+
+
+
SongMediaItem
-
-
-
-
-
-
- MediaManagerItem
-
-
-
-
-
-
-
- Ui_MainWindow
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_AuditDetailDialog
-
-
-
-
-
-
-
- Ui_MainWindow
-
-
-
-
-
-
-
- SongMediaItem
-
-
+
@@ -969,23 +2365,2479 @@
Ui_PluginViewDialog
-
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
Ui_AmendThemeDialog
-
-
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
-
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_TopicsDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ AlertEditForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+
+
+
+
+
+ EditCustomForm
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ TestMediaManager
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ AmendThemeForm
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ alertsPlugin
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ImageTab
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CustomMediaItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ EditCustomForm
+
+
+
+
+
+
+
+ RemotesPlugin
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ AlertEditForm
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ AuthorsForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_SettingsDialog
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ BiblePlugin
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_PluginViewDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ AlertEditForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ SongUsageDetailForm
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ PresentationTab
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_PluginViewDialog
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ alertsPlugin
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ alertsPlugin
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ MediaPlugin
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ PresentationTab
+
+
+
+
+
+
+
+ SplashScreen
+
+
+
+
+
+
+
+ ImageTab
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+
+
+
+
+
+ MediaMediaItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ AmendThemeForm
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ alertsPlugin
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ PresentationPlugin
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ SongsTab
+
+
+
+
+
+
+
+ Ui_AlertDialog
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ AuthorsForm
+
+
+
+
+
+
+
+ SongsTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ ImageTab
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ PresentationMediaItem
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ AmendThemeForm
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ ImagePlugin
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ EditCustomForm
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_PluginViewDialog
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_PluginViewDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_SongUsageDetailDialog
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ EditCustomForm
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_SongUsageDetailDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ OpenSongBible
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ PresentationMediaItem
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_AuthorsDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ SongsTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+
+
+
+
+
+ AmendThemeForm
+
+
+
+
+
+
+
+ Ui_TopicsDialog
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ SongBookForm
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index b6509b528..28af4c31a 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -78,6 +78,7 @@
service_edit.png
service_notes.png
+ service_item_notes.png
service_bottom.png
service_down.png
service_top.png
diff --git a/resources/images/service_item_notes.png b/resources/images/service_item_notes.png
new file mode 100644
index 000000000..59991dba8
Binary files /dev/null and b/resources/images/service_item_notes.png differ
diff --git a/scripts/get-strings.py b/scripts/get-strings.py
index 8d9dad174..ed3cdcb41 100755
--- a/scripts/get-strings.py
+++ b/scripts/get-strings.py
@@ -24,6 +24,7 @@
###############################################################################
import os
+from cgi import escape
from ast import parse, NodeVisitor, Str
ts_file = u"""
@@ -45,7 +46,8 @@ ts_message = u"""
class StringExtractor(NodeVisitor):
- def __init__(self, strings, filename):
+ def __init__(self, strings, filename, base_path):
+ self.base_path = base_path
self.filename = filename
self.strings = strings
self.classname = 'unknown'
@@ -58,10 +60,10 @@ class StringExtractor(NodeVisitor):
if hasattr(node.func, 'attr') and node.func.attr == 'trUtf8' and isinstance(node.args[0], Str):
string = node.args[0].s
key = '%s-%s' % (self.classname, string)
- self.strings[key] = [self.classname, self.filename, node.lineno, string]
+ self.strings[key] = [self.classname, self.filename[len(self.base_path) + 1:], node.lineno, escape(string)]
self.generic_visit(node)
-def parse_file(filename, strings):
+def parse_file(base_path, filename, strings):
file = open(filename, u'r')
try:
ast = parse(file.read())
@@ -70,7 +72,7 @@ def parse_file(filename, strings):
return
file.close()
- StringExtractor(strings, filename).visit(ast)
+ StringExtractor(strings, filename, base_path).visit(ast)
def write_file(filename, strings):
translation_file = u''
@@ -94,15 +96,18 @@ def write_file(filename, strings):
def main():
strings = {}
- start_dir = os.path.abspath(u'.')
+ start_dir = os.path.abspath(u'..')
for root, dirs, files in os.walk(start_dir):
for file in files:
if file.endswith(u'.py'):
print u'Parsing "%s"' % file
- parse_file(os.path.join(root, file), strings)
+ parse_file(start_dir, os.path.join(root, file), strings)
print u'Generating TS file...',
- write_file(os.path.join(start_dir, u'i18n', u'openlp_en.ts'), strings)
+ write_file(os.path.join(start_dir, u'resources', u'i18n', u'openlp_en.ts'), strings)
print u'done.'
if __name__ == u'__main__':
- main()
\ No newline at end of file
+ if os.path.split(os.path.abspath(u'.'))[1] != u'scripts':
+ print u'You need to run this script from the scripts directory.'
+ else:
+ main()
diff --git a/version.txt b/version.txt
index 8fdd0d461..fe8ffff0a 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.9.0-723
+1.9.0-725