head

openlp.pyw

@@ -34,7 +34,6 @@ from PyQt4 import QtCore, QtGui
 
 log = logging.getLogger()
 
-import openlp
 from openlp.core.lib import Receiver, str_to_bool
 from openlp.core.resources import qInitResources
 from openlp.core.ui import MainWindow, SplashScreen, ScreenList

openlp/core/ui/servicemanager.py

@@ -216,6 +216,8 @@ class ServiceManager(QtGui.QWidget):
 
     def contextMenu(self, point):
         item = self.ServiceManagerList.itemAt(point)
+        if item is None:
+            return
         if item.parent() is None:
             pos = item.data(0, QtCore.Qt.UserRole).toInt()[0]
         else:

openlp/core/ui/slidecontroller.py

@@ -170,7 +170,7 @@ class SlideController(QtGui.QWidget):
         if self.isLive:
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.blankButton = self.Toolbar.addToolbarButton(
-                u'Blank Screen', u':/slides/slide_close.png',
+                u'Blank Screen', u':/slides/slide_blank.png',
                 self.trUtf8('Blank Screen'), self.onBlankDisplay, True)
             QtCore.QObject.connect(Receiver.get_receiver(),
                 QtCore.SIGNAL(u'live_slide_blank'), self.blankScreen)

openlp/core/ui/thememanager.py

@@ -177,20 +177,20 @@ class ThemeManager(QtGui.QWidget):
             if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
                 QtGui.QMessageBox.critical(
                     self, self.trUtf8('Error'),
-                    self.trUtf8('You are unable to delete the default theme!'),
+                    self.trUtf8('You are unable to delete the default theme.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
             else:
                 for plugin in self.parent.plugin_manager.plugins:
                     if not plugin.can_delete_theme(theme):
                         QtGui.QMessageBox.critical(
                             self, self.trUtf8('Error'),
-                            self.trUtf8('theme %s is use in %s plugin' % (theme, plugin.name)),
+                            self.trUtf8('Theme %s is use in %s plugin' % (theme, plugin.name)),
                             QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                         return
                 if unicode(self.parent.ServiceManagerContents.ThemeComboBox.currentText()) == theme:
                     QtGui.QMessageBox.critical(
                         self, self.trUtf8('Error'),
-                        self.trUtf8('theme %s is use Service Manager' % theme),
+                        self.trUtf8('Theme %s is use by Service Manager' % theme),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                     return
                 self.themelist.remove(theme)
@@ -216,7 +216,7 @@ class ThemeManager(QtGui.QWidget):
         item = self.ThemeListWidget.currentItem()
         if item is None:
             QtGui.QMessageBox.critical(self, self.trUtf8('Error'),
-                self.trUtf8('You have not selected a theme!'),
+                self.trUtf8('You have not selected a theme.'),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
             return
         theme = unicode(item.data(QtCore.Qt.UserRole).toString())
@@ -359,7 +359,7 @@ class ThemeManager(QtGui.QWidget):
         except:
             QtGui.QMessageBox.critical(
                 self, self.trUtf8('Error'),
-                self.trUtf8('File is not a valid theme!'),
+                self.trUtf8('File is not a valid theme.'),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
             log.exception(u'Importing theme from zip file failed %s' % filename)
         finally:

openlp/core/utils/__init__.py

@@ -45,9 +45,9 @@ class AppLocation(object):
         if dir_type == AppLocation.AppDir:
            return os.path.abspath(os.path.split(sys.argv[0])[0])
         elif dir_type == AppLocation.ConfigDir:
-            if os.name == u'nt':
+            if sys.platform == u'win32':
                 path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
-            elif os.name == u'mac':
+            elif sys.platform == u'darwin':
                 path = os.path.join(os.getenv(u'HOME'), u'Library',
                     u'Application Support', u'openlp')
             else:
@@ -58,9 +58,9 @@ class AppLocation(object):
                     path = os.path.join(os.getenv(u'HOME'), u'.openlp')
             return path
         elif dir_type == AppLocation.DataDir:
-            if os.name == u'nt':
+            if sys.platform == u'win32':
                 path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
-            elif os.name == u'mac':
+            elif sys.platform == u'darwin':
                 path = os.path.join(os.getenv(u'HOME'), u'Library',
                     u'Application Support', u'openlp', u'Data')
             else:
@@ -100,4 +100,4 @@ def check_latest_version(config, current_version):
 from registry import Registry
 from confighelper import ConfigHelper
 
-__all__ = [u'Registry', u'ConfigHelper', u'AppLocations', u'check_latest_version']
+__all__ = [u'Registry', u'ConfigHelper', u'AppLocation', u'check_latest_version']

openlp/plugins/alerts/forms/alerteditform.py

@@ -85,7 +85,7 @@ class AlertEditForm(QtGui.QDialog, Ui_AlertEditDialog):
         if self.AlertLineEdit.text():
             QtGui.QMessageBox.information(self,
                 self.trUtf8('Item selected to Edit'),
-                self.trUtf8('Please Save or Clear seletced item'))
+                self.trUtf8('Please save or clear selected item'))
         else:
             self.EditButton.setEnabled(True)
             self.DeleteButton.setEnabled(True)

openlp/plugins/bibles/forms/importwizardform.py

@@ -32,6 +32,7 @@ from PyQt4 import QtCore, QtGui
 
 from bibleimportwizard import Ui_BibleImportWizard
 from openlp.core.lib import Receiver
+from openlp.core.utils import AppLocation
 from openlp.plugins.bibles.lib.manager import BibleFormat
 
 log = logging.getLogger(__name__)
@@ -110,7 +111,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                     QtGui.QMessageBox.critical(self,
                         self.trUtf8('Invalid Bible Location'),
                         self.trUtf8('You need to specify a file to import your '
-                            'Bible from!'),
+                            'Bible from.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                     self.OSISLocationEdit.setFocus()
                     return False
@@ -119,7 +120,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                     QtGui.QMessageBox.critical(self,
                         self.trUtf8('Invalid Books File'),
                         self.trUtf8('You need to specify a file with books of '
-                            'the Bible to use in the import!'),
+                            'the Bible to use in the import.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                     self.BooksLocationEdit.setFocus()
                     return False
@@ -127,7 +128,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                     QtGui.QMessageBox.critical(self,
                         self.trUtf8('Invalid Verse File'),
                         self.trUtf8('You need to specify a file of Bible '
-                            'verses to import!'),
+                            'verses to import.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                     self.CsvVerseLocationEdit.setFocus()
                     return False
@@ -136,7 +137,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                     QtGui.QMessageBox.critical(self,
                         self.trUtf8('Invalid OpenSong Bible'),
                         self.trUtf8('You need to specify an OpenSong Bible '
-                            'file to import!'),
+                            'file to import.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                     self.OpenSongFileEdit.setFocus()
                     return False
@@ -147,7 +148,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                 QtGui.QMessageBox.critical(self,
                     self.trUtf8('Empty Version Name'),
                     self.trUtf8('You need to specify a version name for your '
-                        'Bible!'),
+                        'Bible.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                 self.VersionNameEdit.setFocus()
                 return False
@@ -258,9 +259,8 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
         Load the list of Crosswalk and BibleGateway bibles.
         """
         #Load and store Crosswalk Bibles
-        filepath = os.path.abspath(os.path.join(
-            os.path.split(os.path.abspath(__file__))[0],
-            u'..', u'resources'))
+        filepath = AppLocation.get_directory(AppLocation.PluginsDir)
+        filepath = os.path.join(filepath, u'bibles', u'resources')
         fbibles = None
         try:
             self.web_bible_list[DownloadLocation.Crosswalk] = {}

openlp/plugins/bibles/lib/http.py

@@ -31,6 +31,7 @@ import sqlite3
 from BeautifulSoup import BeautifulSoup
 
 from openlp.core.lib import Receiver
+from openlp.core.utils import AppLocation
 from common import BibleCommon, SearchResults
 from db import BibleDB
 from openlp.plugins.bibles.lib.models import Book
@@ -43,8 +44,9 @@ class HTTPBooks(object):
     @staticmethod
     def get_cursor():
         if HTTPBooks.cursor is None:
-            filepath = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                u'..', u'resources', u'httpbooks.sqlite')
+            filepath = os.path.join(
+                AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
+                u'resources', u'httpbooks.sqlite')
             conn = sqlite3.connect(filepath)
             HTTPBooks.cursor = conn.cursor()
         return HTTPBooks.cursor

openlp/plugins/bibles/lib/osis.py

@@ -33,6 +33,7 @@ import re
 from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver
+from openlp.core.utils import AppLocation
 from db import BibleDB
 
 log = logging.getLogger(__name__)
@@ -66,9 +67,9 @@ class OSISBible(BibleDB):
         self.q_regex = re.compile(r'<q (.*?)>')
         self.spaces_regex = re.compile(r'([ ]{2,})')
         self.books = {}
-        filepath = os.path.split(os.path.abspath(__file__))[0]
-        filepath = os.path.abspath(os.path.join(
-            filepath, u'..', u'resources', u'osisbooks.csv'))
+        filepath = os.path.join(
+            AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
+            u'resources', u'osisbooks.csv')
         fbibles = None
         try:
             fbibles = open(filepath, u'r')

openlp/plugins/custom/customplugin.py

@@ -69,7 +69,7 @@ class CustomPlugin(Plugin):
     def about(self):
         about_text = self.trUtf8('<b>Custom Plugin</b><br>This plugin '
             'allows slides to be displayed on the screen in the same way '
-            'songs are.  This plugin provides greater freedom over the '
+            'songs are. This plugin provides greater freedom over the '
             'songs plugin.<br>')
         return about_text
 

openlp/plugins/images/imageplugin.py

@@ -61,6 +61,6 @@ class ImagePlugin(Plugin):
             'together and presented on the live controller it is possible '
             'to turn them into a timed loop.<br<br>From the plugin if the '
             '<i>Override background</i> is chosen and an image is selected '
-            'any somgs which are rendered will use the selected image from '
+            'any songs which are rendered will use the selected image from '
             'the background instead of the one provied by the theme.<br>')
         return about_text

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);; All files (*)')
+            self.trUtf8('Images (*.jpg *.jpeg *.gif *.png *.bmp);; All files (*)')
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)
@@ -101,7 +101,7 @@ class ImageMediaItem(MediaManagerItem):
         self.OverrideCheckBox.setChecked(False)
         self.OverrideCheckBox.setText(self.trUtf8('Override background'))
         self.OverrideCheckBox.setStatusTip(
-            self.trUtf8('Allow background of live slide to be overridden'))
+            self.trUtf8('Allow the background of live slide to be overridden'))
         self.OverrideLayout.addWidget(self.OverrideCheckBox)
         self.OverrideLabel = QtGui.QLabel(self.ImageWidget)
         self.OverrideLabel.setObjectName(u'OverrideLabel')

openlp/plugins/presentations/presentationplugin.py

@@ -27,6 +27,7 @@ import os
 import logging
 
 from openlp.core.lib import Plugin, build_icon, Receiver, PluginStatus
+from openlp.core.utils import AppLocation
 from openlp.plugins.presentations.lib import *
 
 log = logging.getLogger(__name__)
@@ -84,11 +85,13 @@ class PresentationPlugin(Plugin):
         If Not do not install the plugin.
         """
         log.debug(u'check_pre_conditions')
-        dir = os.path.join(os.path.dirname(__file__), u'lib')
-        for filename in os.listdir(dir):
+        controller_dir = os.path.join(
+            AppLocation.get_directory(AppLocation.PluginsDir),
+            u'presentations', u'lib')
+        for filename in os.listdir(controller_dir):
             if filename.endswith(u'controller.py') and \
                 not filename == 'presentationcontroller.py':
-                path = os.path.join(dir, filename)
+                path = os.path.join(controller_dir, filename)
                 if os.path.isfile(path):
                     modulename = u'openlp.plugins.presentations.lib.' + \
                         os.path.splitext(filename)[0]
@@ -111,6 +114,6 @@ class PresentationPlugin(Plugin):
     def about(self):
         about_text = self.trUtf8('<b>Presentation Plugin</b> <br> Delivers '
             'the ability to show presentations using a number of different '
-            'programs.  The choice of available presentation programs is '
+            'programs. The choice of available presentation programs is '
             'available to the user in a drop down box.')
         return about_text

openlp/plugins/songs/forms/editverseform.py

@@ -77,7 +77,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
     def setVerse(self, text, verseCount=0, single=False, tag=u'Verse:1'):
         posVerse = 0
         posSub = 0
-        if len(text) == 0:
+        if len(text) == 0 and not single:
             text = u'---[Verse:1]---\n'
         if single:
             id = tag.split(u':')

openlp/plugins/songs/forms/songmaintenanceform.py

@@ -139,7 +139,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             else:
                 QtGui.QMessageBox.critical(
                     self, self.trUtf8('Error'),
-                    self.trUtf8('Couldn\'t add your author!'),
+                    self.trUtf8('Couldn\'t add your author.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onTopicAddButtonClick(self):
@@ -150,7 +150,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             else:
                 QtGui.QMessageBox.critical(
                     self, self.trUtf8('Error'),
-                    self.trUtf8('Couldn\'t add your topic!'),
+                    self.trUtf8('Couldn\'t add your topic.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onBookAddButtonClick(self):
@@ -162,7 +162,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             else:
                 QtGui.QMessageBox.critical(
                     self, self.trUtf8('Error'),
-                    self.trUtf8('Couldn\'t add your book!'),
+                    self.trUtf8('Couldn\'t add your book.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onAuthorEditButtonClick(self):
@@ -182,7 +182,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 else:
                     QtGui.QMessageBox.critical(
                         self, self.trUtf8('Error'),
-                        self.trUtf8('Couldn\'t save your author!'),
+                        self.trUtf8('Couldn\'t save your author.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onTopicEditButtonClick(self):
@@ -197,7 +197,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 else:
                     QtGui.QMessageBox.critical(
                         self, self.trUtf8('Error'),
-                        self.trUtf8('Couldn\'t save your topic!'),
+                        self.trUtf8('Couldn\'t save your topic.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onBookEditButtonClick(self):
@@ -214,7 +214,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 else:
                     QtGui.QMessageBox.critical(
                         self, self.trUtf8('Error'),
-                        self.trUtf8('Couldn\'t save your book!'),
+                        self.trUtf8('Couldn\'t save your book.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onAuthorDeleteButtonClick(self):
@@ -227,7 +227,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             self.trUtf8('Delete Author'),
             self.trUtf8('Are you sure you want to delete the selected author?'),
             self.trUtf8('This author can\'t be deleted, they are currently '
-                'assigned to at least one song!'),
+                'assigned to at least one song.'),
             self.trUtf8('No author selected!'))
 
     def onTopicDeleteButtonClick(self):
@@ -240,7 +240,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             self.trUtf8('Delete Topic'),
             self.trUtf8('Are you sure you want to delete the selected topic?'),
             self.trUtf8('This topic can\'t be deleted, it is currently '
-                'assigned to at least one song!'),
+                'assigned to at least one song.'),
             self.trUtf8('No topic selected!'))
 
     def onBookDeleteButtonClick(self):
@@ -253,5 +253,5 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             self.trUtf8('Delete Book'),
             self.trUtf8('Are you sure you want to delete the selected book?'),
             self.trUtf8('This book can\'t be deleted, it is currently '
-                'assigned to at least one song!'),
-            self.trUtf8('No book selected!'))
+                'assigned to at least one song.'),
+            self.trUtf8('No book selected!'))

openlp/plugins/songusage/forms/songusagedeletedialog.py

@@ -57,4 +57,4 @@ class Ui_SongUsageDeleteDialog(object):
         QtCore.QMetaObject.connectSlotsByName(AuditDeleteDialog)
 
     def retranslateUi(self, AuditDeleteDialog):
-        AuditDeleteDialog.setWindowTitle(self.trUtf8('Audit Delete'))
+        AuditDeleteDialog.setWindowTitle(self.trUtf8('Song Usage Delete'))

openlp/plugins/songusage/forms/songusagedeleteform.py

@@ -41,8 +41,8 @@ class SongUsageDeleteForm(QtGui.QDialog, Ui_SongUsageDeleteDialog):
 
     def accept(self):
         ret = QtGui.QMessageBox.question(self,
-            self.trUtf8('Delete Selected Audit Events?'),
-            self.trUtf8('Are you sure you want to delete selected Audit Data?'),
+            self.trUtf8('Delete Selected Song Usage Events?'),
+            self.trUtf8('Are you sure you want to delete selected Song Usage data?'),
             QtGui.QMessageBox.StandardButtons(
                 QtGui.QMessageBox.Ok |
                 QtGui.QMessageBox.Cancel),

openlp/plugins/songusage/forms/songusagedetaildialog.py

@@ -85,7 +85,7 @@ class Ui_SongUsageDetailDialog(object):
         QtCore.QMetaObject.connectSlotsByName(AuditDetailDialog)
 
     def retranslateUi(self, AuditDetailDialog):
-        AuditDetailDialog.setWindowTitle(self.trUtf8('Audit Detail Extraction'))
-        self.DateRangeGroupBox.setTitle(self.trUtf8('ASelect Date Range'))
+        AuditDetailDialog.setWindowTitle(self.trUtf8('Song Usage Extraction'))
+        self.DateRangeGroupBox.setTitle(self.trUtf8('Select Date Range'))
         self.ToLabel.setText(self.trUtf8('to'))
         self.FileGroupBox.setTitle(self.trUtf8('Report Location'))

openlp/plugins/songusage/forms/songusagedetailform.py

@@ -81,7 +81,7 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
                     instance.copyright, instance.ccl_number , instance.authors)
                 file.write(record)
         except:
-            log.exception(u'Failed to write out audit records')
+            log.exception(u'Failed to write out song usage records')
         finally:
             if file:
                 file.close()

resources/images/openlp-2.qrc

@@ -1,5 +1,5 @@
 <RCC>
-  <qresource prefix="songs">
+  <qresource prefix="songs" >
     <file>topic_edit.png</file>
     <file>author_add.png</file>
     <file>author_delete.png</file>
@@ -21,17 +21,20 @@
     <file>song_topic_edit.png</file>
     <file>song_book_edit.png</file>
   </qresource>
-  <qresource prefix="slides">
+  <qresource prefix="slides" >
     <file>slide_close.png</file>
     <file>slide_first.png</file>
     <file>slide_last.png</file>
     <file>slide_next.png</file>
+    <file>slide_blank.png</file>
+    <file>slide_desktop.png</file>
+    <file>slide_theme.png</file>
     <file>slide_previous.png</file>
     <file>media_playback_start.png</file>
     <file>media_playback_stop.png</file>
     <file>media_playback_pause.png</file>
   </qresource>
-  <qresource prefix="icon">
+  <qresource prefix="icon" >
     <file>openlp-logo-16x16.png</file>
     <file>openlp-logo-32x32.png</file>
     <file>openlp-logo-48x48.png</file>
@@ -39,43 +42,43 @@
     <file>openlp-logo-128x128.png</file>
     <file>openlp-logo-256x256.png</file>
   </qresource>
-  <qresource prefix="graphics">
+  <qresource prefix="graphics" >
     <file>openlp-about-logo.png</file>
     <file>openlp-splash-screen.png</file>
   </qresource>
-  <qresource prefix="imports">
+  <qresource prefix="imports" >
     <file>import_selectall.png</file>
     <file>import_move_to_list.png</file>
     <file>import_remove.png</file>
     <file>import_load.png</file>
   </qresource>
-  <qresource prefix="exports">
+  <qresource prefix="exports" >
     <file>export_selectall.png</file>
     <file>export_remove.png</file>
     <file>export_load.png</file>
     <file>export_move_to_list.png</file>
   </qresource>
-  <qresource prefix="custom">
+  <qresource prefix="custom" >
     <file>custom_new.png</file>
     <file>custom_edit.png</file>
     <file>custom_delete.png</file>
   </qresource>
-  <qresource prefix="wizards">
+  <qresource prefix="wizards" >
     <file>wizard_importbible.bmp</file>
   </qresource>
-  <qresource prefix="presentations">
+  <qresource prefix="presentations" >
     <file>presentation_delete.png</file>
     <file>presentation_load.png</file>
   </qresource>
-  <qresource prefix="videos">
+  <qresource prefix="videos" >
     <file>video_delete.png</file>
     <file>video_load.png</file>
   </qresource>
-  <qresource prefix="images">
+  <qresource prefix="images" >
     <file>image_delete.png</file>
     <file>image_load.png</file>
   </qresource>
-  <qresource prefix="services">
+  <qresource prefix="services" >
     <file>service_edit.png</file>
     <file>service_notes.png</file>
     <file>service_item_notes.png</file>
@@ -88,7 +91,7 @@
     <file>service_open.png</file>
     <file>service_save.png</file>
   </qresource>
-  <qresource prefix="system">
+  <qresource prefix="system" >
     <file>system_close.png</file>
     <file>system_about.png</file>
     <file>system_help_contents.png</file>
@@ -102,7 +105,7 @@
     <file>system_exit.png</file>
     <file>system_settings.png</file>
   </qresource>
-  <qresource prefix="media">
+  <qresource prefix="media" >
     <file>media_custom.png</file>
     <file>media_presentation.png</file>
     <file>media_image.png</file>
@@ -113,16 +116,16 @@
     <file>media_stop.png</file>
     <file>image_clapperboard.png</file>
   </qresource>
-  <qresource prefix="messagebox">
+  <qresource prefix="messagebox" >
     <file>messagebox_critical.png</file>
     <file>messagebox_info.png</file>
     <file>messagebox_warning.png</file>
   </qresource>
-  <qresource prefix="tools">
+  <qresource prefix="tools" >
     <file>tools_add.png</file>
     <file>tools_alert.png</file>
   </qresource>
-  <qresource prefix="themes">
+  <qresource prefix="themes" >
     <file>theme_delete.png</file>
     <file>theme_new.png</file>
     <file>theme_edit.png</file>

resources/innosetup/OpenLP-2.0.iss

@@ -5,7 +5,7 @@
 #define MyAppVerName "OpenLP 2.0"
 #define MyAppPublisher "OpenLP Developers"
 #define MyAppURL "http://openlp.org/"
-#define MyAppExeName "openlp.exe"
+#define MyAppExeName "OpenLP.exe"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -20,12 +20,14 @@ AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName=OpenLP 2.0
-AllowNoIcons=yes
+AllowNoIcons=true
 LicenseFile=LICENSE.txt
-OutputBaseFilename=OpenLP-2.0-setup
+OutputBaseFilename=OpenLP-1.9.0-bzr737-setup
 Compression=lzma
 SolidCompression=true
-SetupIconFile=OpenLP.ico
+SetupIconFile=C:\Program Files\Inno Setup 5\Examples\Setup.ico
+WizardImageFile=C:\Program Files\Inno Setup 5\WizModernImage-IS.bmp
+WizardSmallImageFile=C:\Program Files\Inno Setup 5\WizModernSmallImage-IS.bmp
 
 [Languages]
 Name: english; MessagesFile: compiler:Default.isl
@@ -51,14 +53,16 @@ Name: slovenian; MessagesFile: compiler:Languages\Slovenian.isl
 Name: spanish; MessagesFile: compiler:Languages\Spanish.isl
 
 [Tasks]
-Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
-Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}
 
 [Files]
-Source: C:\Documents and Settings\raoul\My Documents\My Projects\openlp\pyinstaller\dist\openlp\*; DestDir: {app}; Flags: ignoreversion
-Source: C:\Documents and Settings\raoul\My Documents\My Projects\openlp\pyinstaller\dist\openlp\plugins\*; DestDir: {app}\plugins; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: C:\Documents and Settings\raoul\My Documents\My Projects\openlp\pyinstaller\dist\openlp\Microsoft.VC90.CRT\*; DestDir: {app}\Microsoft.VC90.CRT; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: C:\Documents and Settings\raoul\My Documents\My Projects\openlp\pyinstaller\dist\openlp\qt4_plugins\*; DestDir: {app}\qt4_plugins; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\dist\OpenLP\*; DestDir: {app}; Flags: ignoreversion
+Source: ..\..\dist\OpenLP\plugins\*; DestDir: {app}\plugins; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\dist\OpenLP\Microsoft.VC90.CRT\*; DestDir: {app}\Microsoft.VC90.CRT; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\dist\OpenLP\qt4_plugins\*; DestDir: {app}\qt4_plugins; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\dist\OpenLP\eggs\*; DestDir: {app}\eggs; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: openlp.conf; DestDir: {userappdata}\openlp; Flags: ignoreversion onlyifdoesntexist
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

resources/innosetup/openlp.conf

@@ -0,0 +1,26 @@
+[bibles]
+status = 1
+
+[media]
+status = 1
+
+[alerts]
+status = 1
+
+[presentations]
+status = 1
+
+[custom]
+status = 1
+
+[remotes]
+status = 0
+
+[images]
+status = 1
+
+[songusage]
+status = 1
+
+[songs]
+status = 1

resources/pyinstaller/hook-lxml.objectify.py

@@ -0,0 +1 @@
+hiddenimports = ['lxml.etree']