head + resolved conflicts

openlp.pyw

@@ -147,6 +147,9 @@ class OpenLP(QtGui.QApplication):
         return self.exec_()
 
     def hookException(self, exctype, value, traceback):
+        if not hasattr(self, u'mainWindow'):
+            log.exception(''.join(format_exception(exctype, value, traceback)))
+            return
         if not hasattr(self, u'exceptionForm'):
             self.exceptionForm = ExceptionForm(self.mainWindow)
         self.exceptionForm.exceptionTextEdit.setPlainText(
@@ -159,18 +162,18 @@ def main():
     the PyQt4 Application.
     """
     # Set up command line options.
-    usage = u'Usage: %prog [options] [qt-options]'
+    usage = 'Usage: %prog [options] [qt-options]'
     parser = OptionParser(usage=usage)
-    parser.add_option("-l", "--log-level", dest="loglevel",
+    parser.add_option('-e', '--no-error-form', dest='no_error_form',
-                      default="warning", metavar="LEVEL",
+        action='store_true', help='Disable the error notification form.')
-                      help="Set logging to LEVEL level. Valid values are "
+    parser.add_option('-l', '--log-level', dest='loglevel',
-                           "\"debug\", \"info\", \"warning\".")
+        default='warning', metavar='LEVEL', help='Set logging to LEVEL '
-    parser.add_option("-p", "--portable", dest="portable",
+        'level. Valid values are "debug", "info", "warning".')
-                      action="store_true",
+    parser.add_option('-p', '--portable', dest='portable',
-                      help="Specify if this should be run as a portable app, "
+        action='store_true', help='Specify if this should be run as a '
-                           "off a USB flash drive.")
+        'portable app, off a USB flash drive (not implemented).')
-    parser.add_option("-s", "--style", dest="style",
+    parser.add_option('-s', '--style', dest='style',
-                      help="Set the Qt4 style (passed directly to Qt4).")
+        help='Set the Qt4 style (passed directly to Qt4).')
     # Set up logging
     log_path = AppLocation.get_directory(AppLocation.CacheDir)
     if not os.path.exists(log_path):
@@ -203,6 +206,7 @@ def main():
     language = LanguageManager.get_language()
     appTranslator = LanguageManager.get_translator(language)
     app.installTranslator(appTranslator)
+    if not options.no_error_form:
         sys.excepthook = app.hookException
     sys.exit(app.run())
 

openlp/core/lib/__init__.py

@@ -38,62 +38,47 @@ log = logging.getLogger(__name__)
 # TODO make external and configurable in alpha 4 via a settings dialog
 html_expands = []
 
-html_expands.append({u'desc':u'Red', u'start tag':u'{r}', \
+html_expands.append({u'desc':u'Red', u'start tag':u'{r}',
-                          u'start html':u'<span style="-webkit-text-fill-color:red">', \
+    u'start html':u'<span style="-webkit-text-fill-color:red">',
-                          u'end tag':u'{/r}', u'end html':u'</span>', \
+    u'end tag':u'{/r}', u'end html':u'</span>', u'protected':False})
-                          u'protected':False})
+html_expands.append({u'desc':u'Black', u'start tag':u'{b}',
-html_expands.append({u'desc':u'Black', u'start tag':u'{b}', \
+    u'start html':u'<span style="-webkit-text-fill-color:black">',
-                          u'start html':u'<span style="-webkit-text-fill-color:black">', \
+    u'end tag':u'{/b}', u'end html':u'</span>', u'protected':False})
-                          u'end tag':u'{/b}', u'end html':u'</span>', \
+html_expands.append({u'desc':u'Blue', u'start tag':u'{bl}',
-                          u'protected':False})
+    u'start html':u'<span style="-webkit-text-fill-color:blue">',
-html_expands.append({u'desc':u'Blue', u'start tag':u'{bl}', \
+    u'end tag':u'{/bl}', u'end html':u'</span>', u'protected':False})
-                          u'start html':u'<span style="-webkit-text-fill-color:blue">', \
+html_expands.append({u'desc':u'Yellow', u'start tag':u'{y}',
-                          u'end tag':u'{/bl}', u'end html':u'</span>', \
+    u'start html':u'<span style="-webkit-text-fill-color:yellow">',
-                          u'protected':False})
+    u'end tag':u'{/y}', u'end html':u'</span>', u'protected':False})
-html_expands.append({u'desc':u'Yellow', u'start tag':u'{y}', \
+html_expands.append({u'desc':u'Green', u'start tag':u'{g}',
-                          u'start html':u'<span style="-webkit-text-fill-color:yellow">', \
+    u'start html':u'<span style="-webkit-text-fill-color:green">',
-                          u'end tag':u'{/y}', u'end html':u'</span>', \
+    u'end tag':u'{/g}', u'end html':u'</span>', u'protected':False})
-                          u'protected':False})
+html_expands.append({u'desc':u'Pink', u'start tag':u'{pk}',
-html_expands.append({u'desc':u'Green', u'start tag':u'{g}', \
+    u'start html':u'<span style="-webkit-text-fill-color:#CC33CC">',
-                          u'start html':u'<span style="-webkit-text-fill-color:green">', \
+    u'end tag':u'{/pk}', u'end html':u'</span>', u'protected':False})
-                          u'end tag':u'{/g}', u'end html':u'</span>', \
+html_expands.append({u'desc':u'Orange', u'start tag':u'{o}',
-                          u'protected':False})
+    u'start html':u'<span style="-webkit-text-fill-color:#CC0033">',
-html_expands.append({u'desc':u'Pink', u'start tag':u'{pk}', \
+    u'end tag':u'{/o}', u'end html':u'</span>', u'protected':False})
-                          u'start html':u'<span style="-webkit-text-fill-color:#CC33CC">', \
+html_expands.append({u'desc':u'Purple', u'start tag':u'{pp}',
-                          u'end tag':u'{/pk}', u'end html':u'</span>', \
+    u'start html':u'<span style="-webkit-text-fill-color:#9900FF">',
-                          u'protected':False})
+    u'end tag':u'{/pp}', u'end html':u'</span>', u'protected':False})
-html_expands.append({u'desc':u'Orange', u'start tag':u'{o}', \
+html_expands.append({u'desc':u'White', u'start tag':u'{w}',
-                          u'start html':u'<span style="-webkit-text-fill-color:#CC0033">', \
+    u'start html':u'<span style="-webkit-text-fill-color:white">',
-                          u'end tag':u'{/o}', u'end html':u'</span>', \
+    u'end tag':u'{/w}', u'end html':u'</span>', u'protected':False})
-                          u'protected':False})
+html_expands.append({u'desc':u'Superscript', u'start tag':u'{su}',
-html_expands.append({u'desc':u'Purple', u'start tag':u'{pp}', \
+    u'start html':u'<sup>', u'end tag':u'{/su}', u'end html':u'</sup>',
-                          u'start html':u'<span style="-webkit-text-fill-color:#9900FF">', \
-                          u'end tag':u'{/pp}', u'end html':u'</span>', \
-                          u'protected':False})
-html_expands.append({u'desc':u'White', u'start tag':u'{w}', \
-                          u'start html':u'<span style="-webkit-text-fill-color:white">', \
-                          u'end tag':u'{/w}', u'end html':u'</span>', \
-                          u'protected':False})
-html_expands.append({u'desc':u'Superscript', u'start tag':u'{su}', \
-                          u'start html':u'<sup>', \
-                          u'end tag':u'{/su}', u'end html':u'</sup>', \
     u'protected':True})
-html_expands.append({u'desc':u'Subscript', u'start tag':u'{sb}', \
+html_expands.append({u'desc':u'Subscript', u'start tag':u'{sb}',
-                          u'start html':u'<sub>', \
+    u'start html':u'<sub>', u'end tag':u'{/sb}', u'end html':u'</sub>',
-                          u'end tag':u'{/sb}', u'end html':u'</sub>', \
     u'protected':True})
-html_expands.append({u'desc':u'Paragraph', u'start tag':u'{p}', \
+html_expands.append({u'desc':u'Paragraph', u'start tag':u'{p}',
-                          u'start html':u'<p>', \
+    u'start html':u'<p>', u'end tag':u'{/p}', u'end html':u'</p>',
-                          u'end tag':u'{/p}', u'end html':u'</p>', \
     u'protected':True})
-html_expands.append({u'desc':u'Bold', u'start tag':u'{st}', \
+html_expands.append({u'desc':u'Bold', u'start tag':u'{st}',
-                          u'start html':u'<strong>', \
+    u'start html':u'<strong>', u'end tag':u'{/st}', u'end html':u'</strong>',
-                          u'end tag':u'{/st}', \
-                          u'end html':u'</strong>', \
     u'protected':True})
-html_expands.append({u'desc':u'Italics', u'start tag':u'{it}', \
+html_expands.append({u'desc':u'Italics', u'start tag':u'{it}',
-                          u'start html':u'<em>', \
+    u'start html':u'<em>', u'end tag':u'{/it}', u'end html':u'</em>',
-                          u'end tag':u'{/it}', u'end html':u'</em>', \
     u'protected':True})
 
 def translate(context, text, comment=None):

openlp/core/lib/htmlbuilder.py

@@ -81,17 +81,14 @@ body {
 </style>
 <script language="javascript">
     var timer = null;
+    var video_timer = null;
     var transition = %s;
 
     function show_video(state, path, volume, loop){
         var vid = document.getElementById('video');
-        if(path != null)
+        if(path != null){
             vid.src = path;
-        if(loop != null){
+            vid.load();
-            if(loop)
-                vid.loop = 'loop';
-            else
-                vid.loop = '';
         }
         if(volume != null){
             vid.volume = volume;
@@ -100,23 +97,55 @@ body {
             case 'play':
                 vid.play();
                 vid.style.display = 'block';
+                if(loop)
+                    video_timer = setInterval('video_loop()', 200);
                 break;
             case 'pause':
+                if(video_timer!=null){
+                    clearInterval(video_timer);
+                    video_timer = null;
+                }
                 vid.pause();
                 vid.style.display = 'block';
                 break;
             case 'stop':
+                if(video_timer!=null){
+                    clearInterval(video_timer);
+                    video_timer = null;
+                }
                 vid.pause();
                 vid.style.display = 'none';
+                vid.load();
                 break;
             case 'close':
+                if(video_timer!=null){
+                    clearInterval(video_timer);
+                    video_timer = null;
+                }
                 vid.pause();
                 vid.style.display = 'none';
                 vid.src = '';
                 break;
         }
     }
-
+    function video_loop(){
+        // The preferred method would be to use the video tag loop attribute
+        // But QtWebKit doesn't support this. Neither does it support the
+        // onended event, hence the setInterval()
+        // In addition, setting the currentTime attribute to zero to restart
+        // the video raises an INDEX_SIZE_ERROR: DOM Exception 1
+        // To complicate it further, sometimes vid.currentTime stops 
+        // slightly short of vid.duration and vid.ended is intermittent!
+        //
+        // Note, currently the background may go black between loops. Not 
+        // desirable. Need to investigate using two <video>'s, and hiding/
+        // preloading one, and toggle between the two when looping.
+        var vid = document.getElementById('video');
+        if(vid.ended||vid.currentTime+0.2>=vid.duration){
+            vid.load();
+            vid.play();
+        } 
+    }
     function show_image(src){
         var img = document.getElementById('image');
         img.src = src;

openlp/core/lib/mediamanageritem.py

@@ -432,7 +432,7 @@ class MediaManagerItem(QtGui.QWidget):
         raise NotImplementedError(u'MediaManagerItem.onDeleteClick needs to '
             u'be defined by the plugin')
 
-    def generateSlideData(self, service_item, item):
+    def generateSlideData(self, service_item, item=None):
         raise NotImplementedError(u'MediaManagerItem.generateSlideData needs '
             u'to be defined by the plugin')
 

openlp/core/ui/aboutdialog.py

@@ -450,7 +450,7 @@ class Ui_AboutDialog(object):
             '\n'
             'Each version is given a distinguishing version number. If the '
             'Program specifies a version number of this License which applies '
-            'to it and \"any later version\', you have the option of '
+            'to it and "any later version", you have the option of '
             'following the terms and conditions either of that version or of '
             'any later version published by the Free Software Foundation. If '
             'the Program does not specify a version number of this License, '
@@ -565,3 +565,4 @@ class Ui_AboutDialog(object):
         self.contributeButton.setText(translate('OpenLP.AboutForm',
             'Contribute'))
         self.closeButton.setText(translate('OpenLP.AboutForm', 'Close'))
+

openlp/core/ui/exceptiondialog.py

@@ -73,7 +73,7 @@ class Ui_ExceptionDialog(object):
 
     def retranslateUi(self, exceptionDialog):
         exceptionDialog.setWindowTitle(
-            translate('OpenLP.ExceptionDialog', 'Error Occured'))
+            translate('OpenLP.ExceptionDialog', 'Error Occurred'))
         self.messageLabel.setText(translate('OpenLP.ExceptionDialog', 'Oops! '
             'OpenLP hit a problem, and couldn\'t recover. The text in the box '
             'below contains information that might be helpful to the OpenLP '

openlp/core/ui/maindisplay.py

@@ -120,7 +120,7 @@ class MainDisplay(DisplayWidget):
         self.setScene(self.scene)
         self.webView = QtWebKit.QGraphicsWebView()
         self.scene.addItem(self.webView)
-        self.webView.resize(self.screen[u'size'].width(), \
+        self.webView.resize(self.screen[u'size'].width(),
             self.screen[u'size'].height())
         self.page = self.webView.page()
         self.frame = self.page.mainFrame()
@@ -303,6 +303,9 @@ class MainDisplay(DisplayWidget):
         Generates a preview of the image displayed.
         """
         log.debug(u'preview for %s', self.isLive)
+        # We must have a service item to preview
+        if not hasattr(self, u'serviceItem'):
+            return
         if self.isLive:
             # Wait for the fade to finish before geting the preview.
             # Important otherwise preview will have incorrect text if at all !
@@ -336,7 +339,7 @@ class MainDisplay(DisplayWidget):
         self.loaded = False
         self.initialFrame = False
         self.serviceItem = serviceItem
-        html = build_html(self.serviceItem, self.screen, self.parent.alertTab,\
+        html = build_html(self.serviceItem, self.screen, self.parent.alertTab,
             self.isLive)
         self.webView.setHtml(html)
         if serviceItem.foot_text and serviceItem.foot_text:

openlp/core/ui/mainwindow.py

@@ -250,7 +250,7 @@ class Ui_MainWindow(object):
         self.LanguageGroup = QtGui.QActionGroup(MainWindow)
         qmList = LanguageManager.get_qm_list()
         savedLanguage = LanguageManager.get_language()
-        self.AutoLanguageItem.setChecked(LanguageManager.AutoLanguage)
+        self.AutoLanguageItem.setChecked(LanguageManager.auto_language)
         for key in sorted(qmList.keys()):
             languageItem = QtGui.QAction(MainWindow)
             languageItem.setObjectName(key)
@@ -258,7 +258,7 @@ class Ui_MainWindow(object):
             if qmList[key] == savedLanguage:
                 languageItem.setChecked(True)
             add_actions(self.LanguageGroup, [languageItem])
-        self.LanguageGroup.setDisabled(LanguageManager.AutoLanguage)
+        self.LanguageGroup.setDisabled(LanguageManager.auto_language)
         self.ToolsAddToolItem = QtGui.QAction(MainWindow)
         self.ToolsAddToolItem.setIcon(build_icon(u':/tools/tools_add.png'))
         self.ToolsAddToolItem.setObjectName(u'ToolsAddToolItem')
@@ -575,7 +575,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             QtCore.SIGNAL(u'toggled(bool)'), self.setAutoLanguage)
         self.LanguageGroup.triggered.connect(LanguageManager.set_language)
         QtCore.QObject.connect(self.ModeDefaultItem,
-            QtCore.SIGNAL(u'triggered()'), self.setViewMode)
+            QtCore.SIGNAL(u'triggered()'), self.onModeDefaultItemClicked)
         QtCore.QObject.connect(self.ModeSetupItem,
             QtCore.SIGNAL(u'triggered()'), self.onModeSetupItemClicked)
         QtCore.QObject.connect(self.ModeLiveItem,
@@ -640,7 +640,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
 
     def setAutoLanguage(self, value):
         self.LanguageGroup.setDisabled(value)
-        LanguageManager.AutoLanguage = value
+        LanguageManager.auto_language = value
         LanguageManager.set_language(self.LanguageGroup.checkedAction())
 
     def versionNotice(self, version):
@@ -670,6 +670,16 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             self.generalSettingsSection + u'/auto open',
             QtCore.QVariant(False)).toBool():
             self.ServiceManagerContents.onLoadService(True)
+        view_mode = QtCore.QSettings().value(u'%s/view mode' % \
+            self.generalSettingsSection, u'default')
+        if view_mode == u'default':
+            self.ModeDefaultItem.setChecked(True)
+        elif view_mode == u'setup':
+            self.setViewMode(True, True, False, True, False)
+            self.ModeSetupItem.setChecked(True)
+        elif view_mode == u'live':
+            self.setViewMode(False, True, False, False, True)
+            self.ModeLiveItem.setChecked(True)
 
     def blankCheck(self):
         """
@@ -677,8 +687,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         Triggered by delay thread.
         """
         settings = QtCore.QSettings()
-        settings.beginGroup(self.generalSettingsSection)
+        if settings.value(u'%s/screen blank' % self.generalSettingsSection,
-        if settings.value(u'screen blank', QtCore.QVariant(False)).toBool():
+            QtCore.QVariant(False)).toBool():
             self.LiveController.mainDisplaySetBackground()
             if settings.value(u'blank warning',
                 QtCore.QVariant(False)).toBool():
@@ -687,7 +697,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                         'OpenLP Main Display Blanked'),
                     translate('OpenLP.MainWindow',
                          'The Main Display has been blanked out'))
-        settings.endGroup()
 
     def onHelpWebSiteClicked(self):
         """
@@ -716,16 +725,31 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         self.settingsForm.exec_()
 
+    def onModeDefaultItemClicked(self):
+        """
+        Put OpenLP into "Default" view mode.
+        """
+        settings = QtCore.QSettings()
+        settings.setValue(u'%s/view mode' % self.generalSettingsSection,
+            u'default')
+        self.setViewMode(True, True, True, True, True)
+
     def onModeSetupItemClicked(self):
         """
         Put OpenLP into "Setup" view mode.
         """
+        settings = QtCore.QSettings()
+        settings.setValue(u'%s/view mode' % self.generalSettingsSection,
+            u'setup')
         self.setViewMode(True, True, False, True, False)
 
     def onModeLiveItemClicked(self):
         """
         Put OpenLP into "Live" view mode.
         """
+        settings = QtCore.QSettings()
+        settings.setValue(u'%s/view mode' % self.generalSettingsSection,
+            u'live')
         self.setViewMode(False, True, False, False, True)
 
     def setViewMode(self, media=True, service=True, theme=True, preview=True,

openlp/core/ui/plugindialog.py

@@ -93,6 +93,7 @@ class Ui_PluginViewDialog(object):
         self.pluginListButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok)
         self.pluginListButtonBox.setObjectName(u'pluginListButtonBox')
         self.pluginLayout.addWidget(self.pluginListButtonBox)
+        self.versionNumberLabel.setText(u'')
         self.retranslateUi(pluginViewDialog)
         QtCore.QObject.connect(self.pluginListButtonBox,
             QtCore.SIGNAL(u'accepted()'), pluginViewDialog.close)
@@ -105,8 +106,6 @@ class Ui_PluginViewDialog(object):
             translate('OpenLP.PluginForm', 'Plugin Details'))
         self.versionLabel.setText(
             translate('OpenLP.PluginForm', 'Version:'))
-        self.versionNumberLabel.setText(
-            translate('OpenLP.PluginForm', 'TextLabel'))
         self.aboutLabel.setText(
             translate('OpenLP.PluginForm', 'About:'))
         self.statusLabel.setText(
@@ -115,3 +114,4 @@ class Ui_PluginViewDialog(object):
             translate('OpenLP.PluginForm', 'Active'))
         self.statusComboBox.setItemText(1,
             translate('OpenLP.PluginForm', 'Inactive'))
+

openlp/core/ui/servicemanager.py

@@ -279,7 +279,8 @@ class ServiceManager(QtGui.QWidget):
         self.editAction.setVisible(False)
         self.maintainAction.setVisible(False)
         self.notesAction.setVisible(False)
-        if serviceItem[u'service_item'].is_capable(ItemCapabilities.AllowsEdit):
+        if serviceItem[u'service_item'].is_capable(ItemCapabilities.AllowsEdit) \
+            and hasattr(serviceItem[u'service_item'], u'editId'):
             self.editAction.setVisible(True)
         if serviceItem[u'service_item']\
             .is_capable(ItemCapabilities.AllowsMaintain):
@@ -632,6 +633,8 @@ class ServiceManager(QtGui.QWidget):
 
     def onLoadService(self, lastService=False):
         if lastService:
+            if not self.parent.recentFiles:
+                return
             filename = self.parent.recentFiles[0]
         else:
             filename = QtGui.QFileDialog.getOpenFileName(
@@ -881,7 +884,8 @@ class ServiceManager(QtGui.QWidget):
             QtGui.QMessageBox.critical(self,
                 translate('OpenLP.ServiceManager', 'Missing Display Handler'),
                 translate('OpenLP.ServiceManager', 'Your item cannot be '
-                    'displayed as there is no handler to display it'))
+                    'displayed as the plugin required to display it is missing '
+                    'or inactive'))
 
     def remoteEdit(self):
         """

openlp/core/ui/slidecontroller.py

@@ -209,7 +209,8 @@ class SlideController(QtGui.QWidget):
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.Toolbar.addToolbarButton(
                 u'Edit Song', u':/general/general_edit.png',
-                translate('OpenLP.SlideController', 'Edit and re-preview Song'),
+                translate('OpenLP.SlideController', 
+                'Edit and reload song preview'),
                 self.onEditSong)
         if isLive:
             self.Toolbar.addToolbarSeparator(u'Loop Separator')
@@ -269,11 +270,11 @@ class SlideController(QtGui.QWidget):
         if isLive:
             self.SongMenu = QtGui.QToolButton(self.Toolbar)
             self.SongMenu.setText(translate('OpenLP.SlideController',
-                'Go to'))
+                'Go To'))
             self.SongMenu.setPopupMode(QtGui.QToolButton.InstantPopup)
             self.Toolbar.addToolbarWidget(u'Song Menu', self.SongMenu)
             self.SongMenu.setMenu(QtGui.QMenu(
-                translate('OpenLP.SlideController', 'Go to'),
+                translate('OpenLP.SlideController', 'Go To'),
                 self.Toolbar))
             self.Toolbar.makeWidgetsInvisible([u'Song Menu'])
         # Screen preview area

openlp/core/ui/thememanager.py

@@ -242,14 +242,14 @@ class ThemeManager(QtGui.QWidget):
                         QtGui.QMessageBox.critical(self,
                             translate('OpenLP.ThemeManager', 'Error'),
                             unicode(translate('OpenLP.ThemeManager',
-                                'Theme %s is use in %s plugin.')) % \
+                                'Theme %s is used in the %s plugin.')) % \
                                 (theme, plugin.name))
                         return
                 if unicode(self.serviceComboBox.currentText()) == theme:
                     QtGui.QMessageBox.critical(self,
                         translate('OpenLP.ThemeManager', 'Error'),
                         unicode(translate('OpenLP.ThemeManager',
-                        'Theme %s is use by the service manager.')) % theme)
+                        'Theme %s is used by the service manager.')) % theme)
                     return
                 row = self.themeListWidget.row(item)
                 self.themeListWidget.takeItem(row)

openlp/core/utils/__init__.py

@@ -102,6 +102,7 @@ class AppLocation(object):
     PluginsDir = 4
     VersionDir = 5
     CacheDir = 6
+    LanguageDir = 7
 
     @staticmethod
     def get_directory(dir_type=1):
@@ -112,7 +113,11 @@ class AppLocation(object):
             The directory type you want, for instance the data directory.
         """
         if dir_type == AppLocation.AppDir:
-            return os.path.abspath(os.path.split(sys.argv[0])[0])
+            if hasattr(sys, u'frozen') and sys.frozen == 1:
+                app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
+            else:
+                app_path = os.path.split(openlp.__file__)[0]
+            return app_path
         elif dir_type == AppLocation.ConfigDir:
             if sys.platform == u'win32':
                 path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
@@ -169,6 +174,13 @@ class AppLocation(object):
                 except ImportError:
                     path = os.path.join(os.getenv(u'HOME'), u'.openlp')
             return path
+        if dir_type == AppLocation.LanguageDir:
+            if hasattr(sys, u'frozen') and sys.frozen == 1:
+                app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
+            else:
+                app_path = os.path.split(openlp.__file__)[0]
+            return os.path.join(app_path, u'i18n')
+
 
     @staticmethod
     def get_data_path():

openlp/core/utils/languagemanager.py

@@ -35,14 +35,14 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.utils import AppLocation
 from openlp.core.lib import translate
 
-log = logging.getLogger()
+log = logging.getLogger(__name__)
 
 class LanguageManager(object):
     """
     Helper for Language selection
     """
-    __qmList__ = None
+    __qm_list__ = {}
-    AutoLanguage = False
+    auto_language = False
 
     @staticmethod
     def get_translator(language):
@@ -52,12 +52,11 @@ class LanguageManager(object):
         ``language``
             The language to load into the translator
         """
-        if LanguageManager.AutoLanguage:
+        if LanguageManager.auto_language:
             language = QtCore.QLocale.system().name()
-        lang_path = AppLocation.get_directory(AppLocation.AppDir)
+        lang_path = AppLocation.get_directory(AppLocation.LanguageDir)
-        lang_path = os.path.join(lang_path, u'resources', u'i18n')
         app_translator = QtCore.QTranslator()
-        if app_translator.load("openlp_" + language, lang_path):
+        if app_translator.load(language, lang_path):
             return app_translator
 
     @staticmethod
@@ -65,8 +64,8 @@ class LanguageManager(object):
         """
         Find all available language files in this OpenLP install
         """
-        trans_dir = AppLocation.get_directory(AppLocation.AppDir)
+        trans_dir = QtCore.QDir(AppLocation.get_directory(
-        trans_dir = QtCore.QDir(os.path.join(trans_dir, u'resources', u'i18n'))
+            AppLocation.LanguageDir))
         file_names = trans_dir.entryList(QtCore.QStringList("*.qm"),
                 QtCore.QDir.Files, QtCore.QDir.Name)
         for name in file_names:
@@ -96,7 +95,7 @@ class LanguageManager(object):
         log.info(u'Language file: \'%s\' Loaded from conf file' % language)
         reg_ex = QtCore.QRegExp("^\[(.*)\]")
         if reg_ex.exactMatch(language):
-            LanguageManager.AutoLanguage = True
+            LanguageManager.auto_language = True
             language = reg_ex.cap(1)
         return language
 
@@ -110,7 +109,7 @@ class LanguageManager(object):
         """
         action_name = u'%s' % action.objectName()
         qm_list = LanguageManager.get_qm_list()
-        if LanguageManager.AutoLanguage:
+        if LanguageManager.auto_language:
             language = u'[%s]' % qm_list[action_name]
         else:
             language = u'%s' % qm_list[action_name]
@@ -127,20 +126,18 @@ class LanguageManager(object):
         """
         Initialise the list of available translations
         """
-        LanguageManager.__qmList__ = {}
+        LanguageManager.__qm_list__ = {}
         qm_files = LanguageManager.find_qm_files()
-        for i, qmf in enumerate(qm_files):
+        for counter, qmf in enumerate(qm_files):
-            reg_ex = QtCore.QRegExp("^.*openlp_(.*).qm")
+            name = unicode(qmf).split(u'.')[0]
-            if reg_ex.exactMatch(qmf):
+            LanguageManager.__qm_list__[u'%#2i %s' % (counter + 1,
-                lang_name = reg_ex.cap(1)
+                LanguageManager.language_name(qmf))] = name
-                LanguageManager.__qmList__[u'%#2i %s' % (i+1,
-                    LanguageManager.language_name(qmf))] = lang_name
 
     @staticmethod
     def get_qm_list():
         """
         Return the list of available translations
         """
-        if LanguageManager.__qmList__ is None:
+        if not LanguageManager.__qm_list__:
             LanguageManager.init_qm_list()
-        return LanguageManager.__qmList__
+        return LanguageManager.__qm_list__

openlp/plugins/bibles/forms/importwizardform.py

@@ -181,7 +181,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                     translate('BiblesPlugin.ImportWizardForm',
                     'Empty Copyright'),
                     translate('BiblesPlugin.ImportWizardForm',
-                    'You need to set a copyright for your Bible! '
+                    'You need to set a copyright for your Bible. '
                     'Bibles in the Public Domain need to be marked as such.'))
                 self.CopyrightEdit.setFocus()
                 return False
@@ -189,7 +189,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                 QtGui.QMessageBox.critical(self,
                     translate('BiblesPlugin.ImportWizardForm', 'Bible Exists'),
                     translate('BiblesPlugin.ImportWizardForm',
-                    'This Bible already exists! Please import '
+                    'This Bible already exists. Please import '
                     'a different Bible or first delete the existing one.'))
                 self.VersionNameEdit.setFocus()
                 return False

openlp/plugins/bibles/lib/manager.py

@@ -246,7 +246,7 @@ class BibleManager(object):
                 translate('BiblesPlugin.BibleManager',
                 'Scripture Reference Error'),
                 translate('BiblesPlugin.BibleManager', 'Your scripture '
-                'reference is either not supported by OpenLP or invalid.  '
+                'reference is either not supported by OpenLP or is invalid. '
                 'Please make sure your reference conforms to one of the '
                 'following patterns:\n\n'
                 'Book Chapter\n'

openlp/plugins/bibles/lib/mediaitem.py

@@ -777,7 +777,8 @@ class BibleMediaItem(MediaManagerItem):
                         self.dual_search_results[count].text)
                 }
                 bible_text = u' %s %d:%d (%s, %s)' % (verse.book.name,
-                    verse.chapter, verse.verse, version.value, dual_version.value)
+                    verse.chapter, verse.verse, version.value,
+                    dual_version.value)
             else:
                 vdict = {
                     'book': QtCore.QVariant(verse.book.name),

openlp/plugins/bibles/lib/opensong.py

@@ -89,7 +89,7 @@ class OpenSongBible(BibleDB):
                         Receiver.send_message(u'openlp_process_events')
                     self.wizard.incrementProgressBar(
                         QtCore.QString('%s %s %s' % (
-                            translate('BiblesPlugin.Opensong', 'Importing'), \
+                            translate('BiblesPlugin.Opensong', 'Importing'),
                             db_book.name, chapter.attrib[u'n'])))
                     self.session.commit()
         except IOError:

openlp/plugins/presentations/lib/impresscontroller.py

@@ -74,6 +74,7 @@ class ImpressController(PresentationController):
         self.process = None
         self.desktop = None
         self.manager = None
+        self.uno_connection_type = u'pipe' #u'socket'
 
     def check_available(self):
         """
@@ -98,7 +99,14 @@ class ImpressController(PresentationController):
             self.manager._FlagAsMethod(u'Bridge_GetValueObject')
         else:
             # -headless
-            cmd = u'openoffice.org -nologo -norestore -minimized -invisible -nofirststartwizard -accept="socket,host=localhost,port=2002;urp;"'
+            if self.uno_connection_type == u'pipe':
+                cmd = u'openoffice.org -nologo -norestore -minimized ' \
+                    + u'-invisible -nofirststartwizard ' \
+                    + u'-accept=pipe,name=openlp_pipe;urp;'
+            else:
+                cmd = u'openoffice.org -nologo -norestore -minimized ' \
+                    + u'-invisible -nofirststartwizard ' \
+                    + u'-accept=socket,host=localhost,port=2002;urp;'
             self.process = QtCore.QProcess()
             self.process.startDetached(cmd)
             self.process.waitForStarted()
@@ -120,8 +128,14 @@ class ImpressController(PresentationController):
         while ctx is None and loop < 3:
             try:
                 log.debug(u'get UNO Desktop Openoffice - resolve')
-                ctx = resolver.resolve(u'uno:socket,host=localhost,port=2002;'
+                if self.uno_connection_type == u'pipe':
-                    u'urp;StarOffice.ComponentContext')
+                    ctx = resolver.resolve(u'uno:' \
+                        + u'pipe,name=openlp_pipe;' \
+                        + u'urp;StarOffice.ComponentContext')
+                else:
+                    ctx = resolver.resolve(u'uno:' \
+                        + u'socket,host=localhost,port=2002;' \
+                        + u'urp;StarOffice.ComponentContext')
             except:
                 log.exception(u'Unable to find running instance ')
                 self.start_process()

openlp/plugins/presentations/lib/mediaitem.py

@@ -212,7 +212,7 @@ class PresentationMediaItem(MediaManagerItem):
                         self, translate('PresentationPlugin.MediaItem',
                         'Unsupported File'),
                         translate('PresentationPlugin.MediaItem',
-                        'This type of presentation is not supported'))
+                        'This type of presentation is not supported.'))
                     continue
             item_name = QtGui.QListWidgetItem(filename)
             item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))

openlp/plugins/songs/forms/authorsform.py

@@ -97,8 +97,7 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
                     self, translate('SongsPlugin.AuthorsForm', 'Error'),
                     translate('SongsPlugin.AuthorsForm',
                         'You have not set a display name for the '
-                        'author, would you like me to combine the first and '
+                        'author, combine the first and last names?'),
-                        'last names for you?'),
                     QtGui.QMessageBox.StandardButtons(
                         QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
                     ) == QtGui.QMessageBox.Yes:

openlp/plugins/songs/forms/editsongdialog.py

@@ -258,10 +258,11 @@ class Ui_EditSongDialog(object):
         self.TopicBookLayout.addWidget(self.TopicGroupBox)
         self.SongBookGroup = QtGui.QGroupBox(self.TopicBookWidget)
         self.SongBookGroup.setObjectName(u'SongBookGroup')
-        self.SongbookLayout = QtGui.QGridLayout(self.SongBookGroup)
+        self.SongbookLayout = QtGui.QFormLayout(self.SongBookGroup)
         self.SongbookLayout.setMargin(8)
         self.SongbookLayout.setSpacing(8)
         self.SongbookLayout.setObjectName(u'SongbookLayout')
+        self.SongbookNameLabel = QtGui.QLabel(self.SongBookGroup)
         self.SongbookCombo = QtGui.QComboBox(self.SongBookGroup)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding,
             QtGui.QSizePolicy.Fixed)
@@ -272,13 +273,11 @@ class Ui_EditSongDialog(object):
         self.SongbookCombo.setEditable(True)
         self.SongbookCombo.setSizePolicy(sizePolicy)
         self.SongbookCombo.setObjectName(u'SongbookCombo')
-        self.SongbookLayout.addWidget(self.SongbookCombo, 0, 0, 1, 1)
+        self.SongbookLayout.addRow(self.SongbookNameLabel, self.SongbookCombo)
         self.songBookNumberLabel = QtGui.QLabel(self.SongBookGroup)
-        self.SongbookLayout.addWidget(self.songBookNumberLabel, 0, 1, 1, 1)
         self.songBookNumberEdit = QtGui.QLineEdit(self.SongBookGroup)
-        self.songBookNumberLabel.setBuddy(self.songBookNumberEdit)
+        self.SongbookLayout.addRow(self.songBookNumberLabel,
-        self.songBookNumberEdit.setMaximumWidth(35)
+            self.songBookNumberEdit)
-        self.SongbookLayout.addWidget(self.songBookNumberEdit, 0, 2, 1, 1)
         self.TopicBookLayout.addWidget(self.SongBookGroup)
         self.AuthorsTabLayout.addWidget(self.TopicBookWidget)
         self.SongTabWidget.addTab(self.AuthorsTab, u'')
@@ -446,8 +445,10 @@ class Ui_EditSongDialog(object):
             translate('SongsPlugin.EditSongForm', 'R&emove'))
         self.SongBookGroup.setTitle(
             translate('SongsPlugin.EditSongForm', 'Song Book'))
+        self.SongbookNameLabel.setText(translate('SongsPlugin.EditSongForm',
+            'Book:'))
         self.songBookNumberLabel.setText(translate('SongsPlugin.EditSongForm',
-            'Song No.:'))
+            'Number:'))
         self.SongTabWidget.setTabText(
             self.SongTabWidget.indexOf(self.AuthorsTab),
             translate('SongsPlugin.EditSongForm',

openlp/plugins/songs/forms/editsongform.py

@@ -621,6 +621,10 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             self.close()
 
     def saveSong(self):
+        """
+        Get all the data from the widgets on the form, and then save it to the
+        database.
+        """
         self.song.title = unicode(self.TitleEditItem.text())
         self.song.alternate_title = unicode(self.AlternativeEdit.text())
         self.song.copyright = unicode(self.CopyrightEditItem.text())
@@ -646,6 +650,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 self.song.topics.append(self.songmanager.get_object(Topic,
                     topicId))
             self.songmanager.save_object(self.song)
+            self.song = None
             return True
         return False
 

openlp/plugins/songs/forms/songimportform.py

@@ -57,6 +57,15 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
         self.registerFields()
         self.finishButton = self.button(QtGui.QWizard.FinishButton)
         self.cancelButton = self.button(QtGui.QWizard.CancelButton)
+        if not SongFormat.get_availability(SongFormat.OpenLP1):
+            self.openLP1DisabledWidget.setVisible(True)
+            self.openLP1ImportWidget.setVisible(False)
+        if not SongFormat.get_availability(SongFormat.SongsOfFellowship):
+            self.songsOfFellowshipDisabledWidget.setVisible(True)
+            self.songsOfFellowshipImportWidget.setVisible(False)
+        if not SongFormat.get_availability(SongFormat.Generic):
+            self.genericDisabledWidget.setVisible(True)
+            self.genericImportWidget.setVisible(False)
         self.plugin = plugin
         QtCore.QObject.connect(self.openLP2BrowseButton,
             QtCore.SIGNAL(u'clicked()'),
@@ -64,12 +73,12 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
         QtCore.QObject.connect(self.openLP1BrowseButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onOpenLP1BrowseButtonClicked)
-        QtCore.QObject.connect(self.openLyricsAddButton,
+        #QtCore.QObject.connect(self.openLyricsAddButton,
-            QtCore.SIGNAL(u'clicked()'),
+        #    QtCore.SIGNAL(u'clicked()'),
-            self.onOpenLyricsAddButtonClicked)
+        #    self.onOpenLyricsAddButtonClicked)
-        QtCore.QObject.connect(self.openLyricsRemoveButton,
+        #QtCore.QObject.connect(self.openLyricsRemoveButton,
-            QtCore.SIGNAL(u'clicked()'),
+        #    QtCore.SIGNAL(u'clicked()'),
-            self.onOpenLyricsRemoveButtonClicked)
+        #    self.onOpenLyricsRemoveButtonClicked)
         QtCore.QObject.connect(self.openSongAddButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onOpenSongAddButtonClicked)
@@ -145,14 +154,15 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
                     self.openLP1BrowseButton.setFocus()
                     return False
             elif source_format == SongFormat.OpenLyrics:
-                if self.openLyricsFileListWidget.count() == 0:
+                #if self.openLyricsFileListWidget.count() == 0:
-                    QtGui.QMessageBox.critical(self,
+                #    QtGui.QMessageBox.critical(self,
-                        translate('SongsPlugin.ImportWizardForm',
+                #        translate('SongsPlugin.ImportWizardForm',
-                            'No OpenLyrics Files Selected'),
+                #            'No OpenLyrics Files Selected'),
-                        translate('SongsPlugin.ImportWizardForm',
+                #        translate('SongsPlugin.ImportWizardForm',
-                            'You need to add at least one OpenLyrics '
+                #            'You need to add at least one OpenLyrics '
-                            'song file to import from.'))
+                #            'song file to import from.'))
-                    self.openLyricsAddButton.setFocus()
+                #    self.openLyricsAddButton.setFocus()
+                #    return False
                 return False
             elif source_format == SongFormat.OpenSong:
                 if self.openSongFileListWidget.count() == 0:
@@ -252,15 +262,15 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
             self.openLP1FilenameEdit
         )
 
-    def onOpenLyricsAddButtonClicked(self):
+    #def onOpenLyricsAddButtonClicked(self):
-        self.getFiles(
+    #    self.getFiles(
-            translate('SongsPlugin.ImportWizardForm',
+    #        translate('SongsPlugin.ImportWizardForm',
-            'Select OpenLyrics Files'),
+    #        'Select OpenLyrics Files'),
-            self.openLyricsFileListWidget
+    #        self.openLyricsFileListWidget
-        )
+    #    )
 
-    def onOpenLyricsRemoveButtonClicked(self):
+    #def onOpenLyricsRemoveButtonClicked(self):
-        self.removeSelectedItems(self.openLyricsFileListWidget)
+    #    self.removeSelectedItems(self.openLyricsFileListWidget)
 
     def onOpenSongAddButtonClicked(self):
         self.getFiles(
@@ -334,7 +344,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
         self.formatComboBox.setCurrentIndex(0)
         self.openLP2FilenameEdit.setText(u'')
         self.openLP1FilenameEdit.setText(u'')
-        self.openLyricsFileListWidget.clear()
+        #self.openLyricsFileListWidget.clear()
         self.openSongFileListWidget.clear()
         self.wordsOfWorshipFileListWidget.clear()
         self.ccliFileListWidget.clear()

openlp/plugins/songs/forms/songimportwizard.py

@@ -131,26 +131,43 @@ class Ui_SongImportWizard(object):
         # openlp.org 1.x
         self.openLP1Page = QtGui.QWidget()
         self.openLP1Page.setObjectName(u'openLP1Page')
-        self.openLP1Layout = QtGui.QFormLayout(self.openLP1Page)
+        self.openLP1Layout = QtGui.QVBoxLayout(self.openLP1Page)
         self.openLP1Layout.setMargin(0)
-        self.openLP1Layout.setSpacing(8)
+        self.openLP1Layout.setSpacing(0)
         self.openLP1Layout.setObjectName(u'openLP1Layout')
-        self.openLP1FilenameLabel = QtGui.QLabel(self.openLP1Page)
+        self.openLP1DisabledWidget = QtGui.QWidget(self.openLP1Page)
+        self.openLP1DisabledLayout = QtGui.QVBoxLayout(self.openLP1DisabledWidget)
+        self.openLP1DisabledLayout.setMargin(0)
+        self.openLP1DisabledLayout.setSpacing(8)
+        self.openLP1DisabledLayout.setObjectName(u'openLP1DisabledLayout')
+        self.openLP1DisabledLabel = QtGui.QLabel(self.openLP1DisabledWidget)
+        self.openLP1DisabledLabel.setWordWrap(True)
+        self.openLP1DisabledLabel.setObjectName(u'openLP1DisabledLabel')
+        self.openLP1DisabledLayout.addWidget(self.openLP1DisabledLabel)
+        self.openLP1DisabledWidget.setVisible(False)
+        self.openLP1Layout.addWidget(self.openLP1DisabledWidget)
+        self.openLP1ImportWidget = QtGui.QWidget(self.openLP1Page)
+        self.openLP1ImportLayout = QtGui.QFormLayout(self.openLP1ImportWidget)
+        self.openLP1ImportLayout.setMargin(0)
+        self.openLP1ImportLayout.setSpacing(8)
+        self.openLP1ImportLayout.setObjectName(u'openLP1ImportLayout')
+        self.openLP1FilenameLabel = QtGui.QLabel(self.openLP1ImportWidget)
         self.openLP1FilenameLabel.setObjectName(u'openLP1FilenameLabel')
-        self.openLP1Layout.setWidget(0, QtGui.QFormLayout.LabelRole,
+        self.openLP1ImportLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
             self.openLP1FilenameLabel)
         self.openLP1FileLayout = QtGui.QHBoxLayout()
         self.openLP1FileLayout.setSpacing(8)
         self.openLP1FileLayout.setObjectName(u'openLP1FileLayout')
-        self.openLP1FilenameEdit = QtGui.QLineEdit(self.openLP1Page)
+        self.openLP1FilenameEdit = QtGui.QLineEdit(self.openLP1ImportWidget)
         self.openLP1FilenameEdit.setObjectName(u'openLP1FilenameEdit')
         self.openLP1FileLayout.addWidget(self.openLP1FilenameEdit)
-        self.openLP1BrowseButton = QtGui.QToolButton(self.openLP1Page)
+        self.openLP1BrowseButton = QtGui.QToolButton(self.openLP1ImportWidget)
         self.openLP1BrowseButton.setIcon(openIcon)
         self.openLP1BrowseButton.setObjectName(u'openLP1BrowseButton')
         self.openLP1FileLayout.addWidget(self.openLP1BrowseButton)
-        self.openLP1Layout.setLayout(0, QtGui.QFormLayout.FieldRole,
+        self.openLP1ImportLayout.setLayout(0, QtGui.QFormLayout.FieldRole,
             self.openLP1FileLayout)
+        self.openLP1Layout.addWidget(self.openLP1ImportWidget)
         self.formatStackedWidget.addWidget(self.openLP1Page)
         # OpenLyrics
         self.openLyricsPage = QtGui.QWidget()
@@ -159,26 +176,31 @@ class Ui_SongImportWizard(object):
         self.openLyricsLayout.setSpacing(8)
         self.openLyricsLayout.setMargin(0)
         self.openLyricsLayout.setObjectName(u'OpenLyricsLayout')
-        self.openLyricsFileListWidget = QtGui.QListWidget(self.openLyricsPage)
+        self.openLyricsDisabledLabel = QtGui.QLabel(self.openLyricsPage)
-        self.openLyricsFileListWidget.setSelectionMode(
+        self.openLyricsDisabledLabel.setWordWrap(True)
-            QtGui.QAbstractItemView.ExtendedSelection)
+        self.openLyricsDisabledLabel.setObjectName(u'openLyricsDisabledLabel')
-        self.openLyricsFileListWidget.setObjectName(u'OpenLyricsFileListWidget')
+        self.openLyricsLayout.addWidget(self.openLyricsDisabledLabel)
-        self.openLyricsLayout.addWidget(self.openLyricsFileListWidget)
+        # Commented out for future use.
-        self.openLyricsButtonLayout = QtGui.QHBoxLayout()
+        #self.openLyricsFileListWidget = QtGui.QListWidget(self.openLyricsPage)
-        self.openLyricsButtonLayout.setSpacing(8)
+        #self.openLyricsFileListWidget.setSelectionMode(
-        self.openLyricsButtonLayout.setObjectName(u'OpenLyricsButtonLayout')
+        #    QtGui.QAbstractItemView.ExtendedSelection)
-        self.openLyricsAddButton = QtGui.QPushButton(self.openLyricsPage)
+        #self.openLyricsFileListWidget.setObjectName(u'OpenLyricsFileListWidget')
-        self.openLyricsAddButton.setIcon(openIcon)
+        #self.openLyricsLayout.addWidget(self.openLyricsFileListWidget)
-        self.openLyricsAddButton.setObjectName(u'OpenLyricsAddButton')
+        #self.openLyricsButtonLayout = QtGui.QHBoxLayout()
-        self.openLyricsButtonLayout.addWidget(self.openLyricsAddButton)
+        #self.openLyricsButtonLayout.setSpacing(8)
-        self.openLyricsButtonSpacer = QtGui.QSpacerItem(40, 20,
+        #self.openLyricsButtonLayout.setObjectName(u'OpenLyricsButtonLayout')
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        #self.openLyricsAddButton = QtGui.QPushButton(self.openLyricsPage)
-        self.openLyricsButtonLayout.addItem(self.openLyricsButtonSpacer)
+        #self.openLyricsAddButton.setIcon(openIcon)
-        self.openLyricsRemoveButton = QtGui.QPushButton(self.openLyricsPage)
+        #self.openLyricsAddButton.setObjectName(u'OpenLyricsAddButton')
-        self.openLyricsRemoveButton.setIcon(deleteIcon)
+        #self.openLyricsButtonLayout.addWidget(self.openLyricsAddButton)
-        self.openLyricsRemoveButton.setObjectName(u'OpenLyricsRemoveButton')
+        #self.openLyricsButtonSpacer = QtGui.QSpacerItem(40, 20,
-        self.openLyricsButtonLayout.addWidget(self.openLyricsRemoveButton)
+        #    QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.openLyricsLayout.addLayout(self.openLyricsButtonLayout)
+        #self.openLyricsButtonLayout.addItem(self.openLyricsButtonSpacer)
+        #self.openLyricsRemoveButton = QtGui.QPushButton(self.openLyricsPage)
+        #self.openLyricsRemoveButton.setIcon(deleteIcon)
+        #self.openLyricsRemoveButton.setObjectName(u'OpenLyricsRemoveButton')
+        #self.openLyricsButtonLayout.addWidget(self.openLyricsRemoveButton)
+        #self.openLyricsLayout.addLayout(self.openLyricsButtonLayout)
         self.formatStackedWidget.addWidget(self.openLyricsPage)
         # Open Song
         self.openSongPage = QtGui.QWidget()
@@ -277,22 +299,52 @@ class Ui_SongImportWizard(object):
         self.songsOfFellowshipLayout = QtGui.QVBoxLayout(
             self.songsOfFellowshipPage)
         self.songsOfFellowshipLayout.setMargin(0)
-        self.songsOfFellowshipLayout.setSpacing(8)
+        self.songsOfFellowshipLayout.setSpacing(0)
         self.songsOfFellowshipLayout.setObjectName(u'songsOfFellowshipLayout')
-        self.songsOfFellowshipFileListWidget = QtGui.QListWidget(
+        self.songsOfFellowshipDisabledWidget = QtGui.QWidget(
             self.songsOfFellowshipPage)
+        self.songsOfFellowshipDisabledWidget.setVisible(False)
+        self.songsOfFellowshipDisabledWidget.setObjectName(
+            u'songsOfFellowshipDisabledWidget')
+        self.songsOfFellowshipDisabledLayout = QtGui.QVBoxLayout(
+            self.songsOfFellowshipDisabledWidget)
+        self.songsOfFellowshipDisabledLayout.setMargin(0)
+        self.songsOfFellowshipDisabledLayout.setSpacing(8)
+        self.songsOfFellowshipDisabledLayout.setObjectName(
+            u'songsOfFellowshipDisabledLayout')
+        self.songsOfFellowshipDisabledLabel = QtGui.QLabel(
+            self.songsOfFellowshipDisabledWidget)
+        self.songsOfFellowshipDisabledLabel.setWordWrap(True)
+        self.songsOfFellowshipDisabledLabel.setObjectName(
+            u'songsOfFellowshipDisabledLabel')
+        self.songsOfFellowshipDisabledLayout.addWidget(
+            self.songsOfFellowshipDisabledLabel)
+        self.songsOfFellowshipLayout.addWidget(
+            self.songsOfFellowshipDisabledWidget)
+        self.songsOfFellowshipImportWidget = QtGui.QWidget(
+            self.songsOfFellowshipPage)
+        self.songsOfFellowshipImportWidget.setObjectName(
+            u'songsOfFellowshipImportWidget')
+        self.songsOfFellowshipImportLayout = QtGui.QVBoxLayout(
+            self.songsOfFellowshipImportWidget)
+        self.songsOfFellowshipImportLayout.setMargin(0)
+        self.songsOfFellowshipImportLayout.setSpacing(8)
+        self.songsOfFellowshipImportLayout.setObjectName(
+            u'songsOfFellowshipImportLayout')
+        self.songsOfFellowshipFileListWidget = QtGui.QListWidget(
+            self.songsOfFellowshipImportWidget)
         self.songsOfFellowshipFileListWidget.setSelectionMode(
             QtGui.QAbstractItemView.ExtendedSelection)
         self.songsOfFellowshipFileListWidget.setObjectName(
             u'songsOfFellowshipFileListWidget')
-        self.songsOfFellowshipLayout.addWidget(
+        self.songsOfFellowshipImportLayout.addWidget(
             self.songsOfFellowshipFileListWidget)
         self.songsOfFellowshipButtonLayout = QtGui.QHBoxLayout()
         self.songsOfFellowshipButtonLayout.setSpacing(8)
         self.songsOfFellowshipButtonLayout.setObjectName(
             u'songsOfFellowshipButtonLayout')
         self.songsOfFellowshipAddButton = QtGui.QPushButton(
-            self.songsOfFellowshipPage)
+            self.songsOfFellowshipImportWidget)
         self.songsOfFellowshipAddButton.setIcon(openIcon)
         self.songsOfFellowshipAddButton.setObjectName(
             u'songsOfFellowshipAddButton')
@@ -303,42 +355,63 @@ class Ui_SongImportWizard(object):
         self.songsOfFellowshipButtonLayout.addItem(
             self.songsOfFellowshipButtonSpacer)
         self.songsOfFellowshipRemoveButton = QtGui.QPushButton(
-            self.songsOfFellowshipPage)
+            self.songsOfFellowshipImportWidget)
         self.songsOfFellowshipRemoveButton.setIcon(deleteIcon)
         self.songsOfFellowshipRemoveButton.setObjectName(
             u'songsOfFellowshipRemoveButton')
         self.songsOfFellowshipButtonLayout.addWidget(
             self.songsOfFellowshipRemoveButton)
-        self.songsOfFellowshipLayout.addLayout(
+        self.songsOfFellowshipImportLayout.addLayout(
             self.songsOfFellowshipButtonLayout)
+        self.songsOfFellowshipLayout.addWidget(
+            self.songsOfFellowshipImportWidget)
         self.formatStackedWidget.addWidget(self.songsOfFellowshipPage)
         # Generic Document/Presentation import
         self.genericPage = QtGui.QWidget()
         self.genericPage.setObjectName(u'genericPage')
         self.genericLayout = QtGui.QVBoxLayout(self.genericPage)
         self.genericLayout.setMargin(0)
-        self.genericLayout.setSpacing(8)
+        self.genericLayout.setSpacing(0)
         self.genericLayout.setObjectName(u'genericLayout')
-        self.genericFileListWidget = QtGui.QListWidget(self.genericPage)
+        self.genericDisabledWidget = QtGui.QWidget(self.genericPage)
+        self.genericDisabledWidget.setObjectName(u'genericDisabledWidget')
+        self.genericDisabledLayout = QtGui.QVBoxLayout(self.genericDisabledWidget)
+        self.genericDisabledLayout.setMargin(0)
+        self.genericDisabledLayout.setSpacing(8)
+        self.genericDisabledLayout.setObjectName(u'genericDisabledLayout')
+        self.genericDisabledLabel = QtGui.QLabel(self.genericDisabledWidget)
+        self.genericDisabledLabel.setWordWrap(True)
+        self.genericDisabledLabel.setObjectName(u'genericDisabledLabel')
+        self.genericDisabledWidget.setVisible(False)
+        self.genericDisabledLayout.addWidget(self.genericDisabledLabel)
+        self.genericLayout.addWidget(self.genericDisabledWidget)
+        self.genericImportWidget = QtGui.QWidget(self.genericPage)
+        self.genericImportWidget.setObjectName(u'genericImportWidget')
+        self.genericImportLayout = QtGui.QVBoxLayout(self.genericImportWidget)
+        self.genericImportLayout.setMargin(0)
+        self.genericImportLayout.setSpacing(8)
+        self.genericImportLayout.setObjectName(u'genericImportLayout')
+        self.genericFileListWidget = QtGui.QListWidget(self.genericImportWidget)
         self.genericFileListWidget.setSelectionMode(
             QtGui.QAbstractItemView.ExtendedSelection)
         self.genericFileListWidget.setObjectName(u'genericFileListWidget')
-        self.genericLayout.addWidget(self.genericFileListWidget)
+        self.genericImportLayout.addWidget(self.genericFileListWidget)
         self.genericButtonLayout = QtGui.QHBoxLayout()
         self.genericButtonLayout.setSpacing(8)
         self.genericButtonLayout.setObjectName(u'genericButtonLayout')
-        self.genericAddButton = QtGui.QPushButton(self.genericPage)
+        self.genericAddButton = QtGui.QPushButton(self.genericImportWidget)
         self.genericAddButton.setIcon(openIcon)
         self.genericAddButton.setObjectName(u'genericAddButton')
         self.genericButtonLayout.addWidget(self.genericAddButton)
         self.genericButtonSpacer = QtGui.QSpacerItem(40, 20,
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.genericButtonLayout.addItem(self.genericButtonSpacer)
-        self.genericRemoveButton = QtGui.QPushButton(self.genericPage)
+        self.genericRemoveButton = QtGui.QPushButton(self.genericImportWidget)
         self.genericRemoveButton.setIcon(deleteIcon)
         self.genericRemoveButton.setObjectName(u'genericRemoveButton')
         self.genericButtonLayout.addWidget(self.genericRemoveButton)
-        self.genericLayout.addLayout(self.genericButtonLayout)
+        self.genericImportLayout.addLayout(self.genericButtonLayout)
+        self.genericLayout.addWidget(self.genericImportWidget)
         self.formatStackedWidget.addWidget(self.genericPage)
 #        Commented out for future use.
 #        self.csvPage = QtGui.QWidget()
@@ -434,10 +507,20 @@ class Ui_SongImportWizard(object):
             translate('SongsPlugin.ImportWizardForm', 'Filename:'))
         self.openLP1BrowseButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Browse...'))
-        self.openLyricsAddButton.setText(
+        self.openLP1DisabledLabel.setText(
-            translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+            translate('SongsPlugin.ImportWizardForm', 'The openlp.org 1.x '
-        self.openLyricsRemoveButton.setText(
+            'importer has been disabled due to a missing Python module. If '
-            translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+            'you want to use this importer, you will need to install the '
+            '"python-sqlite" module.'))
+        #self.openLyricsAddButton.setText(
+        #    translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+        #self.openLyricsRemoveButton.setText(
+        #    translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+        self.openLyricsDisabledLabel.setText(
+            translate('SongsPlugin.ImportWizardForm', 'The OpenLyrics '
+            'importer has not yet been developed, but as you can see, we are '
+            'still intending to do so. Hopefully it will be in the next '
+            'release.'))
         self.openSongAddButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.openSongRemoveButton.setText(
@@ -454,10 +537,18 @@ class Ui_SongImportWizard(object):
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.songsOfFellowshipRemoveButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+        self.songsOfFellowshipDisabledLabel.setText(
+            translate('SongsPlugin.ImportWizardForm', 'The Songs of '
+            'Fellowship importer has been disabled because OpenLP cannot '
+            'find OpenOffice.org on your computer.'))
         self.genericAddButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.genericRemoveButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+        self.genericDisabledLabel.setText(
+            translate('SongsPlugin.ImportWizardForm', 'The generic document/'
+            'presentation importer has been disabled because OpenLP cannot '
+            'find OpenOffice.org on your computer.'))
 #        self.csvFilenameLabel.setText(
 #            translate('SongsPlugin.ImportWizardForm', 'Filename:'))
 #        self.csvBrowseButton.setText(

openlp/plugins/songs/forms/songmaintenanceform.py

@@ -324,8 +324,8 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                     QtGui.QMessageBox.critical(self,
                         translate('SongsPlugin.SongMaintenanceForm', 'Error'),
                         translate('SongsPlugin.SongMaintenanceForm',
-                        'Could not save your modified author, because he '
+                        'Could not save your modified author, because the '
-                        'already exists.'))
+                        'author already exists.'))
 
     def onTopicEditButtonClick(self):
         topic_id = self._getCurrentItemId(self.TopicsListWidget)

openlp/plugins/songs/forms/topicsform.py

@@ -51,7 +51,7 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
             QtGui.QMessageBox.critical(
                 self, translate('SongsPlugin.TopicsForm', 'Error'),
                 translate('SongsPlugin.TopicsForm',
-                    'You need to type in a topic name!'))
+                    'You need to type in a topic name.'))
             self.NameEdit.setFocus()
             return False
         else:

openlp/plugins/songs/lib/cclifileimport.py

@@ -81,14 +81,15 @@ class CCLIFileImport(SongImport):
                 lines = infile.readlines()
                 ext = os.path.splitext(filename)[1]
                 if ext.lower() == ".usr":
-                    log.info(u'SongSelect .usr format file found %s: ' ,  filename)
+                    log.info(u'SongSelect .usr format file found %s: ',
+                        filename)
                     self.do_import_usr_file(lines)
                 elif ext.lower() == ".txt":
-                    log.info(u'SongSelect .txt format file found %s: ', filename)
+                    log.info(u'SongSelect .txt format file found %s: ',
+                        filename)
                     self.do_import_txt_file(lines)
                 else:
                     log.info(u'Extension %s is not valid', filename)
-                    pass
                 song_count += 1
             if self.stop_import_flag:
                 return False
@@ -175,7 +176,7 @@ class CCLIFileImport(SongImport):
             verse_text = unicode(words_list[counter])
             verse_text = verse_text.replace("/n",  "\n")
             if len(verse_text) > 0:
-                self.add_verse(verse_text, verse_type);
+                self.add_verse(verse_text, verse_type)
         #Handle multiple authors
         author_list = song_author.split(u'/')
         if len(author_list) < 2:
@@ -238,7 +239,7 @@ class CCLIFileImport(SongImport):
         line_number = 0
         verse_text = u''
         song_comments = u''
-        song_copyright = u'';
+        song_copyright = u''
         verse_start = False
         for line in textList:
             clean_line = line.strip()
@@ -293,7 +294,8 @@ class CCLIFileImport(SongImport):
                         line_number += 1
                         song_author = clean_line
                     #line_number=4, comments lines before last line
-                    elif (line_number==4) and (not clean_line.startswith(u'CCL')):
+                    elif (line_number == 4) and \
+                        (not clean_line.startswith(u'CCL')):
                         song_comments = song_comments + clean_line
         # split on known separators
         author_list = song_author.split(u'/')
@@ -307,4 +309,3 @@ class CCLIFileImport(SongImport):
         self.ccli_number = song_ccli
         self.comments = song_comments
         self.finish()
-        

openlp/plugins/songs/lib/importer.py

@@ -26,14 +26,24 @@
 
 from opensongimport import OpenSongImport
 from olpimport import OpenLPSongImport
+from wowimport import WowImport
+from cclifileimport import CCLIFileImport
+# Imports that might fail
+try:
     from olp1import import OpenLP1SongImport
+    has_openlp1 = True
+except ImportError:
+    has_openlp1 = False
 try:
     from sofimport import SofImport
-    from oooimport import OooImport
+    has_sof = True
-    from cclifileimport import CCLIFileImport
-    from wowimport import WowImport
 except ImportError:
-    pass
+    has_sof = False
+try:
+    from oooimport import OooImport
+    has_ooo = True
+except ImportError:
+    has_ooo = False
 
 class SongFormat(object):
     """
@@ -41,6 +51,7 @@ class SongFormat(object):
     plus a few helper functions to facilitate generic handling of song types
     for importing.
     """
+    _format_availability = {}
     Unknown = -1
     OpenLP2 = 0
     OpenLP1 = 1
@@ -93,4 +104,16 @@ class SongFormat(object):
             SongFormat.Generic
         ]
 
+    @staticmethod
+    def set_availability(format, available):
+        SongFormat._format_availability[format] = available
+
+    @staticmethod
+    def get_availability(format):
+        return SongFormat._format_availability.get(format, True)
+
+SongFormat.set_availability(SongFormat.OpenLP1, has_openlp1)
+SongFormat.set_availability(SongFormat.SongsOfFellowship, has_sof)
+SongFormat.set_availability(SongFormat.Generic, has_ooo)
+
 __all__ = [u'SongFormat']

openlp/plugins/songs/lib/olp1import.py

@@ -28,10 +28,8 @@ The :mod:`olp1import` module provides the functionality for importing
 openlp.org 1.x song databases into the current installation database.
 """
 import logging
-try:
+import chardet
 import sqlite
-except:
-    pass
 
 from openlp.core.lib import translate
 from songimport import SongImport
@@ -43,6 +41,8 @@ class OpenLP1SongImport(SongImport):
     The :class:`OpenLP1SongImport` class provides OpenLP with the ability to
     import song databases from installations of openlp.org 1.x.
     """
+    last_encoding = u'windows-1252'
+
     def __init__(self, manager, **kwargs):
         """
         Initialise the import.
@@ -56,6 +56,34 @@ class OpenLP1SongImport(SongImport):
         SongImport.__init__(self, manager)
         self.import_source = kwargs[u'filename']
 
+    def decode_string(self, raw, guess):
+        """
+        Use chardet to detect the encoding of the raw string, and convert it
+        to unicode.
+
+        ``raw``
+            The raw bytestring to decode.
+        ``guess``
+            What chardet guessed the encoding to be.
+        """
+        if guess[u'confidence'] < 0.8:
+            codec = u'windows-1252'
+        else:
+            codec = guess[u'encoding']
+        try:
+            decoded = unicode(raw, codec)
+            self.last_encoding = codec
+        except UnicodeDecodeError:
+            log.exception(u'Error in detecting openlp.org 1.x database encoding.')
+            try:
+                decoded = unicode(raw, self.last_encoding)
+            except UnicodeDecodeError:
+                # possibly show an error form
+                #self.import_wizard.showError(u'There was a problem '
+                #    u'detecting the encoding of a string')
+                decoded = raw
+        return decoded
+
     def do_import(self):
         """
         Run the import for an openlp.org 1.x song database.
@@ -63,6 +91,11 @@ class OpenLP1SongImport(SongImport):
         # Connect to the database
         connection = sqlite.connect(self.import_source)
         cursor = connection.cursor()
+        # Determine if we're using a new or an old DB
+        cursor.execute(u'SELECT name FROM sqlite_master '
+            u'WHERE type = \'table\' AND name = \'tracks\'')
+        table_list = cursor.fetchall()
+        new_db = len(table_list) > 0
         # Count the number of records we need to import, for the progress bar
         cursor.execute(u'SELECT COUNT(songid) FROM songs')
         count = int(cursor.fetchone()[0])
@@ -71,6 +104,7 @@ class OpenLP1SongImport(SongImport):
         # "cache" our list of authors
         cursor.execute(u'SELECT authorid, authorname FROM authors')
         authors = cursor.fetchall()
+        if new_db:
             # "cache" our list of tracks
             cursor.execute(u'SELECT trackid, fulltrackname FROM tracks')
             tracks = cursor.fetchall()
@@ -84,9 +118,10 @@ class OpenLP1SongImport(SongImport):
                 success = False
                 break
             song_id = song[0]
-            title = unicode(song[1], u'cp1252')
+            guess = chardet.detect(song[2])
-            lyrics = unicode(song[2], u'cp1252').replace(u'\r', u'')
+            title = self.decode_string(song[1], guess)
-            copyright = unicode(song[3], u'cp1252')
+            lyrics = self.decode_string(song[2], guess).replace(u'\r', u'')
+            copyright = self.decode_string(song[3], guess)
             self.import_wizard.incrementProgressBar(
                 unicode(translate('SongsPlugin.ImportWizardForm',
                     'Importing "%s"...')) % title)
@@ -102,15 +137,12 @@ class OpenLP1SongImport(SongImport):
                     break
                 for author in authors:
                     if author[0] == author_id[0]:
-                        self.parse_author(unicode(author[1], u'cp1252'))
+                        self.parse_author(self.decode_string(author[1], guess))
                         break
             if self.stop_import_flag:
                 success = False
                 break
-            cursor.execute(u'SELECT name FROM sqlite_master '
+            if new_db:
-                u'WHERE type = \'table\' AND name = \'tracks\'')
-            table_list = cursor.fetchall()
-            if len(table_list) > 0:
                 cursor.execute(u'SELECT trackid FROM songtracks '
                     u'WHERE songid = %s ORDER BY listindex' % song_id)
                 track_ids = cursor.fetchall()
@@ -120,10 +152,11 @@ class OpenLP1SongImport(SongImport):
                         break
                     for track in tracks:
                         if track[0] == track_id[0]:
-                            self.add_media_file(unicode(track[1], u'cp1252'))
+                            self.add_media_file(self.decode_string(track[1], guess))
                             break
             if self.stop_import_flag:
                 success = False
                 break
             self.finish()
         return success
+

openlp/plugins/songs/lib/oooimport.py

@@ -59,6 +59,7 @@ class OooImport(SongImport):
         self.document = None
         self.process_started = False
         self.filenames = kwargs[u'filenames']
+        self.uno_connection_type = u'pipe' #u'socket'
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'song_stop_import'), self.stop_import)
 
@@ -106,8 +107,14 @@ class OooImport(SongImport):
             loop = 0
             while ctx is None and loop < 5:
                 try:
-                    ctx = resolver.resolve(u'uno:socket,host=localhost,' \
+                    if self.uno_connection_type == u'pipe':
-                        + 'port=2002;urp;StarOffice.ComponentContext')
+                        ctx = resolver.resolve(u'uno:' \
+                            + u'pipe,name=openlp_pipe;' \
+                            + u'urp;StarOffice.ComponentContext')
+                    else:
+                        ctx = resolver.resolve(u'uno:' \
+                            + u'socket,host=localhost,port=2002;' \
+                            + u'urp;StarOffice.ComponentContext')
                 except:
                     pass
                 self.start_ooo_process()
@@ -123,9 +130,14 @@ class OooImport(SongImport):
                 self.manager._FlagAsMethod(u'Bridge_GetStruct')
                 self.manager._FlagAsMethod(u'Bridge_GetValueObject')
             else:
+                if self.uno_connection_type == u'pipe':
                     cmd = u'openoffice.org -nologo -norestore -minimized ' \
                         + u'-invisible -nofirststartwizard ' \
-                    + '-accept="socket,host=localhost,port=2002;urp;"'
+                        + u'-accept=pipe,name=openlp_pipe;urp;'
+                else:
+                    cmd = u'openoffice.org -nologo -norestore -minimized ' \
+                        + u'-invisible -nofirststartwizard ' \
+                        + u'-accept=socket,host=localhost,port=2002;urp;'
                 process = QtCore.QProcess()
                 process.startDetached(cmd)
                 process.waitForStarted()

openlp/plugins/songs/lib/opensongimport.py

@@ -29,7 +29,9 @@ import os
 from zipfile import ZipFile
 from lxml import objectify
 from lxml.etree import Error, LxmlError
+import re
 
+from openlp.core.lib import translate
 from openlp.plugins.songs.lib.songimport import SongImport
 
 log = logging.getLogger(__name__)
@@ -112,12 +114,22 @@ class OpenSongImport(SongImport):
 
     def do_import(self):
         """
-        Import either a single opensong file, or a zipfile containing multiple
+        Import either each of the files in self.filenames - each element of
-        opensong files. If `self.commit` is set False, the import will not be
+        which can be either a single opensong file, or a zipfile containing
-        committed to the database (useful for test scripts).
+        multiple opensong files. If `self.commit` is set False, the
+        import will not be committed to the database (useful for test scripts).
         """
         success = True
-        self.import_wizard.importProgressBar.setMaximum(len(self.filenames))
+        numfiles = 0
+        for filename in self.filenames:
+            ext = os.path.splitext(filename)[1]
+            if ext.lower() == u'.zip':
+                z = ZipFile(filename, u'r')
+                numfiles += len(z.infolist())
+            else:
+                numfiles += 1
+        log.debug("Total number of files: %d", numfiles)
+        self.import_wizard.importProgressBar.setMaximum(numfiles)
         for filename in self.filenames:
             if self.stop_import_flag:
                 success = False
@@ -126,9 +138,6 @@ class OpenSongImport(SongImport):
             if ext.lower() == u'.zip':
                 log.debug(u'Zipfile found %s', filename)
                 z = ZipFile(filename, u'r')
-                self.import_wizard.importProgressBar.setMaximum(
-                    self.import_wizard.importProgressBar.maximum() +
-                    len(z.infolist()))
                 for song in z.infolist():
                     if self.stop_import_flag:
                         success = False
@@ -137,6 +146,7 @@ class OpenSongImport(SongImport):
                     if parts[-1] == u'':
                         #No final part => directory
                         continue
+                    log.info(u'Zip importing %s', parts[-1])
                     self.import_wizard.incrementProgressBar(
                         unicode(translate('SongsPlugin.ImportWizardForm',
                             'Importing %s...')) % parts[-1])
@@ -144,11 +154,11 @@ class OpenSongImport(SongImport):
                     self.do_import_file(songfile)
                     if self.commit:
                         self.finish()
-                    self.set_defaults()
                 if self.stop_import_flag:
                     success = False
                     break
             else:
+                # not a zipfile
                 log.info('Direct import %s', filename)
                 self.import_wizard.incrementProgressBar(
                     unicode(translate('SongsPlugin.ImportWizardForm',
@@ -157,9 +167,7 @@ class OpenSongImport(SongImport):
                 self.do_import_file(file)
                 if self.commit:
                     self.finish()
-                self.set_defaults()
+
-        if not self.commit:
-            self.finish()
         return success
 
     def do_import_file(self, file):
@@ -167,10 +175,10 @@ class OpenSongImport(SongImport):
         Process the OpenSong file - pass in a file-like object,
         not a filename
         """
-        self.authors = []
+        self.set_defaults()
         try:
             tree = objectify.parse(file)
-        except Error, LxmlError:
+        except (Error, LxmlError):
             log.exception(u'Error parsing XML')
             return
         root = tree.getroot()
@@ -196,7 +204,6 @@ class OpenSongImport(SongImport):
             self.topics.append(unicode(root.alttheme))
         # data storage while importing
         verses = {}
-        lyrics = unicode(root.lyrics)
         # keep track of a "default" verse order, in case none is specified
         our_verse_order = []
         verses_seen = {}
@@ -204,6 +211,7 @@ class OpenSongImport(SongImport):
         # erm, versetype!
         versetype = u'V'
         versenum = None
+        lyrics = unicode(root.lyrics)
         for thisline in lyrics.split(u'\n'):
             # remove comments
             semicolon = thisline.find(u';')
@@ -218,16 +226,18 @@ class OpenSongImport(SongImport):
                 continue
             # verse/chorus/etc. marker
             if thisline[0] == u'[':
-                versetype = thisline[1].upper()
+                # drop the square brackets
-                if versetype.isdigit():
-                    versenum = versetype
-                    versetype = u'V'
-                elif thisline[2] != u']':
-                    # there's a number to go with it - extract that as well
                 right_bracket = thisline.find(u']')
-                    versenum = thisline[2:right_bracket]
+                content = thisline[1:right_bracket].upper()
+                # have we got any digits? If so, versenumber is everything from the digits
+                # to the end (even if there are some alpha chars on the end)
+                match = re.match(u'(.*)(\d+.*)', content)
+                if match is not None:
+                    versetype = match.group(1)
+                    versenum = match.group(2)
                 else:
-                    # if there's no number, assume it's no.1
+                    # otherwise we assume number 1 and take the whole prefix as versetype
+                    versetype = content
                     versenum = u'1'
                 continue
             words = None
@@ -235,10 +245,10 @@ class OpenSongImport(SongImport):
             if thisline[0].isdigit():
                 versenum = thisline[0]
                 words = thisline[1:].strip()
-            if words is None and \
+            if words is None:
-                   versenum is not None and \
-                   versetype is not None:
                 words = thisline
+                if not versenum: 
+                    versenum = u'1'
             if versenum is not None:
                 versetag = u'%s%s' % (versetype, versenum)
                 if not verses.has_key(versetype):
@@ -259,10 +269,13 @@ class OpenSongImport(SongImport):
         versetypes.sort()
         versetags = {}
         for versetype in versetypes:
+            our_verse_type = versetype
+            if our_verse_type == u'':
+                our_verse_type = u'V'
             versenums = verses[versetype].keys()
             versenums.sort()
             for num in versenums:
-                versetag = u'%s%s' % (versetype, num)
+                versetag = u'%s%s' % (our_verse_type, num)
                 lines = u'\n'.join(verses[versetype][num])
                 self.verses.append([versetag, lines])
                 # Keep track of what we have for error checking later
@@ -271,16 +284,23 @@ class OpenSongImport(SongImport):
         order = []
         if u'presentation' in fields and root.presentation != u'':
             order = unicode(root.presentation)
-            order = order.split()
+            # We make all the tags in the lyrics upper case, so match that here
+            # and then split into a list on the whitespace
+            order = order.upper().split()
         else:
             if len(our_verse_order) > 0:
                 order = our_verse_order
             else:
-                log.warn(u'No verse order available for %s, skipping.', self.title)
+                log.warn(u'No verse order available for %s, skipping.',
+                    self.title)
         for tag in order:
-            if len(tag) == 1:
+            if tag[0].isdigit():
-                tag = tag + u'1' # Assume it's no.1 if it's not there
+                # Assume it's a verse if it has no prefix
+                tag = u'V' + tag 
+            elif not re.search('\d+', tag):
+                # Assume it's no.1 if there's no digits
+                tag = tag + u'1'
             if not versetags.has_key(tag):
-                log.warn(u'Got order %s but not in versetags, skipping', tag)
+                log.info(u'Got order %s but not in versetags, dropping this item from presentation order', tag)
             else:
                 self.verse_order_list.append(tag)

openlp/plugins/songs/lib/songimport.py

@@ -55,8 +55,12 @@ class SongImport(QtCore.QObject):
         self.set_defaults()
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'songs_stop_import'), self.stop_import)
-
     def set_defaults(self):
+        """
+        Create defaults for properties - call this before each song
+        if importing many songs at once to ensure a clean beginning
+        """
+        self.authors = []
         self.title = u''
         self.song_number = u''
         self.alternate_title = u''
@@ -71,13 +75,7 @@ class SongImport(QtCore.QObject):
         self.song_book_pub = u''
         self.verse_order_list = []
         self.verses = []
-        self.versecount = 0
+        self.versecounts = {}
-        self.choruscount = 0
-        self.bridgecount = 0
-        self.introcount = 0
-        self.prechoruscount = 0
-        self.endingcount = 0
-        self.othercount = 0
         self.copyright_string = unicode(translate(
             'SongsPlugin.SongImport', 'copyright'))
         self.copyright_symbol = unicode(translate(
@@ -198,7 +196,7 @@ class SongImport(QtCore.QObject):
             return
         self.media_files.append(filename)
 
-    def add_verse(self, verse, versetag=None):
+    def add_verse(self, verse, versetag=u'V'):
         """
         Add a verse. This is the whole verse, lines split by \n
         Verse tag can be V1/C1/B etc, or 'V' and 'C' (will count the verses/
@@ -210,33 +208,14 @@ class SongImport(QtCore.QObject):
             if oldverse.strip() == verse.strip():
                 self.verse_order_list.append(oldversetag)
                 return
-        if versetag == u'V' or not versetag:
+        if versetag[0] in self.versecounts:
-            self.versecount += 1
+            self.versecounts[versetag[0]] += 1
-            versetag = u'V' + unicode(self.versecount)
+        else:
-        if versetag.startswith(u'C'):
+            self.versecounts[versetag[0]] = 1
-            self.choruscount += 1
+        if len(versetag) == 1:
-        if versetag == u'C':
+            versetag += unicode(self.versecounts[versetag[0]])
-            versetag += unicode(self.choruscount)
+        elif int(versetag[1:]) > self.versecounts[versetag[0]]:
-        if versetag.startswith(u'B'):
+            self.versecounts[versetag[0]] = int(versetag[1:])
-            self.bridgecount += 1
-        if versetag == u'B':
-            versetag += unicode(self.bridgecount)            
-        if versetag.startswith(u'I'):
-            self.introcount += 1
-        if versetag == u'I':
-            versetag += unicode(self.introcount)
-        if versetag.startswith(u'P'):
-            self.prechoruscount += 1
-        if versetag == u'P':
-            versetag += unicode(self.prechoruscount)
-        if versetag.startswith(u'E'):
-            self.endingcount += 1
-        if versetag == u'E':
-            versetag += unicode(self.endingcount)
-        if versetag.startswith(u'O'):
-            self.othercount += 1
-        if versetag == u'O':
-            versetag += unicode(self.othercount)                                    
         self.verses.append([versetag, verse.rstrip()])
         self.verse_order_list.append(versetag)
         if versetag.startswith(u'V') and self.contains_verse(u'C1'):
@@ -280,13 +259,16 @@ class SongImport(QtCore.QObject):
         """
         Write the song and its fields to disk
         """
+        log.info(u'commiting song %s to database', self.title)
         song = Song()
         song.title = self.title
         song.search_title = self.remove_punctuation(self.title) \
             + '@' + self.alternate_title
         song.song_number = self.song_number
         song.search_lyrics = u''
+        verses_changed_to_other = {}
         sxml = SongXMLBuilder()
+        other_count = 1
         for (versetag, versetext) in self.verses:
             if versetag[0] == u'C':
                 versetype = VerseType.to_string(VerseType.Chorus)
@@ -301,10 +283,18 @@ class SongImport(QtCore.QObject):
             elif versetag[0] == u'E':
                 versetype = VerseType.to_string(VerseType.Ending)
             else:
+                newversetag = u'O%d' % other_count
+                verses_changed_to_other[versetag] = newversetag
+                other_count += 1
                 versetype = VerseType.to_string(VerseType.Other)
+                log.info(u'Versetype %s changing to %s' , versetag, newversetag)
+                versetag = newversetag
             sxml.add_verse_to_lyrics(versetype, versetag[1:], versetext)
             song.search_lyrics += u' ' + self.remove_punctuation(versetext)
         song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
+        for i, current_verse_tag in enumerate(self.verse_order_list):
+            if verses_changed_to_other.has_key(current_verse_tag):
+                self.verse_order_list[i] = verses_changed_to_other[current_verse_tag]
         song.verse_order = u' '.join(self.verse_order_list)
         song.copyright = self.copyright
         song.comments = self.comments

openlp/plugins/songs/lib/test/test.opensong

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <song>
   <title>Martins Test</title>
-  <author>MartiÑ Thómpson</author>
+  <author>MartiÑ &amp; Martin2 Thómpson</author>
   <copyright>2010 Martin Thompson</copyright>
   <hymn_number>1</hymn_number>
-  <presentation>V1 C V2 C2 V3 B1 V1</presentation>
+  <presentation>V1 C V2 C2 3a B1 V1 T U Rap1 Rap2 Rap3</presentation>
   <ccli>Blah</ccli>
   <capo print="false"></capo>
   <key></key>
@@ -17,7 +17,12 @@
   <alttheme>TestAltTheme</alttheme>
   <tempo></tempo>
   <time_sig></time_sig>
-  <lyrics>;Comment
+  <lyrics>[3a]
+. G A B
+ V3 Line 1
+. G A B
+ V3 Line 2
+
 . A   B C
 1 v1 Line 1___
 2 v2 Line 1___
@@ -25,10 +30,6 @@
 1 V1 Line 2
 2 V2 Line 2
  
-[3]
- V3 Line 1
- V3 Line 2
-
 [b1]
  Bridge 1
 ---
@@ -42,6 +43,23 @@
 [C2]
 .  A    B
  Chorus 2
+
+[T]
+  T Line 1
+
+[Rap]
+1 Rap 1 Line 1
+2 Rap 2 Line 1
+1 Rap 1 Line 2
+2 Rap 2 Line 2
+
+[rap3]
+ Rap 3 Line 1
+ Rap 3 Line 2
+
+
+[X]
+  Unreferenced verse line 1
  </lyrics>
   <style index="default_style">
   <title enabled="true" valign="bottom" align="center" include_verse="false" margin-left="0" margin-right="0" margin-top="0" margin-bottom="0" font="Helvetica" size="26" bold="true" italic="true" underline="false" color="#FFFFFF" border="true" border_color="#000000" shadow="true" shadow_color="#000000" fill="false" fill_color="#000000"/>

openlp/plugins/songs/lib/test/test3.opensong

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<song>
+  <title>Test single verse</title>
+  <author>Martin Thompson</author>
+  <copyright>2010</copyright>
+  <ccli>123456</ccli>
+  <theme>Worship: Declaration</theme>
+  <lyrics> Line 1
+Line 2
+</lyrics></song>

openlp/plugins/songs/lib/test/test_import_file.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
+# Carsten Tinggaard, Frode Woldsund                                           #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+import sys
+
+from openlp.plugins.songs.lib.opensongimport import OpenSongImport
+from openlp.core.lib.db import Manager
+from openlp.plugins.songs.lib.db import init_schema
+
+import logging
+LOG_FILENAME = 'test_import_file.log'
+logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO)
+
+from test_opensongimport import wizard_stub, progbar_stub
+
+def test(filenames):
+    manager = Manager(u'songs', init_schema)
+    o = OpenSongImport(manager, filenames=filenames)
+    o.import_wizard = wizard_stub()
+    o.commit = False
+    o.do_import()
+    o.print_song()
+
+if __name__ == "__main__":
+    test(sys.argv[1:])

openlp/plugins/songs/lib/test/test_importing_lots.py

@@ -8,50 +8,29 @@ from traceback import print_exc
 import sys
 import codecs
 
+import logging
+LOG_FILENAME = 'import.log'
+logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO)
+
+from test_opensongimport import wizard_stub, progbar_stub
+
+# Useful test function for importing a variety of different files
+# Uncomment below depending on what problem trying to make occur!
+
 def opensong_import_lots():
     ziploc = u'/home/mjt/openlp/OpenSong_Data/'
     files = []
-    #files = [u'test.opensong.zip', ziploc+u'ADond.zip']
+    files = [os.path.join(ziploc, u'RaoulSongs', u'Songs', u'Jesus Freak')]
-    files.extend(glob(ziploc+u'Songs.zip'))
+    # files.extend(glob(ziploc+u'Songs.zip'))
+    # files.extend(glob(ziploc+u'RaoulSongs.zip'))
     # files.extend(glob(ziploc+u'SOF.zip'))
     # files.extend(glob(ziploc+u'spanish_songs_for_opensong.zip'))
     # files.extend(glob(ziploc+u'opensong_*.zip'))
     errfile = codecs.open(u'import_lots_errors.txt', u'w', u'utf8')
     manager = Manager(u'songs', init_schema)
-    for file in files:
+    o = OpenSongImport(manager, filenames=files)
-        print u'Importing', file
+    o.import_wizard=wizard_stub()
-        z = ZipFile(file, u'r')
+    o.do_import()
-        for song in z.infolist():
-            # need to handle unicode filenames (CP437 -  Winzip does this)
-            filename = song.filename#.decode('cp852')
-            parts = os.path.split(filename)
-            if parts[-1] == u'':
-                #No final part => directory
-                continue
-            print "  ", file, ":",filename,
-            songfile = z.open(song)
-            #z.extract(song)
-            #songfile=open(filename, u'r')
-            o = OpenSongImport(manager)
-            try:
-                o.do_import_file(songfile)
-                # o.song_import.print_song()
-            except:
-                print "Failure",
 
-                errfile.write(u'Failure: %s:%s\n' %(file, filename.decode('cp437')))
-                songfile = z.open(song)
-                for l in songfile.readlines():
-                    l = l.decode('utf8')
-                    print(u'  |%s\n' % l.strip())
-                    errfile.write(u'  |%s\n'%l.strip())   
-                print_exc(3, file = errfile)
-                print_exc(3)
-                sys.exit(1)
-                # continue
-            #o.finish()
-            print "OK"
-            #os.unlink(filename)
-            # o.song_import.print_song()
 if __name__ == "__main__":
     opensong_import_lots()

openlp/plugins/songs/lib/test/test_opensongimport.py

@@ -28,62 +28,101 @@ from openlp.plugins.songs.lib.opensongimport import OpenSongImport
 from openlp.core.lib.db import Manager
 from openlp.plugins.songs.lib.db import init_schema
 
+import logging
+LOG_FILENAME = 'test.log'
+logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO)
+
+# Stubs to replace the UI functions for raw testing
+class wizard_stub:
+    def __init__(self):
+        self.importProgressBar=progbar_stub()
+    def incrementProgressBar(self, str):
+        pass
+class progbar_stub:
+    def __init__(self):
+        pass
+    def setMaximum(self, arg):
+        pass
+
 def test():
     manager = Manager(u'songs', init_schema)
-    o = OpenSongImport(manager)
+    o = OpenSongImport(manager, filenames=[u'test.opensong'])
-    o.do_import(u'test.opensong', commit=False)
+    o.import_wizard = wizard_stub()
-    o.song_import.print_song()
+    o.commit = False
-    assert o.song_import.copyright == u'2010 Martin Thompson'
+    o.do_import()
-    assert o.song_import.authors == [u'MartiÑ Thómpson']
+    o.print_song()
-    assert o.song_import.title == u'Martins Test'
+    assert o.copyright == u'2010 Martin Thompson'
-    assert o.song_import.alternate_title == u''
+    assert o.authors == [u'MartiÑ Thómpson', u'Martin2 Thómpson']
-    assert o.song_import.song_number == u'1'
+    assert o.title == u'Martins Test'
-    assert [u'C1', u'Chorus 1'] in o.song_import.verses 
+    assert o.alternate_title == u''
-    assert [u'C2', u'Chorus 2'] in o.song_import.verses 
+    assert o.song_number == u'1'
-    assert not [u'C3', u'Chorus 3'] in o.song_import.verses 
+    assert [u'C1', u'Chorus 1'] in o.verses 
-    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.song_import.verses 
+    assert [u'C2', u'Chorus 2'] in o.verses 
-    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.song_import.verses 
+    assert not [u'C3', u'Chorus 3'] in o.verses 
-    assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.song_import.verses
+    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses 
-    assert o.song_import.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3', u'B1', u'V1']
+    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses 
-    assert o.song_import.ccli_number == u'Blah'
+    assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
-    assert o.song_import.topics == [u'TestTheme', u'TestAltTheme']
+    assert [u'V3A', u'V3 Line 1\nV3 Line 2'] in o.verses
-    o.do_import(u'test.opensong.zip', commit=False)
+    assert [u'RAP1', u'Rap 1 Line 1\nRap 1 Line 2'] in o.verses
-    o.song_import.print_song()
+    assert [u'RAP2', u'Rap 2 Line 1\nRap 2 Line 2'] in o.verses
-    o.finish()
+    assert [u'RAP3', u'Rap 3 Line 1\nRap 3 Line 2'] in o.verses
-    assert o.song_import.copyright == u'2010 Martin Thompson'
+    assert [u'X1', u'Unreferenced verse line 1'] in o.verses
-    assert o.song_import.authors == [u'MartiÑ Thómpson']
+    assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3A', u'B1', u'V1', u'T1', u'RAP1', u'RAP2', u'RAP3']
-    assert o.song_import.title == u'Martins Test'
+    assert o.ccli_number == u'Blah'
-    assert o.song_import.alternate_title == u''
+    assert o.topics == [u'TestTheme', u'TestAltTheme']
-    assert o.song_import.song_number == u'1'
-    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.song_import.verses 
-    assert [u'C1', u'Chorus 1'] in o.song_import.verses 
-    assert [u'C2', u'Chorus 2'] in o.song_import.verses 
-    assert not [u'C3', u'Chorus 3'] in o.song_import.verses 
-    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.song_import.verses 
-    assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.song_import.verses
-    assert o.song_import.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3', u'B1', u'V1']
 
-    o = OpenSongImport(manager)
+    o.filenames = [u'test.opensong.zip']
-    o.do_import(u'test2.opensong', commit=False)
+    o.set_defaults()
-    # o.finish()
+    o.do_import()
-    o.song_import.print_song()
+    o.print_song()
-    assert o.song_import.copyright == u'2010 Martin Thompson'
+    assert o.copyright == u'2010 Martin Thompson'
-    assert o.song_import.authors == [u'Martin Thompson']
+    assert o.authors == [u'MartiÑ Thómpson']
-    assert o.song_import.title == u'Martins 2nd Test'
+    assert o.title == u'Martins Test'
-    assert o.song_import.alternate_title == u''
+    assert o.alternate_title == u''
-    assert o.song_import.song_number == u'2'
+    assert o.song_number == u'1'
-    print o.song_import.verses
+    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses 
-    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.song_import.verses 
+    assert [u'C1', u'Chorus 1'] in o.verses 
-    assert [u'C1', u'Chorus 1'] in o.song_import.verses 
+    assert [u'C2', u'Chorus 2'] in o.verses 
-    assert [u'C2', u'Chorus 2'] in o.song_import.verses 
+    assert not [u'C3', u'Chorus 3'] in o.verses 
-    assert not [u'C3', u'Chorus 3'] in o.song_import.verses 
+    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses 
-    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.song_import.verses 
+    assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
-    assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.song_import.verses
+    print o.verse_order_list
-    print o.song_import.verse_order_list
+    assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3', u'B1', u'V1']
-    assert o.song_import.verse_order_list == [u'V1', u'V2', u'B1', u'C1', u'C2']
+
+    o.filenames = [u'test2.opensong']
+    o.set_defaults()
+    o.do_import()
+    o.print_song()
+    assert o.copyright == u'2010 Martin Thompson'
+    assert o.authors == [u'Martin Thompson']
+    assert o.title == u'Martins 2nd Test'
+    assert o.alternate_title == u''
+    assert o.song_number == u'2'
+    print o.verses
+    assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses 
+    assert [u'C1', u'Chorus 1'] in o.verses 
+    assert [u'C2', u'Chorus 2'] in o.verses 
+    assert not [u'C3', u'Chorus 3'] in o.verses 
+    assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses 
+    assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
+    print o.verse_order_list
+    assert o.verse_order_list == [u'V1', u'V2', u'B1', u'C1', u'C2']
+
+    o.filenames = [u'test3.opensong']
+    o.set_defaults()
+    o.do_import()
+    o.print_song()
+    assert o.copyright == u'2010'
+    assert o.authors == [u'Martin Thompson']
+    assert o.title == u'Test single verse'
+    assert o.alternate_title == u''
+    assert o.ccli_number == u'123456'
+    assert o.verse_order_list == [u'V1']
+    assert o.topics == [u'Worship: Declaration']
+    print o.verses[0]
+    assert [u'V1', u'Line 1\nLine 2'] in o.verses 
 
     print "Tests passed"
-    pass
 
 if __name__ == "__main__":
     test()

resources/openlp.desktop

@@ -1,3 +1,4 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
 Encoding=UTF-8
 Name=OpenLP

scripts/bible-1to2-converter.py

@@ -127,6 +127,8 @@ def import_bible():
     for row in rows:
         key = unicode(row[0], u'cp1252')
         value = unicode(row[1], u'cp1252')
+        if key == u'Permission':
+            key = u'Permissions'
         sql_insert = u'INSERT INTO metadata '\
             '("key", "value") '\
             'VALUES (?, ?)'

scripts/resources.patch

@@ -1,6 +1,6 @@
 --- openlp/core/resources.py.old	Mon Jun 21 23:16:19 2010
 +++ openlp/core/resources.py	Mon Jun 21 23:27:48 2010
-@@ -1,10 +1,31 @@
+@@ -1,10 +1,32 @@
  # -*- coding: utf-8 -*-
 +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
  
@@ -14,8 +14,9 @@
 +# --------------------------------------------------------------------------- #
 +# Copyright (c) 2008-2010 Raoul Snyman                                        #
 +# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
++# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian      #
-+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
++# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble,    #
++# Carsten Tinggaard, Frode Woldsund                                           #
 +# --------------------------------------------------------------------------- #
 +# This program is free software; you can redistribute it and/or modify it     #
 +# under the terms of the GNU General Public License as published by the Free  #

scripts/translation_utils.py

@@ -24,13 +24,31 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-# Short description
-# Steps for creating languages:
-# 1. make sure that the openlp_en.ts file exist
-# 2. go to scripts folder and start:
-#     python translation_utils.py -a
-###############################################################################
 
+"""
+This script is used to maintain the translation files in OpenLP. It downloads
+the latest translation files from the Pootle translation server, updates the
+local translation files from both the source code and the files from Pootle,
+and can also generate the compiled translation files.
+
+Create New Language
+-------------------
+
+To create a new language, simply run this script with the ``-a`` command line
+option::
+
+    @:~$ ./translation_utils.py -a
+
+Update Translation Files
+------------------------
+
+The best way to update the translations is to download the files from Pootle,
+and then update the local files using both the downloaded files and the source.
+This is done easily via the ``-d``, ``-p`` and ``-u`` options::
+
+    @:~$ ./translation_utils.py -dpu
+
+"""
 import os
 import urllib
 import re
@@ -39,201 +57,277 @@ from optparse import OptionParser
 from PyQt4 import QtCore
 from BeautifulSoup import BeautifulSoup
 
-class TranslationUtils(object):
+SERVER_URL = u'http://pootle.projecthq.biz/export/openlp/'
+IGNORED_PATHS = [u'scripts']
+IGNORED_FILES = [u'setup.py']
+
+verbose_mode = False
+
+class Command(object):
+    """
+    Provide an enumeration of commands.
+    """
+    Download = 1
+    Create = 2
+    Prepare = 3
+    Update = 4
+    Generate = 5
+
+class CommandStack(object):
+    """
+    This class provides an iterable stack.
+    """
     def __init__(self):
-        self.ignore_paths = [u'./scripts']
+        self.current_index = 0
-        self.ignore_files = [u'setup.py']
+        self.data = []
-        self.server_url = u'http://pootle.projecthq.biz/export/openlp/'
-        self.cmd_stack = []
-        self.stack_count = 0
-        self.verbose = False
 
+    def __len__(self):
+        return len(self.data)
 
-    def process_stack(self):
+    def __getitem__(self, index):
-        if len(self.cmd_stack) > 0:
+        if self.data[index].get(u'arguments'):
-            if len(self.cmd_stack) == self.stack_count:
+            return self.data[index][u'command'], self.data[index][u'arguments']
-                print u'Process %d commands' % self.stack_count
-            print u'%d. ' % (self.stack_count-len(self.cmd_stack)+1),
-            command = self.cmd_stack.pop(0)
-            if len(command) > 1:
-                command[0](command[1])
         else:
-                command[0]()
+            return self.data[index][u'command']
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        if self.current_index == len(self.data):
+            raise StopIteration
         else:
-            print "Finished all commands"
+            current_item = self.data[self.current_index][u'command']
+            self.current_index += 1
+            return current_item
+
+    def append(self, command, **kwargs):
+        data = {u'command': command}
+        if u'arguments' in kwargs:
+            data[u'arguments'] = kwargs[u'arguments']
+        self.data.append(data)
+
+    def reset(self):
+        self.current_index = 0
 
 
-    def downloadTranslations(self):
+def print_verbose(text):
-        print 'Download Translation files from HQ-Server'
+    """
-        page = urllib.urlopen(u'%s' % (self.server_url))
+    This method checks to see if we are in verbose mode, and if so prints
-        soup = BeautifulSoup(page)
+    ``text`` out.
-        languages = soup.findAll(text=re.compile(".*\.ts"))
-        for language in languages:
-            filename = os.path.join(u'..', u'resources', u'i18n',
-                u'openlp_%s' % language)
-            self.printVerbose(u'Get Translation File: %s' % filename)
-            self.get_and_write_file(language, filename)
-        print u'  done'
-        self.process_stack()
 
-    def get_and_write_file(self, language, filename):
+    ``text``
-        page = urllib.urlopen(u'%s%s' % (self.server_url, language))
+        The text to print.
+    """
+    global verbose_mode
+    if verbose_mode:
+        print u'    %s' % text
+
+def run(command):
+    """
+    This method runs an external application.
+
+    ``command``
+        The command to run.
+    """
+    print_verbose(command)
+    process = QtCore.QProcess()
+    process.start(command)
+    while (process.waitForReadyRead()):
+        print_verbose(u'ReadyRead: %s' % QtCore.QString(process.readAll()))
+    print_verbose(u'Error(s):\n%s' % process.readAllStandardError())
+    print_verbose(u'Output:\n%s' % process.readAllStandardOutput())
+    print u'   Done.'
+
+def download_file(source_filename, dest_filename):
+    """
+    Download a file and save it to disk.
+
+    ``source_filename``
+        The file to download.
+
+    ``dest_filename``
+        The new local file name.
+    """
+    print_verbose(u'Downloading from: %s' % (SERVER_URL + source_filename))
+    page = urllib.urlopen(SERVER_URL + source_filename)
     content = page.read().decode('utf8')
     page.close()
-        file = open(filename, u'w')
+    file = open(dest_filename, u'w')
     file.write(content.encode('utf8'))
     file.close()
 
-    def creation(self, language):
+def download_translations():
-        print "Create new Translation File"
     """
-            Use this option to create a new translation file
+    This method downloads the translation files from the Pootle server.
-            this function: 
-                * create the new *.ts file
     """
-        filename = os.path.join(u'..', u'resources', u'i18n',
+    print 'Download translation files from Pootle'
-                u'openlp_%s.ts' % language)
+    page = urllib.urlopen(SERVER_URL)
-        self.get_and_write_file(u'en.ts', filename)
+    soup = BeautifulSoup(page)
-        self.printVerbose("""
+    languages = soup.findAll(text=re.compile(r'.*\.ts'))
-            Please remind: For permanent providing this language:
+    for language in languages:
-            this language name have to append to the global list 
+        filename = os.path.join(os.path.abspath(u'..'), u'resources', u'i18n',
-            variable "translations" in this file
+            language)
-            and this file have to be uploaded to the Pootle Server
+        print_verbose(u'Get Translation File: %s' % filename)
-            Please contact the developers!
+        download_file(language, filename)
-            """)
+    print u'   Done.'
-        print u'  done'
-        self.process_stack()
 
-        
+def prepare_project():
-    def preparation(self):
+    """
+    This method creates the project file needed to update the translation files
+    and compile them into .qm files.
+    """
     print u'Generating the openlp.pro file'
-        stringlist = []
+    lines = []
-        start_dir = os.path.join(u'..')
+    start_dir = os.path.abspath(u'..')
+    start_dir = start_dir + os.sep
+    print_verbose(u'Starting directory: %s' % start_dir)
     for root, dirs, files in os.walk(start_dir):
         for file in files:
-                path = u'%s' % root
+            path = root.replace(start_dir, u'').replace(u'\\', u'/') #.replace(u'..', u'.')
-                path = path.replace('\\','/')
-                path = path.replace('..','.')
-                
             if file.startswith(u'hook-') or file.startswith(u'test_'):
                continue
-
+            ignore = False
-                cond = False
+            for ignored_path in IGNORED_PATHS:
-                for search in self.ignore_paths:
+                if path.startswith(ignored_path):
-                    if path.startswith(search):
+                    ignore = True
-                        cond = True
+                    break
-                if cond:
+            if ignore:
                 continue
-                cond = False
+            ignore = False
-                for search in self.ignore_files:
+            for ignored_file in IGNORED_FILES:
-                    if search == file:
+                if file == ignored_file:
-                        cond = True
+                    ignore = True
-                if cond:
+                    break
+            if ignore:
                 continue
-                
+            if file.endswith(u'.py') or file.endswith(u'.pyw'):
-                if file.endswith(u'.py'):
+                if path:
                     line = u'%s/%s' % (path, file)
-                    self.printVerbose(u'Parsing "%s"' % line)
+                else:
-                    stringlist.append(u'SOURCES      += %s' % line)
+                    line = file
-                elif file.endswith(u'.pyw'):
+                print_verbose(u'Parsing "%s"' % line)
-                    line = u'%s/%s' % (path, file)
+                lines.append(u'SOURCES      += %s' % line)
-                    self.printVerbose(u'Parsing "%s"' % line)
-                    stringlist.append(u'SOURCES      += %s' % line)
             elif file.endswith(u'.ts'):
                 line = u'%s/%s' % (path, file)
-                    self.printVerbose(u'Parsing "%s"' % line)
+                print_verbose(u'Parsing "%s"' % line)
-                    stringlist.append(u'TRANSLATIONS += %s' % line)
+                lines.append(u'TRANSLATIONS += %s' % line)
-                
+    lines.sort()
-        stringlist.sort()
+    file = open(os.path.join(start_dir, u'openlp.pro'), u'w')
-        self.write_file(os.path.join(start_dir, u'openlp.pro'), stringlist)
+    file.write(u'\n'.join(lines).encode('utf8'))
-        print u'  done'
-        self.process_stack()
-
-    def update(self):
-        print u'Update the translation files'
-        cmd = u'pylupdate4 -verbose -noobsolete ../openlp.pro'
-        self.start_cmd(cmd)
-
-    def generate(self):
-        print u'Generate the related *.qm files'
-        cmd = u'lrelease ../openlp.pro'
-        self.start_cmd(cmd)
-        
-    def write_file(self, filename, stringlist):
-        content = u''
-        for line in stringlist:
-            content = u'%s%s\n' % (content, line)
-        file = open(filename, u'w')
-        file.write(content.encode('utf8'))
     file.close()
+    print u'   Done.'
 
-    def printVerbose(self, data):
+def update_translations():
-        if self.verbose:
+    print u'Update the translation files'
-            print u'    %s' % data
+    if not os.path.exists(os.path.join(os.path.abspath(u'..'), u'openlp.pro')):
+        print u'You have no generated a project file yet, please run this ' + \
+            u'script with the -p option.'
+        return
+    else:
+        os.chdir(os.path.abspath(u'..'))
+        run(u'pylupdate4 -verbose -noobsolete openlp.pro')
 
-    def start_cmd(self, command):
+def generate_binaries():
-        self.printVerbose(command)
+    print u'Generate the related *.qm files'
-        self.process = QtCore.QProcess()
+    if not os.path.exists(os.path.join(os.path.abspath(u'..'), u'openlp.pro')):
-        self.process.start(command)
+        print u'You have no generated a project file yet, please run this ' + \
-        while (self.process.waitForReadyRead()):
+            u'script with the -p option. It is also recommended that you ' + \
-            self.printVerbose(u'ReadyRead: %s' % QtCore.QString(self.process.readAll()))
+            u'this script with the -u option to update the translation ' + \
-        self.printVerbose(self.process.readAllStandardError())
+            u'files as well.'
-        self.printVerbose(self.process.readAllStandardOutput())
+        return
-        print u'  done'
+    else:
-        self.process_stack()
+        os.chdir(os.path.abspath(u'..'))
+        run(u'lrelease openlp.pro')
 
+def create_translation(language):
+    """
+    This method creates a new translation file.
+
+    ``language``
+        The language file to create.
+    """
+    print "Create new Translation File"
+    filename = os.path.join(os.path.abspath(u'..'), u'resources', u'i18n', language)
+    download_file(u'en.ts', filename)
+    print u'\n** Please Note **\n'
+    print u'In order to get this file into OpenLP and onto the Pootle ' + \
+        u'translation server you will need to subscribe to the OpenLP' + \
+        u'Translators mailing list, and request that your language file ' + \
+        u'be added to the project.\n'
+    print u'   Done'
+
+def process_stack(command_stack):
+    """
+    This method looks at the commands in the command stack, and processes them
+    in the order they are in the stack.
+
+    ``command_stack``
+        The command stack to process.
+    """
+    if command_stack:
+        print u'Processing %d commands...' % len(command_stack)
+        for command in command_stack:
+            print u'%d.' % (command_stack.current_index),
+            if command == Command.Download:
+                download_translations()
+            elif command == Command.Prepare:
+                prepare_project()
+            elif command == Command.Update:
+                update_translations()
+            elif command == Command.Generate:
+                generate_binaries()
+            elif command == Command.Create:
+                command, arguments = command_stack[command_stack.current_index]
+                create_translation(*arguments)
+        print u'Finished processing commands.'
+    else:
+        print u'No commands to process.'
 
 def main():
-    # start Main Class
+    global verbose_mode
-    Util = TranslationUtils()
-    
     # Set up command line options.
-    usage = u'''
+    usage = u'%prog [options]\nOptions are parsed in the order they are ' + \
-        This script handle the translation files for OpenLP.
+        u'listed below. If no options are given, "-dpug" will be used.\n\n' + \
-        Usage: %prog [options]
+        u'This script is used to manage OpenLP\'s translation files.'
-        If no option will be used, options "-d -p -u -g" will be set automatically
-        '''
     parser = OptionParser(usage=usage)
-    parser.add_option('-d', '--download-ts', action='store_true',
+    parser.add_option('-d', '--download-ts', dest='download',
-        dest='download', help='Load languages from Pootle Server')
+        action='store_true', help='download language files from Pootle')
-    parser.add_option('-c', '--create', metavar='lang',
+    parser.add_option('-c', '--create', dest=u'create', metavar='LANG',
-        help='creation of new translation file, Parameter: language (e.g. "en_GB"')
+        help='create a new translation file for language LANG, e.g. "en_GB"')
-    parser.add_option('-p', '--prepare', action='store_true', dest='prepare',
+    parser.add_option('-p', '--prepare', dest='prepare', action='store_true',
-        help='preparation (generate pro file)')
+        help='generate a project file, used to update the translations')
     parser.add_option('-u', '--update', action='store_true', dest='update',
-        help='update translation files')
+        help='update translation files (needs a project file)')
-    parser.add_option('-g', '--generate', action='store_true', dest='generate',
+    parser.add_option('-g', '--generate', dest='generate', action='store_true',
-        help='generate qm files')
+        help='compile .ts files into .qm files')
-    parser.add_option('-v', '--verbose', action='store_true', dest='verbose',
+    parser.add_option('-v', '--verbose', dest='verbose', action='store_true',
-        help='Give more informations while processing')
+        help='show extra information while processing translations')
-
     (options, args) = parser.parse_args()
+    # Create and populate the command stack
+    command_stack = CommandStack()
     if options.download:
-        Util.cmd_stack.append([Util.downloadTranslations])
+        command_stack.append(Command.Download)
     if options.create:
-        Util.cmd_stack.append([Util.creation, u'%s' % options.create])
+        command_stack.append(Command.Create, arguments=[options.create])
     if options.prepare:
-        Util.cmd_stack.append([Util.preparation])
+        command_stack.append(Command.Prepare)
     if options.update:
-        Util.cmd_stack.append([Util.update])
+        command_stack.append(Command.Update)
     if options.generate:
-        Util.cmd_stack.append([Util.generate])
+        command_stack.append(Command.Generate)
-    if options.verbose:
+    verbose_mode = options.verbose
-        Util.verbose = True
+    if not command_stack:
-
+        command_stack.append(Command.Download)
-    if len(Util.cmd_stack) == 0:
+        command_stack.append(Command.Prepare)
-        Util.cmd_stack.append([Util.downloadTranslations])
+        command_stack.append(Command.Update)
-        Util.cmd_stack.append([Util.preparation])
+        command_stack.append(Command.Generate)
-        Util.cmd_stack.append([Util.update])
+    # Process the commands
-        Util.cmd_stack.append([Util.generate])
+    process_stack(command_stack)
-
-    Util.stack_count = len(Util.cmd_stack)
-    Util.process_stack()
-    
-
 
 if __name__ == u'__main__':
     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()
+

scripts/windows-builder.py

@@ -31,6 +31,18 @@ Windows Build Script
 This script is used to build the Windows binary and the accompanying installer.
 For this script to work out of the box, it depends on a number of things:
 
+Python 2.6
+    This build script only works with Python 2.6.
+
+PyQt4
+    You should already have this installed, OpenLP doesn't work without it. The
+    version the script expects is the packaged one available from River Bank
+    Computing.
+
+PyEnchant
+    This script expects the precompiled, installable version of PyEnchant to be
+    installed. You can find this on the PyEnchant site.
+
 Inno Setup 5
     Inno Setup should be installed into "C:\%PROGRAMFILES%\Inno Setup 5"
 
@@ -41,9 +53,10 @@ UPX
     add that directory to your PATH environment variable.
 
 PyInstaller
-    PyInstaller should be a checkout of trunk, and in a directory called,
+    PyInstaller should be a checkout of revision 844 of trunk, and in a
-    "pyinstaller" on the same level as OpenLP's Bazaar shared repository
+    directory called, "pyinstaller" on the same level as OpenLP's Bazaar shared
-    directory.
+    repository directory. The revision is very important as there is currently
+    a major regression in HEAD.
 
     To install PyInstaller, first checkout trunk from Subversion. The easiest
     way is to install TortoiseSVN and then checkout the following URL to a
@@ -80,17 +93,32 @@ from subprocess import Popen, PIPE
 script_path = os.path.split(os.path.abspath(__file__))[0]
 branch_path = os.path.abspath(os.path.join(script_path, u'..'))
 source_path = os.path.join(branch_path, u'openlp')
+i18n_path = os.path.join(branch_path, u'resources', u'i18n')
+build_path = os.path.join(branch_path, u'build', u'pyi.win32', u'OpenLP')
 dist_path = os.path.join(branch_path, u'dist', u'OpenLP')
 pyinstaller_path = os.path.abspath(os.path.join(branch_path, u'..', u'..', u'pyinstaller'))
 innosetup_path = os.path.join(os.getenv(u'PROGRAMFILES'), 'Inno Setup 5')
 iss_path = os.path.join(branch_path, u'resources', u'innosetup')
+lrelease_path = u'C:\\Python26\\Lib\\site-packages\\PyQt4\\bin\\lrelease.exe'
+enchant_path = u'C:\\Python26\\Lib\\site-packages\\enchant'
 
+def clean_build_directories():
+    #if not os.path.exists(build_path)
+    for root, dirs, files in os.walk(build_path, topdown=False):
+        print root
+        for file in files:
+            os.remove(os.path.join(root, file))
+    #os.removedirs(build_path)
+    for root, dirs, files in os.walk(dist_path, topdown=False):
+        for file in files:
+            os.remove(os.path.join(root, file))
+    #os.removedirs(dist_path)
 
 def run_pyinstaller():
     print u'Running PyInstaller...'
     os.chdir(branch_path)
     pyinstaller = Popen((u'python', os.path.join(pyinstaller_path, u'Build.py'),
-        u'OpenLP.spec'))
+        u'-y', u'OpenLP.spec'))
     code = pyinstaller.wait()
     if code != 0:
         raise Exception(u'Error running PyInstaller Build.py')
@@ -120,6 +148,19 @@ def write_version_file():
     f.write(versionstring)
     f.close()
 
+def copy_enchant():
+    print u'Copying enchant/pyenchant...'
+    source = enchant_path
+    dest = os.path.join(dist_path, u'enchant')
+    for root, dirs, files in os.walk(source):
+        for filename in files:
+            if not filename.endswith(u'.pyc') and not filename.endswith(u'.pyo'):
+                dest_path = os.path.join(dest, root[len(source)+1:])
+                if not os.path.exists(dest_path):
+                    os.makedirs(dest_path)
+                copy(os.path.join(root, filename),
+                    os.path.join(dest_path, filename))
+
 def copy_plugins():
     print u'Copying plugins...'
     source = os.path.join(source_path, u'plugins')
@@ -138,6 +179,21 @@ def copy_windows_files():
     copy(os.path.join(iss_path, u'OpenLP.ico'), os.path.join(dist_path, u'OpenLP.ico'))
     copy(os.path.join(iss_path, u'LICENSE.txt'), os.path.join(dist_path, u'LICENSE.txt'))
 
+def compile_translations():
+    files = os.listdir(i18n_path)
+    if not os.path.exists(os.path.join(dist_path, u'i18n')):
+        os.makedirs(os.path.join(dist_path, u'i18n'))
+    for file in files:
+        if file.endswith(u'.ts'):
+            source_path = os.path.join(i18n_path, file)
+            dest_path = os.path.join(dist_path, u'i18n',
+                file.replace(u'.ts', u'.qm'))
+            lconvert = Popen(u'"%s" "%s" -qm "%s"' % (lrelease_path, \
+                source_path, dest_path))
+            code = lconvert.wait()
+            if code != 0:
+                print 'Error running lconvert on %s' % source_path
+
 def run_innosetup():
     print u'Running Inno Setup...'
     os.chdir(iss_path)
@@ -150,6 +206,8 @@ def run_innosetup():
         raise Exception(u'Error running Inno Setup')
 
 def main():
+    import sys
+    if len(sys.argv) > 1 and (sys.argv[1] == u'-v' or sys.argv[1] == u'--verbose'):
        print "Script path:", script_path
        print "Branch path:", branch_path
        print "Source path:", source_path
@@ -157,10 +215,13 @@ def main():
        print "PyInstaller path:", pyinstaller_path
        print "Inno Setup path:", innosetup_path
        print "ISS file path:", iss_path
+    #clean_build_directories()
     run_pyinstaller()
     write_version_file()
+    copy_enchant()
     copy_plugins()
     copy_windows_files()
+    compile_translations()
     run_innosetup()
     print "Done."