head762

copyright.txt

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp.pyw

@@ -7,8 +7,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -144,8 +144,9 @@ def resize_image(image, width, height):
         The image to resize.
     """
     preview = QtGui.QImage(image)
-    preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio,
+    if not preview.isNull():
-        QtCore.Qt.SmoothTransformation)
+        preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio,
+            QtCore.Qt.SmoothTransformation)
     realw = preview.width()
     realh = preview.height()
     # and move it to the centre of the preview space

openlp/core/lib/baselistwithdnd.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/dockwidget.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/eventreceiver.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/mediamanageritem.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -131,6 +131,7 @@ class MediaManagerItem(QtGui.QWidget):
         It provides a default set and the plugin is able to override
         the if required.
         """
+        self.hasImportIcon = False
         self.hasNewIcon = True
         self.hasEditIcon = True
         self.hasFileIcon = False
@@ -207,48 +208,54 @@ class MediaManagerItem(QtGui.QWidget):
 
     def addMiddleHeaderBar(self):
         # Create buttons for the toolbar
+        ## Import Button ##
+        if self.hasImportIcon:
+            self.addToolbarButton(
+                u'Import %s' % self.PluginNameShort,
+                u'%s %s' % (self.trUtf8('Import a'), self.PluginNameVisible),
+                u':/general/general_import.png', self.onImportClick)
         ## File Button ##
         if self.hasFileIcon:
             self.addToolbarButton(
                 u'Load %s' % self.PluginNameShort,
                 u'%s %s' % (self.trUtf8('Load a new'), self.PluginNameVisible),
-                u':/%s_load.png' % self.IconPath, self.onFileClick)
+                u':/general/general_open.png', self.onFileClick)
         ## New Button ##
         if self.hasNewIcon:
             self.addToolbarButton(
                 u'New %s' % self.PluginNameShort,
                 u'%s %s' % (self.trUtf8('Add a new'), self.PluginNameVisible),
-                u':/%s_new.png' % self.IconPath, self.onNewClick)
+                u':/general/general_new.png', self.onNewClick)
         ## Edit Button ##
         if self.hasEditIcon:
             self.addToolbarButton(
                 u'Edit %s' % self.PluginNameShort,
                 u'%s %s' % (self.trUtf8('Edit the selected'),
                     self.PluginNameVisible),
-                u':/%s_edit.png' % self.IconPath, self.onEditClick)
+                u':/general/general_edit.png', self.onEditClick)
         ## Delete Button ##
         if self.hasDeleteIcon:
             self.addToolbarButton(
                 u'Delete %s' % self.PluginNameShort,
                 self.trUtf8('Delete the selected item'),
-                u':/%s_delete.png' % self.IconPath, self.onDeleteClick)
+                u':/general/general_delete.png', self.onDeleteClick)
         ## Separator Line ##
         self.addToolbarSeparator()
         ## Preview ##
         self.addToolbarButton(
             u'Preview %s' % self.PluginNameShort,
             self.trUtf8('Preview the selected item'),
-            u':/system/system_preview.png', self.onPreviewClick)
+            u':/general/general_preview.png', self.onPreviewClick)
         ## Live  Button ##
         self.addToolbarButton(
             u'Go Live',
             self.trUtf8('Send the selected item live'),
-            u':/system/system_live.png', self.onLiveClick)
+            u':/general/general_live.png', self.onLiveClick)
         ## Add to service Button ##
         self.addToolbarButton(
             u'Add %s to Service' % self.PluginNameShort,
             self.trUtf8('Add the selected item(s) to the service'),
-            u':/system/system_add.png', self.onAddClick)
+            u':/general/general_add.png', self.onAddClick)
 
     def addListViewToToolBar(self):
         #Add the List widget
@@ -268,22 +275,22 @@ class MediaManagerItem(QtGui.QWidget):
         if self.hasEditIcon:
             self.ListView.addAction(
                 contextMenuAction(
-                    self.ListView, u':/%s_new.png' % self.IconPath,
+                    self.ListView, u':/general/general_edit.png',
                     u'%s %s' % (self.trUtf8('&Edit'), self.PluginNameVisible),
                     self.onEditClick))
             self.ListView.addAction(contextMenuSeparator(self.ListView))
         self.ListView.addAction(
             contextMenuAction(
-                self.ListView, u':/system/system_preview.png',
+                self.ListView, u':/general/general_preview.png',
                 u'%s %s' % (self.trUtf8('&Preview'), self.PluginNameVisible),
                 self.onPreviewClick))
         self.ListView.addAction(
             contextMenuAction(
-                self.ListView, u':/system/system_live.png',
+                self.ListView, u':/general/general_live.png',
                 self.trUtf8('&Show Live'), self.onLiveClick))
         self.ListView.addAction(
             contextMenuAction(
-                self.ListView, u':/system/system_add.png',
+                self.ListView, u':/general/general_add.png',
                 self.trUtf8('&Add to Service'), self.onAddClick))
         QtCore.QObject.connect(
             self.ListView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
@@ -313,7 +320,7 @@ class MediaManagerItem(QtGui.QWidget):
         files = QtGui.QFileDialog.getOpenFileNames(
             self, self.OnNewPrompt,
             self.parent.config.get_last_dir(), self.OnNewFileMasks)
-        log.info(u'New files(s)%s', unicode(files))
+        log.info(u'New files(s) %s', unicode(files))
         if files:
             self.loadList(files)
             dir, filename = os.path.split(unicode(files[0]))
@@ -353,8 +360,8 @@ class MediaManagerItem(QtGui.QWidget):
     def onPreviewClick(self):
         if not self.ListView.selectedIndexes() and not self.remoteTriggered:
             QtGui.QMessageBox.information(self,
-                self.trUtf8('No items selected...'),
+                self.trUtf8('No Items Selected'),
-                self.trUtf8('You must select one or more items'))
+                self.trUtf8('You must select one or more items.'))
         else:
             log.debug(self.PluginNameShort + u' Preview requested')
             service_item = self.buildServiceItem()
@@ -365,8 +372,8 @@ class MediaManagerItem(QtGui.QWidget):
     def onLiveClick(self):
         if not self.ListView.selectedIndexes():
             QtGui.QMessageBox.information(self,
-                self.trUtf8('No items selected...'),
+                self.trUtf8('No Items Selected'),
-                self.trUtf8('You must select one or more items'))
+                self.trUtf8('You must select one or more items.'))
         else:
             log.debug(self.PluginNameShort + u' Live requested')
             service_item = self.buildServiceItem()
@@ -377,8 +384,8 @@ class MediaManagerItem(QtGui.QWidget):
     def onAddClick(self):
         if not self.ListView.selectedIndexes() and not self.remoteTriggered:
             QtGui.QMessageBox.information(self,
-                self.trUtf8('No items selected...'),
+                self.trUtf8('No Items Selected'),
-                self.trUtf8('You must select one or more items'))
+                self.trUtf8('You must select one or more items.'))
         else:
             log.debug(self.PluginNameShort + u' Add requested')
             service_item = self.buildServiceItem()

openlp/core/lib/plugin.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/pluginconfig.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/pluginmanager.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/renderer.py

@@ -1,4 +1,4 @@
-    # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 
 ###############################################################################
@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/rendermanager.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/serviceitem.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/settingsmanager.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/settingstab.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/songxmlhandler.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/themexmlhandler.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/toolbar.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/lib/xmlrootclass.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/test/test_mediamanageritem.py

@@ -1,3 +1,28 @@
+# -*- 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, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# --------------------------------------------------------------------------- #
+# 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 logging
 import os
 import sys

openlp/core/test/test_plugin_manager.py

@@ -1,3 +1,28 @@
+# -*- 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, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# --------------------------------------------------------------------------- #
+# 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 logging
 import os
 import sys
@@ -46,4 +71,4 @@ if __name__ == "__main__":
     log.debug(u'List of plugins found:')
     for plugin in t.p.plugins:
         log.debug(u'Plugin %s, name=%s (version=%d)' %(unicode(plugin),
-	    plugin.name, plugin.version))
+        plugin.name, plugin.version))

openlp/core/test/test_render.py

@@ -1,20 +1,27 @@
-"""
+# -*- coding: utf-8 -*-
-OpenLP - Open Source Lyrics Projection
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-Copyright (c) 2008 Raoul Snyman
-Portions copyright (c) 2008 Martin Thompson, Tim Bentley
 
-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
+# OpenLP - Open Source Lyrics Projection                                      #
-Foundation; version 2 of the License.
+# --------------------------------------------------------------------------- #
-
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-
+# --------------------------------------------------------------------------- #
-You should have received a copy of the GNU General Public License along with
+# This program is free software; you can redistribute it and/or modify it     #
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# under the terms of the GNU General Public License as published by the Free  #
-Place, Suite 330, Boston, MA 02111-1307 USA
+# 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
 import os
@@ -135,13 +142,13 @@ class TestRender(TestRender_base):
 
     def test_longer(self):
         answer = self.renderer._render_single_line(
-	    u'Test line with more words than fit on one line',
+        u'Test line with more words than fit on one line',
-	    tlcorner = (10,10))
+        tlcorner = (10,10))
         assert(answer == (753,136))
 
     def test_even_longer(self):
         answer = self.renderer._render_single_line(
-	    u'Test line with more words than fit on either one or two lines',
+        u'Test line with more words than fit on either one or two lines',
             tlcorner = (10,10))
         assert(answer == (753,199))
     def test_lines(self):

openlp/core/test/test_render_theme.py

@@ -1,20 +1,27 @@
-"""
+# -*- coding: utf-8 -*-
-OpenLP - Open Source Lyrics Projection
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-Copyright (c) 2008 Raoul Snyman
-Portions copyright (c) 2008 Martin Thompson, Tim Bentley
 
-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
+# OpenLP - Open Source Lyrics Projection                                      #
-Foundation; version 2 of the License.
+# --------------------------------------------------------------------------- #
-
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-
+# --------------------------------------------------------------------------- #
-You should have received a copy of the GNU General Public License along with
+# This program is free software; you can redistribute it and/or modify it     #
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# under the terms of the GNU General Public License as published by the Free  #
-Place, Suite 330, Boston, MA 02111-1307 USA
+# 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
 import os
@@ -163,7 +170,7 @@ And drives away his fear.
         t = Theme(u'blank_theme.xml')
         t.BackgroundType = 2
         t.BackgroundParameter1 = os.path.join(u'data_for_tests',
-	        'treessmall.jpg')
+            'treessmall.jpg')
         t.BackgroundParameter2 = QtGui.QColor(0,0,64)
         t.BackgroundParameter3 = 0
         t.VerticalAlign = 2

openlp/core/theme/__init__.py

@@ -5,8 +5,9 @@
 # OpenLP - Open Source Lyrics Projection                                      #
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2010 Martin Thompson, Tim Bentley, Carsten      #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/theme/test/test_theme.py

@@ -1,3 +1,28 @@
+# -*- 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, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# --------------------------------------------------------------------------- #
+# 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 os
 import os.path
 import sys

openlp/core/theme/theme.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/aboutdialog.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -142,13 +142,17 @@ class Ui_AboutDialog(object):
             '    Michael "cocooncrash" Gorven\n'
             '    Scott "sguerrieri" Guerrieri\n'
             '    Raoul "superfly" Snyman\n'
-            '    Maikel Stuivenberg\n'
             '    Martin "mijiti" Thompson\n'
             '    Jon "Meths" Tibble\n'
+            '\n'
+            'Contributors\n'
+            '    Christian "crichter" Richter\n'
+            '    Maikel Stuivenberg\n'
             '    Carsten "catini" Tingaard\n'
             '\n'
             'Testers\n'
-            '    Wesley "wrst" Stout'
+            '    Wesley "wrst" Stout\n'
+            '    Philip "Phill" Ridout'
         ))
         self.AboutNotebook.setTabText(
             self.AboutNotebook.indexOf(self.CreditsTab),
@@ -158,8 +162,8 @@ class Ui_AboutDialog(object):
             'Snyman\n'
             'Portions copyright ' + u'\u00a9'.encode('utf8') + ' 2004-2009 '
             'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, '
-            'Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten '
+            'Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon '
-            'Tinggaard\n'
+            'Tibble, Carsten Tinggaard\n'
             '\n'
             'This program is free software; you can redistribute it and/or '
             'modify it under the terms of the GNU General Public License as '

openlp/core/ui/aboutform.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/amendthemedialog.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -116,7 +116,7 @@ class Ui_AmendThemeDialog(object):
         self.ImageLineEdit.setObjectName(u'ImageLineEdit')
         self.horizontalLayout_2.addWidget(self.ImageLineEdit)
         self.ImageToolButton = QtGui.QToolButton(self.ImageFilenameWidget)
-        icon1 = build_icon(u':/images/image_load.png')
+        icon1 = build_icon(u':/general/general_open.png')
         self.ImageToolButton.setIcon(icon1)
         self.ImageToolButton.setObjectName(u'ImageToolButton')
         self.horizontalLayout_2.addWidget(self.ImageToolButton)

openlp/core/ui/amendthemeform.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/generaltab.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/maindisplay.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/mainwindow.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/mediadockmanager.py

@@ -6,15 +6,15 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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 MERCHANdockILITY or       #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
 # more details.                                                               #
 #                                                                             #

openlp/core/ui/plugindialog.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/pluginform.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/screen.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -22,6 +22,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
+
 import logging
 
 log = logging.getLogger(__name__)

openlp/core/ui/serviceitemdialog.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/serviceitemform.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/servicemanager.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -114,13 +114,13 @@ class ServiceManager(QtGui.QWidget):
         # Create the top toolbar
         self.Toolbar = OpenLPToolbar(self)
         self.Toolbar.addToolbarButton(
-            self.trUtf8('New Service'), u':/services/service_new.png',
+            self.trUtf8('New Service'), u':/general/general_new.png',
             self.trUtf8('Create a new service'), self.onNewService)
         self.Toolbar.addToolbarButton(
-            self.trUtf8('Open Service'), u':/services/service_open.png',
+            self.trUtf8('Open Service'), u':/general/general_open.png',
             self.trUtf8('Load an existing service'), self.onLoadService)
         self.Toolbar.addToolbarButton(
-            self.trUtf8('Save Service'), u':/services/service_save.png',
+            self.trUtf8('Save Service'), u':/general/general_save.png',
             self.trUtf8('Save this service'), self.onSaveService)
         self.Toolbar.addSeparator()
         self.ThemeLabel = QtGui.QLabel(self.trUtf8('Theme:'),
@@ -171,7 +171,7 @@ class ServiceManager(QtGui.QWidget):
             self.trUtf8('Move to end'), self.onServiceEnd)
         self.OrderToolbar.addSeparator()
         self.OrderToolbar.addToolbarButton(
-            self.trUtf8('&Delete From Service'), u':/services/service_delete.png',
+            self.trUtf8('&Delete From Service'), u':/general/general_delete.png',
             self.trUtf8('Delete From Service'), self.onDeleteFromService)
         self.Layout.addWidget(self.OrderToolbar)
         # Connect up our signals and slots
@@ -201,17 +201,17 @@ class ServiceManager(QtGui.QWidget):
         #build the context menu
         self.menu = QtGui.QMenu()
         self.editAction = self.menu.addAction(self.trUtf8('&Edit Item'))
-        self.editAction.setIcon(build_icon(u':/services/service_edit.png'))
+        self.editAction.setIcon(build_icon(u':/general/general_edit.png'))
         self.notesAction = self.menu.addAction(self.trUtf8('&Notes'))
         self.notesAction.setIcon(build_icon(u':/services/service_notes.png'))
         self.deleteAction = self.menu.addAction(self.trUtf8('&Delete From Service'))
-        self.deleteAction.setIcon(build_icon(u':/services/service_delete.png'))
+        self.deleteAction.setIcon(build_icon(u':/general/general_delete.png'))
         self.sep1 = self.menu.addAction(u'')
         self.sep1.setSeparator(True)
         self.previewAction = self.menu.addAction(self.trUtf8('&Preview Verse'))
-        self.previewAction.setIcon(build_icon(u':/system/system_preview.png'))
+        self.previewAction.setIcon(build_icon(u':/general/general_preview.png'))
         self.liveAction = self.menu.addAction(self.trUtf8('&Live Verse'))
-        self.liveAction.setIcon(build_icon(u':/system/system_live.png'))
+        self.liveAction.setIcon(build_icon(u':/general/general_live.png'))
         self.sep2 = self.menu.addAction(u'')
         self.sep2.setSeparator(True)
         self.themeMenu = QtGui.QMenu(self.trUtf8(u'&Change Item Theme'))

openlp/core/ui/settingsdialog.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/settingsform.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/slidecontroller.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -177,11 +177,11 @@ class SlideController(QtGui.QWidget):
         if not self.isLive:
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.Toolbar.addToolbarButton(
-                u'Go Live', u':/system/system_live.png',
+                u'Go Live', u':/general/general_live.png',
                 self.trUtf8('Move to live'), self.onGoLive)
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.Toolbar.addToolbarButton(
-                u'Edit Song', u':/services/service_edit.png',
+                u'Edit Song', u':/general/general_edit.png',
                 self.trUtf8('Edit and re-preview Song'), self.onEditSong)
         if isLive:
             self.Toolbar.addToolbarSeparator(u'Loop Separator')

openlp/core/ui/splashscreen.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/ui/test/test_service_manager.py

@@ -1,20 +1,27 @@
-"""
+# -*- coding: utf-8 -*-
-OpenLP - Open Source Lyrics Projection
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-Copyright (c) 2008 Raoul Snyman
-Portions copyright (c) 2008 Martin Thompson, Tim Bentley
 
-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
+# OpenLP - Open Source Lyrics Projection                                      #
-Foundation; version 2 of the License.
+# --------------------------------------------------------------------------- #
-
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-
+# --------------------------------------------------------------------------- #
-You should have received a copy of the GNU General Public License along with
+# This program is free software; you can redistribute it and/or modify it     #
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# under the terms of the GNU General Public License as published by the Free  #
-Place, Suite 330, Boston, MA 02111-1307 USA
+# 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
 import os

openlp/core/ui/thememanager.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -59,14 +59,14 @@ class ThemeManager(QtGui.QWidget):
             self.trUtf8('Edit Theme'), u':/themes/theme_edit.png',
             self.trUtf8('Edit a theme'), self.onEditTheme)
         self.Toolbar.addToolbarButton(
-            self.trUtf8('Delete Theme'), u':/themes/theme_delete.png',
+            self.trUtf8('Delete Theme'), u':/general/general_delete.png',
             self.trUtf8('Delete a theme'), self.onDeleteTheme)
         self.Toolbar.addSeparator()
         self.Toolbar.addToolbarButton(
-            self.trUtf8('Import Theme'), u':/themes/theme_import.png',
+            self.trUtf8('Import Theme'), u':/general/general_import.png',
             self.trUtf8('Import a theme'), self.onImportTheme)
         self.Toolbar.addToolbarButton(
-            self.trUtf8('Export Theme'), u':/themes/theme_export.png',
+            self.trUtf8('Export Theme'), u':/general/general_export.png',
             self.trUtf8('Export a theme'), self.onExportTheme)
         self.ThemeWidget = QtGui.QWidgetAction(self.Toolbar)
         self.Layout.addWidget(self.Toolbar)
@@ -82,17 +82,17 @@ class ThemeManager(QtGui.QWidget):
             contextMenuSeparator(self.ThemeListWidget))
         self.ThemeListWidget.addAction(
             contextMenuAction(self.ThemeListWidget,
-                u':/themes/theme_delete.png',
+                u':/general/general_delete.png',
                 self.trUtf8('Delete theme'),
             self.onDeleteTheme))
         self.ThemeListWidget.addAction(
             contextMenuAction(self.ThemeListWidget,
-                u':/themes/theme_export.png',
+                u':/general/general_export.png',
                 self.trUtf8('Make Global'),
             self.changeGlobalFromScreen))
         self.ThemeListWidget.addAction(
             contextMenuAction(self.ThemeListWidget,
-                u':/themes/theme_export.png',
+                u':/general/general_export.png',
                 self.trUtf8('Export theme'),
             self.onExportTheme))
         self.ThemeListWidget.addAction(

openlp/core/ui/themestab.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -159,9 +159,10 @@ class ThemesTab(SettingsTab):
         image = self.parent.ThemeManagerContents.getPreviewImage(
             self.global_theme)
         preview = QtGui.QPixmap(unicode(image))
-        display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio,
+        if not preview.isNull():
-            QtCore.Qt.SmoothTransformation)
+            preview = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio,
-        self.DefaultListView.setPixmap(display)
+                QtCore.Qt.SmoothTransformation)
+        self.DefaultListView.setPixmap(preview)
 
     def updateThemeList(self, theme_list):
         """
@@ -184,6 +185,7 @@ class ThemesTab(SettingsTab):
             image = self.parent.ThemeManagerContents.getPreviewImage(
                 self.global_theme)
             preview = QtGui.QPixmap(unicode(image))
-            display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio,
+            if not preview.isNull():
-                QtCore.Qt.SmoothTransformation)
+                preview = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio,
-            self.DefaultListView.setPixmap(display)
+                    QtCore.Qt.SmoothTransformation)
+            self.DefaultListView.setPixmap(preview)

openlp/core/utils/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -44,6 +44,12 @@ class AppLocation(object):
 
     @staticmethod
     def get_directory(dir_type):
+        """
+        Return the appropriate directory according to the directory type.
+
+        ``dir_type``
+            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])
         elif dir_type == AppLocation.ConfigDir:
@@ -89,6 +95,16 @@ class AppLocation(object):
 
 
 def check_latest_version(config, current_version):
+    """
+    Check the latest version of OpenLP against the version file on the OpenLP
+    site.
+
+    ``config``
+        The OpenLP config object.
+
+    ``current_version``
+        The current version of OpenLP.
+    """
     version_string = current_version
     #set to prod in the distribution confif file.
     last_test = config.get_config(u'last version test', datetime.now().date())
@@ -107,6 +123,18 @@ def check_latest_version(config, current_version):
                 log.exception(u'Reason for failure: %s', e.reason)
     return version_string
 
+def variant_to_unicode(variant):
+    """
+    Converts a QVariant to a unicode string.
+
+    ``variant``
+        The QVariant instance to convert to unicode.
+    """
+    string = variant.toString()
+    if not isinstance(string, unicode):
+        string = unicode(string, u'utf8')
+    return string
+
 from registry import Registry
 from confighelper import ConfigHelper
 

openlp/core/utils/confighelper.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/core/utils/registry.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/migration/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/migration/display.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/migration/migratebibles.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -23,10 +23,204 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
+import os
+import sys
+import sqlite3
+
+from sqlalchemy import  *
+from sqlalchemy import create_engine
+from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
+
+from openlp.core.lib import PluginConfig
+from openlp.plugins.bibles.lib.models import *
+    
+class BaseModel(object):
+    """
+    BaseModel provides a base object with a set of generic functions
+    """
+
+    @classmethod
+    def populate(cls, **kwargs):
+        """
+        Creates an instance of a class and populates it, returning the instance
+        """
+        me = cls()
+        keys = kwargs.keys()
+        for key in keys:
+            me.__setattr__(key, kwargs[key])
+        return me
+
+class TBibleMeta(BaseModel):
+    """
+    Bible Meta Data
+    """
+    pass
+
+class TTestament(BaseModel):
+    """
+    Bible Testaments
+    """
+    pass
+
+class TBook(BaseModel):
+    """
+    Song model
+    """
+    pass
+
+class TVerse(BaseModel):
+    """
+    Topic model
+    """
+    pass
+    
+temp_meta_table = Table(u'metadata_temp', metadata,
+    Column(u'key', types.Unicode(255), primary_key=True),
+    Column(u'value', types.Unicode(255)),
+)
+temp_testament_table = Table(u'testament_temp', metadata,
+    Column(u'id', types.Integer, primary_key=True),
+    Column(u'name', types.Unicode(30)),
+)
+temp_book_table = Table(u'book_temp', metadata,
+    Column(u'id', types.Integer, primary_key=True),
+    Column(u'testament_id', types.Integer),
+    Column(u'name', types.Unicode(30)),
+    Column(u'abbreviation', types.Unicode(5)),
+)
+temp_verse_table = Table(u'verse_temp', metadata,
+    Column(u'id', types.Integer, primary_key=True),
+    Column(u'book_id', types.Integer),
+    Column(u'chapter', types.Integer),
+    Column(u'verse', types.Integer),
+    Column(u'text', types.UnicodeText),
+)
+
+mapper(TBibleMeta, temp_meta_table)
+mapper(TTestament, temp_testament_table)
+mapper(TBook, temp_book_table)
+mapper(TVerse, temp_verse_table)
+
+def init_models(url):
+    engine = create_engine(url)
+    metadata.bind = engine
+    session = scoped_session(sessionmaker(autoflush=False,
+        autocommit=False, bind=engine))
+    return session
+
 class MigrateBibles():
     def __init__(self, display):
         self.display = display
+        self.config = PluginConfig(u'Bibles')
+        self.data_path = self.config.get_data_path()
+        self.database_files = self.config.get_files(u'sqlite')
+        print self.database_files
+
+    def progress(self, text):
+        print text
+        self.display.output(text)
 
     def process(self):
-        self.display.output(u'Bible process started')
+        self.progress(u'Bibles processing started')
-        self.display.output(u'Bible process finished')
+        for f in self.database_files:
+            self.v_1_9_0(f)
+        self.progress(u'Bibles processing finished')
+
+    def v_1_9_0(self, database):
+        self.progress(u'Migration 1.9.0 Started for ' + database)
+        self._v1_9_0_old(database)
+        self._v1_9_0_new(database)
+        self._v1_9_0_cleanup(database)
+        self.progress(u'Migration 1.9.0 Finished for ' + database)
+
+    def _v1_9_0_old(self, database):
+        self.progress(u'Rename Tables ' + database)
+        conn = sqlite3.connect(os.path.join(self.data_path, database))
+        conn.execute(u'alter table book rename to book_temp;')
+        conn.commit()
+        conn.execute(u'alter table testament rename to testament_temp;')
+        conn.commit()
+        conn.execute(u'alter table verse rename to verse_temp;')
+        conn.commit()
+        conn.execute(u'alter table metadata rename to metadata_temp;')
+        conn.commit()
+
+    def _v1_9_0_new(self, database):
+        self.progress(u'Create new Tables ' + database)
+        self.db_url = u'sqlite:///' + self.data_path + u'/' + database 
+        print self.db_url
+        self.session = init_models(self.db_url)
+        metadata.create_all(checkfirst=True)
+        self.progress(u'Create testament table')
+        results = self.session.query(TTestament).order_by(TTestament.id).all()
+        for testament_temp in results:
+            testament = Testament()
+            testament.id = testament_temp.id
+            testament.name = testament_temp.name
+            try:
+                self.session.add(testament)
+                self.session.commit()
+            except:
+                self.session.rollback()
+                print u'Error thrown = ', sys.exc_info()[1]
+        self.progress(u'Create book table')
+        results = self.session.query(TBook).order_by(TBook.id).all()
+        for book_temp in results:
+            book = Book()
+            book.id = book_temp.id
+            book.testament_id = book_temp.testament_id
+            book.name = book_temp.name
+            book.abbreviation = book_temp.abbreviation
+            try:
+                self.session.add(book)
+                self.session.commit()
+            except:
+                self.session.rollback()
+                print u'Error thrown = ', sys.exc_info()[1]
+        self.progress(u'Create verse table')
+        results = self.session.query(TVerse).order_by(TVerse.id).all()
+        for verse_temp in results:
+            verse = Verse()
+            verse.id = verse_temp.id
+            verse.book_id = verse_temp.book_id
+            verse.chapter = verse_temp.chapter
+            verse.verse = verse_temp.verse
+            verse.text = verse_temp.text
+            try:
+                self.session.add(verse)
+            except:
+                self.session.rollback()
+                print u'Error thrown = ', sys.exc_info()[1]
+        try:
+            self.session.commit()
+        except:
+            self.session.rollback()
+            print u'Error thrown = ', sys.exc_info()[1]
+        self.progress(u'Create metadata table')
+        results = self.session.query(TBibleMeta).order_by(TBibleMeta.key).all()
+        for biblemeta_temp in results:
+            biblemeta = BibleMeta()
+            biblemeta.key = biblemeta_temp.key
+            biblemeta.value = biblemeta_temp.value
+            try:
+                self.session.add(biblemeta)
+                self.session.commit()
+            except:
+                self.session.rollback()
+                print u'Error thrown = ', sys.exc_info()[1]
+
+    def _v1_9_0_cleanup(self, database):
+        self.progress(u'Update Internal Data ' + database)
+        conn = sqlite3.connect(os.path.join(self.data_path, database))
+        conn.commit()
+        conn.execute(u'drop table book_temp;')
+        conn.commit()
+        conn.execute(u'drop table testament_temp;')
+        conn.commit()
+        conn.execute(u'drop table verse_temp;')
+        conn.commit()
+        conn.execute(u'drop table metadata_temp;')
+        conn.commit()
+        conn.execute(u'vacuum;')
+        conn.commit()
+

openlp/migration/migratefiles.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/migration/migratesongs.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/alertsplugin.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/forms/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/forms/alertdialog.py

@@ -1,11 +1,27 @@
 # -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 
-# Form implementation generated from reading ui file 'alertform.ui'
+###############################################################################
-#
+# OpenLP - Open Source Lyrics Projection                                      #
-# Created: Sat Feb 13 08:19:51 2010
+# --------------------------------------------------------------------------- #
-#      by: PyQt4 UI code generator 4.6.2
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
-#
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# WARNING! All changes made in this file will be lost!
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# --------------------------------------------------------------------------- #
+# 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                          #
+###############################################################################
 
 from PyQt4 import QtCore, QtGui
 

openlp/plugins/alerts/forms/alerteditdialog.py

@@ -1,11 +1,27 @@
 # -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 
-# Form implementation generated from reading ui file 'alerteditdialog.ui'
+###############################################################################
-#
+# OpenLP - Open Source Lyrics Projection                                      #
-# Created: Sun Feb 14 16:45:10 2010
+# --------------------------------------------------------------------------- #
-#      by: PyQt4 UI code generator 4.6.2
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
-#
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# WARNING! All changes made in this file will be lost!
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# --------------------------------------------------------------------------- #
+# 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                          #
+###############################################################################
 
 from PyQt4 import QtCore, QtGui
 

openlp/plugins/alerts/forms/alerteditform.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/forms/alertform.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/forms/alertstab.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/lib/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -22,5 +22,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
+
 from alertsmanager import AlertsManager
 from manager import DBManager

openlp/plugins/alerts/lib/alertsmanager.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/lib/classes.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/lib/manager.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/lib/meta.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/lib/models.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/alerts/lib/tables.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/bibles/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/bibles/bibleplugin.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/bibles/forms/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/bibles/forms/bibleimportwizard.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -104,7 +104,7 @@ class Ui_BibleImportWizard(object):
         self.OsisFileButton = QtGui.QToolButton(self.OsisPage)
         self.OsisFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'),
+        icon.addPixmap(QtGui.QPixmap(u':/general/general_open.png'),
             QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.OsisFileButton.setIcon(icon)
         self.OsisFileButton.setObjectName(u'OsisFileButton')

openlp/plugins/bibles/forms/importwizardform.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -32,7 +32,7 @@ from PyQt4 import QtCore, QtGui
 
 from bibleimportwizard import Ui_BibleImportWizard
 from openlp.core.lib import Receiver
-from openlp.core.utils import AppLocation
+from openlp.core.utils import AppLocation, variant_to_unicode
 from openlp.plugins.bibles.lib.manager import BibleFormat
 
 log = logging.getLogger(__name__)
@@ -60,9 +60,21 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
     log.info(u'BibleImportForm loaded')
 
     def __init__(self, parent, config, manager, bibleplugin):
-        '''
+        """
-        Constructor
+        Instantiate the wizard, and run any extra setup we need to.
-        '''
+
+        ``parent``
+            The QWidget-derived parent of the wizard.
+
+        ``config``
+            The configuration object for storing and retrieving settings.
+
+        ``manager``
+            The Bible manager.
+
+        ``bibleplugin``
+            The Bible plugin.
+        """
         QtGui.QWizard.__init__(self, parent)
         self.setupUi(self)
         self.registerFields()
@@ -97,10 +109,16 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
             self.onCurrentIdChanged)
 
     def exec_(self):
+        """
+        Run the wizard.
+        """
         self.setDefaults()
         return QtGui.QWizard.exec_(self)
 
     def validateCurrentPage(self):
+        """
+        Validate the current page before moving on to the next page.
+        """
         if self.currentId() == 0:
             # Welcome page
             return True
@@ -144,7 +162,9 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
             return True
         elif self.currentId() == 2:
             # License details
-            if self.field(u'license_version').toString() == u'':
+            license_version = variant_to_unicode(self.field(u'license_version'))
+            license_copyright = variant_to_unicode(self.field(u'license_copyright'))
+            if license_version == u'':
                 QtGui.QMessageBox.critical(self,
                     self.trUtf8('Empty Version Name'),
                     self.trUtf8('You need to specify a version name for your '
@@ -152,7 +172,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                 self.VersionNameEdit.setFocus()
                 return False
-            elif self.field(u'license_copyright').toString() == u'':
+            elif license_copyright == u'':
                 QtGui.QMessageBox.critical(self,
                     self.trUtf8('Empty Copyright'),
                     self.trUtf8('You need to set a copyright for your Bible! '
@@ -161,8 +181,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                 self.CopyrightEdit.setFocus()
                 return False
-            elif self.manager.exists(
+            elif self.manager.exists(license_version):
-                     self.field(u'license_version').toString()):
                 QtGui.QMessageBox.critical(self,
                     self.trUtf8('Bible Exists'),
                     self.trUtf8('This Bible already exists! Please import '
@@ -176,27 +195,49 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
             return True
 
     def onLocationComboBoxChanged(self, index):
+        """
+        Setup the list of Bibles when you select a different source on the web
+        download page.
+
+        ``index``
+            The index of the combo box.
+        """
         self.BibleComboBox.clear()
-        for bible, abbreviation in self.web_bible_list[index].iteritems():
+        for bible in self.web_bible_list[index].keys():
             self.BibleComboBox.addItem(unicode(self.trUtf8(bible)))
 
     def onOsisFileButtonClicked(self):
-        self.getFileName(self.trUtf8('Open OSIS file'),
+        """
+        Show the file open dialog for the OSIS file.
+        """
+        self.getFileName(self.trUtf8('Open OSIS File'),
             self.OSISLocationEdit)
 
     def onBooksFileButtonClicked(self):
-        self.getFileName(self.trUtf8('Open Books CSV file'),
+        """
+        Show the file open dialog for the books CSV file.
+        """
+        self.getFileName(self.trUtf8('Open Books CSV File'),
             self.BooksLocationEdit)
 
     def onCsvVersesFileButtonClicked(self):
-        self.getFileName(self.trUtf8('Open Verses CSV file'),
+        """
+        Show the file open dialog for the verses CSV file.
+        """
+        self.getFileName(self.trUtf8('Open Verses CSV File'),
             self.CsvVerseLocationEdit)
 
     def onOpenSongBrowseButtonClicked(self):
+        """
+        Show the file open dialog for the OpenSong file.
+        """
         self.getFileName(self.trUtf8('Open OpenSong Bible'),
             self.OpenSongFileEdit)
 
     def onCancelButtonClicked(self, checked):
+        """
+        Stop the import on pressing the cancel button.
+        """
         log.debug('Cancel button pressed!')
         if self.currentId() == 3:
             Receiver.send_message(u'openlpstopimport')
@@ -270,7 +311,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
             books_reader = csv.reader(books_file, dialect)
             for line in books_reader:
                 self.web_bible_list[DownloadLocation.Crosswalk][line[0]] = \
-                    unicode(line[1], u'utf-8').strip()
+                    unicode(line[1], u'utf8').strip()
         except:
             log.exception(u'Crosswalk resources missing')
         finally:
@@ -315,25 +356,28 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
 
     def performImport(self):
         bible_type = self.field(u'source_format').toInt()[0]
+        license_version = variant_to_unicode(self.field(u'license_version'))
+        license_copyright = variant_to_unicode(self.field(u'license_copyright'))
+        license_permission = variant_to_unicode(self.field(u'license_permission'))
         importer = None
         if bible_type == BibleFormat.OSIS:
             # Import an OSIS bible
             importer = self.manager.import_bible(BibleFormat.OSIS,
-                name=unicode(self.field(u'license_version').toString()),
+                name=license_version,
-                filename=unicode(self.field(u'osis_location').toString())
+                filename=variant_to_unicode(self.field(u'osis_location'))
             )
         elif bible_type == BibleFormat.CSV:
             # Import a CSV bible
             importer = self.manager.import_bible(BibleFormat.CSV,
-                name=unicode(self.field(u'license_version').toString()),
+                name=license_version,
-                booksfile=self.field(u'csv_booksfile').toString(),
+                booksfile=variant_to_unicode(self.field(u'csv_booksfile')),
-                versefile=self.field(u'csv_versefile').toString()
+                versefile=variant_to_unicode(self.field(u'csv_versefile'))
             )
         elif bible_type == BibleFormat.OpenSong:
             # Import an OpenSong bible
             importer = self.manager.import_bible(BibleFormat.OpenSong,
-                name=unicode(self.field(u'license_version').toString()),
+                name=license_version,
-                filename=self.field(u'opensong_file').toString()
+                filename=variant_to_unicode(self.field(u'opensong_file'))
             )
         elif bible_type == BibleFormat.WebDownload:
             # Import a bible from the web
@@ -344,23 +388,20 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                     unicode(self.BibleComboBox.currentText(), u'utf8')]
             elif download_location == DownloadLocation.BibleGateway:
                 bible = self.web_bible_list[DownloadLocation.BibleGateway][
-                    self.BibleComboBox.currentText()]
+                    unicode(self.BibleComboBox.currentText(), u'utf8')]
-            importer = self.manager.import_bible(BibleFormat.WebDownload,
+            importer = self.manager.import_bible(
-                name=unicode(self.field(u'license_version').toString(), u'utf8'),
+                BibleFormat.WebDownload,
+                name=license_version,
                 download_source=DownloadLocation.get_name(download_location),
                 download_name=bible,
-                proxy_server=unicode(self.field(u'proxy_server').toString(), u'utf8'),
+                proxy_server=variant_to_unicode(self.field(u'proxy_server')),
-                proxy_username=unicode(self.field(u'proxy_username').toString(), u'utf8'),
+                proxy_username=variant_to_unicode(self.field(u'proxy_username')),
-                proxy_password=unicode(self.field(u'proxy_password').toString(), u'utf8')
+                proxy_password=variant_to_unicode(self.field(u'proxy_password'))
             )
         success = importer.do_import()
         if success:
-            self.manager.save_meta_data(
+            self.manager.save_meta_data(license_version, license_version,
-                unicode(self.field(u'license_version').toString()),
+                license_copyright, license_permission)
-                unicode(self.field(u'license_version').toString()),
-                unicode(self.field(u'license_copyright').toString()),
-                unicode(self.field(u'license_permission').toString())
-            )
             self.manager.reload_bibles()
             self.ImportProgressLabel.setText(self.trUtf8('Finished import.'))
         else:

openlp/plugins/bibles/lib/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/bibles/lib/biblestab.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/bibles/lib/common.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/bibles/lib/csvbible.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/bibles/lib/db.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/bibles/lib/http.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -39,10 +39,19 @@ from openlp.plugins.bibles.lib.models import Book
 log = logging.getLogger(__name__)
 
 class HTTPBooks(object):
+    """
+    A wrapper class around a small SQLite database which contains the books,
+    chapter counts and verse counts for the web download Bibles. This class
+    contains a singleton "cursor" so that only one connection to the SQLite
+    database is ever used.
+    """
     cursor = None
 
     @staticmethod
     def get_cursor():
+        """
+        Return the cursor object. Instantiate one if it doesn't exist yet.
+        """
         if HTTPBooks.cursor is None:
             filepath = os.path.join(
                 AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
@@ -53,12 +62,24 @@ class HTTPBooks(object):
 
     @staticmethod
     def run_sql(query, parameters=()):
+        """
+        Run an SQL query on the database, returning the results.
+
+        ``query``
+            The actual SQL query to run.
+
+        ``parameters``
+            Any variable parameters to add to the query.
+        """
         cursor = HTTPBooks.get_cursor()
         cursor.execute(query, parameters)
         return cursor.fetchall()
 
     @staticmethod
     def get_books():
+        """
+        Return a list of all the books of the Bible.
+        """
         books = HTTPBooks.run_sql(u'SELECT id, testament_id, name, '
                 u'abbreviation, chapters FROM books ORDER BY id')
         book_list = []
@@ -74,6 +95,12 @@ class HTTPBooks(object):
 
     @staticmethod
     def get_book(name):
+        """
+        Return a book by name or abbreviation.
+
+        ``name``
+            The name or abbreviation of the book.
+        """
         if not isinstance(name, unicode):
             name = unicode(name)
         books = HTTPBooks.run_sql(u'SELECT id, testament_id, name, '
@@ -92,6 +119,15 @@ class HTTPBooks(object):
 
     @staticmethod
     def get_chapter(name, chapter):
+        """
+        Return the chapter details for a specific chapter of a book.
+
+        ``name``
+            The name or abbreviation of a book.
+
+        ``chapter``
+            The chapter number.
+        """
         if not isinstance(name, int):
             chapter = int(chapter)
         book = HTTPBooks.get_book(name)
@@ -109,6 +145,12 @@ class HTTPBooks(object):
 
     @staticmethod
     def get_chapter_count(book):
+        """
+        Return the number of chapters in a book.
+
+        ``book``
+            The name or abbreviation of the book.
+        """
         details = HTTPBooks.get_book(book)
         if details:
             return details[u'chapters']
@@ -116,6 +158,15 @@ class HTTPBooks(object):
 
     @staticmethod
     def get_verse_count(book, chapter):
+        """
+        Return the number of verses in a chapter.
+
+        ``book``
+            The name or abbreviation of the book.
+
+        ``chapter``
+            The number of the chapter.
+        """
         details = HTTPBooks.get_chapter(book, chapter)
         if details:
             return details[u'verses']
@@ -123,7 +174,9 @@ class HTTPBooks(object):
 
 
 class BGExtract(BibleCommon):
-    log.info(u'%s BGExtract loaded', __name__)
+    """
+    Extract verses from BibleGateway
+    """
 
     def __init__(self, proxyurl=None):
         log.debug(u'init %s', proxyurl)
@@ -133,7 +186,7 @@ class BGExtract(BibleCommon):
         """
         Access and decode bibles via the BibleGateway website
 
-        ``Version``
+        ``version``
             The version of the bible like 31 for New International version
 
         ``bookname``
@@ -196,8 +249,10 @@ class BGExtract(BibleCommon):
                 verse_list[verse_number] = u''
                 continue
             if isinstance(verse, NavigableString):
+                if not isinstance(verse, unicode):
+                    verse = unicode(verse, u'utf8')
                 verse_list[verse_number] = verse_list[verse_number] + \
-                    unescape(unicode(verse, u'utf-8').replace(u' ', u' '))
+                    unescape(verse.replace(u' ', u' '))
         # Delete the "0" element, since we don't need it, it's just there for
         # some stupid initial whitespace, courtesy of Bible Gateway.
         del verse_list[0]
@@ -205,14 +260,15 @@ class BGExtract(BibleCommon):
         return SearchResults(bookname, chapter, verse_list)
 
 class CWExtract(BibleCommon):
-    log.info(u'%s CWExtract loaded', __name__)
+    """
+    Extract verses from CrossWalk/BibleStudyTools
+    """
 
     def __init__(self, proxyurl=None):
         log.debug(u'init %s', proxyurl)
         self.proxyurl = proxyurl
 
     def get_bible_chapter(self, version, bookname, chapter):
-        log.debug(u'%s %s, %s, %s', __name__, version, bookname, chapter)
         """
         Access and decode bibles via the Crosswalk website
 
@@ -227,9 +283,9 @@ class CWExtract(BibleCommon):
         """
         log.debug(u'get_bible_chapter %s,%s,%s',
             version, bookname, chapter)
-        bookname = bookname.replace(u' ', u'')
+        urlbookname = bookname.replace(u' ', u'-')
         chapter_url = u'http://www.biblestudytools.com/%s/%s/%s.html' % \
-            (version, bookname.lower(), chapter)
+            (version, urlbookname.lower(), chapter)
         log.debug(u'URL: %s', chapter_url)
         page = urllib2.urlopen(chapter_url)
         if not page:
@@ -287,6 +343,10 @@ class HTTPBible(BibleDB):
             self.proxy_password = None
 
     def do_import(self):
+        """
+        Run the import. This method overrides the parent class method. Returns
+        ``True`` on success, ``False`` on failure.
+        """
         self.wizard.ImportProgressBar.setMaximum(2)
         self.wizard.incrementProgressBar('Registering bible...')
         self.create_meta(u'download source', self.download_source)
@@ -370,17 +430,43 @@ class HTTPBible(BibleDB):
             return None
 
     def get_books(self):
+        """
+        Return the list of books.
+        """
         return [Book.populate(name=book['name']) for book in HTTPBooks.get_books()]
 
     def lookup_book(self, book):
+        """
+        Look up the name of a book.
+        """
         return HTTPBooks.get_book(book)
 
     def get_chapter_count(self, book):
+        """
+        Return the number of chapters in a particular book.
+        """
         return HTTPBooks.get_chapter_count(book)
 
     def get_verse_count(self, book, chapter):
+        """
+        Return the number of verses for the specified chapter and book.
+
+        ``book``
+            The name of the book.
+
+        ``chapter``
+            The chapter whose verses are being counted.
+        """
         return HTTPBooks.get_verse_count(book, chapter)
 
     def set_proxy_server(self, server):
+        """
+        Sets the proxy server.
+
+        **Note: This is not actually used.**
+
+        ``server``
+            The hostname or IP address of the proxy server.
+        """
         self.proxy_server = server
 

openlp/plugins/bibles/lib/manager.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -60,6 +60,9 @@ class BibleFormat(object):
     def get_class(id):
         """
         Return the appropriate imeplementation class.
+
+        ``id``
+            The Bible format.
         """
         if id == BibleFormat.OSIS:
             return OSISBible
@@ -74,6 +77,9 @@ class BibleFormat(object):
 
     @staticmethod
     def list():
+        """
+        Return a list of the supported Bible formats.
+        """
         return [
             BibleFormat.OSIS,
             BibleFormat.CSV,
@@ -247,7 +253,7 @@ class BibleManager(object):
         """
         if not isinstance(name, unicode):
             name = unicode(name)
-        for bible, db_object in self.db_cache.iteritems():
+        for bible in self.db_cache.keys():
             log.debug(u'Bible from cache in is_new_bible %s', bible)
             if not isinstance(bible, unicode):
                 bible = unicode(bible)

openlp/plugins/bibles/lib/mediaitem.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -76,6 +76,8 @@ class BibleMediaItem(MediaManagerItem):
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)
+        self.hasImportIcon = True
+        self.hasNewIcon = False
         self.hasEditIcon = False
         self.hasDeleteIcon = False
 
@@ -373,7 +375,7 @@ class BibleMediaItem(MediaManagerItem):
             unicode(self.AdvancedBookComboBox.currentText()),
             self.AdvancedBookComboBox.itemData(item).toInt()[0])
 
-    def onNewClick(self):
+    def onImportClick(self):
         self.bibleimportform = ImportWizardForm(self, self.parent.config,
             self.parent.manager, self.parent)
         self.bibleimportform.exec_()

openlp/plugins/bibles/lib/models.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/bibles/lib/opensong.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -63,7 +63,8 @@ class OpenSongBible(BibleDB):
         Loads a Bible from file.
         """
         log.debug(u'Starting OpenSong import from "%s"' % self.filename)
-        self.filename = unicode(self.filename, u'utf-8')
+        if not isinstance(self.filename, unicode):
+            self.filename = unicode(self.filename, u'utf8')
         self.wizard.incrementProgressBar(u'Preparing for import...')
         file = None
         success = True

openlp/plugins/bibles/lib/osis.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -65,6 +65,7 @@ class OSISBible(BibleDB):
         self.l_regex = re.compile(r'<l (.*?)>')
         self.w_regex = re.compile(r'<w (.*?)>')
         self.q_regex = re.compile(r'<q (.*?)>')
+        self.trans_regex = re.compile(r'<transChange(.*?)>(.*?)</transChange>')
         self.spaces_regex = re.compile(r'([ ]{2,})')
         self.books = {}
         filepath = os.path.join(
@@ -159,10 +160,11 @@ class OSISBible(BibleDB):
                     verse_text = self.l_regex.sub(u'', verse_text)
                     verse_text = self.w_regex.sub(u'', verse_text)
                     verse_text = self.q_regex.sub(u'', verse_text)
+                    verse_text = self.trans_regex.sub(u'', verse_text)
                     verse_text = verse_text.replace(u'</lb>', u'')\
                         .replace(u'</l>', u'').replace(u'<lg>', u'')\
                         .replace(u'</lg>', u'').replace(u'</q>', u'')\
-                        .replace(u'</div>', u'')
+                        .replace(u'</div>', u'').replace(u'</w>',  u'')
                     verse_text = self.spaces_regex.sub(u' ', verse_text)
                     self.create_verse(db_book.id, chapter, verse, verse_text)
                     Receiver.send_message(u'process_events')

openlp/plugins/bibles/test/__init__.py

@@ -0,0 +1,24 @@
+# -*- 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, Christian Richter, Maikel Stuivenberg, Martin      #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
+# --------------------------------------------------------------------------- #
+# 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                          #
+###############################################################################

openlp/plugins/bibles/test/test_bibleManager.py

@@ -1,20 +1,27 @@
-"""
+# -*- coding: utf-8 -*-
-OpenLP - Open Source Lyrics Projection
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-Copyright (c) 2008 Raoul Snyman
-Portions copyright (c) 2008 Martin Thompson, Tim Bentley
 
-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
+# OpenLP - Open Source Lyrics Projection                                      #
-Foundation; version 2 of the License.
+# --------------------------------------------------------------------------- #
-
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-
+# --------------------------------------------------------------------------- #
-You should have received a copy of the GNU General Public License along with
+# This program is free software; you can redistribute it and/or modify it     #
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# under the terms of the GNU General Public License as published by the Free  #
-Place, Suite 330, Boston, MA 02111-1307 USA
+# 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 logging
 import os
@@ -64,7 +71,7 @@ class TestBibleManager:
         self.bm.registerHTTPBible(u'asv', u'Crosswalk', u'', u'', u'')
         self.bm.registerHTTPBible(u'nasb', u'Biblegateway', u'', u'', u'')
         self.bm.registerHTTPBible(u'nkj', u'Biblegateway',
-	    u'http://tigger2:3128/', u'', u'')                
+        u'http://tigger2:3128/', u'', u'')
         b = self.bm.get_bibles()
         for b1 in b:
             log.debug( b1)

openlp/plugins/bibles/test/test_bibleManagerAPI.py

@@ -1,20 +1,27 @@
-"""
+# -*- coding: utf-8 -*-
-OpenLP - Open Source Lyrics Projection
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-Copyright (c) 2008 Raoul Snyman
-Portions copyright (c) 2008 Martin Thompson, Tim Bentley
 
-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
+# OpenLP - Open Source Lyrics Projection                                      #
-Foundation; version 2 of the License.
+# --------------------------------------------------------------------------- #
-
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-
+# --------------------------------------------------------------------------- #
-You should have received a copy of the GNU General Public License along with
+# This program is free software; you can redistribute it and/or modify it     #
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# under the terms of the GNU General Public License as published by the Free  #
-Place, Suite 330, Boston, MA 02111-1307 USA
+# 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 logging
 import os
@@ -73,7 +80,7 @@ class TestBibleManager:
         assert(self.bm.getBookVerseCount(u'TheMessage', u'Genesis', 2)[0] == 25)
         assert(self.bm.getBookVerseCount(u'asv', u'Matthew', 1)[0] == 25)
         assert(self.bm.getBookVerseCount(u'TheMessage', u'Revelation',
-	    1)[0] == 20)        
+        1)[0] == 20)
 
     def testGetVerseText(self):
         log.debug(u'\n.......testGetVerseText')

openlp/plugins/bibles/test/test_bibleManagerCSV.py

@@ -1,20 +1,27 @@
-"""
+# -*- coding: utf-8 -*-
-OpenLP - Open Source Lyrics Projection
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-Copyright (c) 2008 Raoul Snyman
-Portions copyright (c) 2008 Martin Thompson, Tim Bentley
 
-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
+# OpenLP - Open Source Lyrics Projection                                      #
-Foundation; version 2 of the License.
+# --------------------------------------------------------------------------- #
-
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-
+# --------------------------------------------------------------------------- #
-You should have received a copy of the GNU General Public License along with
+# This program is free software; you can redistribute it and/or modify it     #
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# under the terms of the GNU General Public License as published by the Free  #
-Place, Suite 330, Boston, MA 02111-1307 USA
+# 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 logging
 import os
@@ -52,9 +59,9 @@ class TestBibleManager:
         # Register a bible from files
         log.debug(u'\n.......testRegisterBibleFiles')
         self.bm.registerCSVFileBible(u'TheMessage',
-	    u'biblebooks_msg_short.csv', u'bibleverses_msg_short.csv')
+        u'biblebooks_msg_short.csv', u'bibleverses_msg_short.csv')
         self.bm.registerCSVFileBible(u'NIV', u'biblebooks_niv_short.csv',
-	    u'bibleverses_niv_short.csv')        
+        u'bibleverses_niv_short.csv')
         b = self.bm.get_bibles()
         for b1 in b:
             log.debug( b1)

openlp/plugins/bibles/test/test_bibleManagerOSIS.py

@@ -1,20 +1,27 @@
-"""
+# -*- coding: utf-8 -*-
-OpenLP - Open Source Lyrics Projection
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-Copyright (c) 2008 Raoul Snyman
-Portions copyright (c) 2008 Martin Thompson, Tim Bentley
 
-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
+# OpenLP - Open Source Lyrics Projection                                      #
-Foundation; version 2 of the License.
+# --------------------------------------------------------------------------- #
-
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
-
+# --------------------------------------------------------------------------- #
-You should have received a copy of the GNU General Public License along with
+# This program is free software; you can redistribute it and/or modify it     #
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# under the terms of the GNU General Public License as published by the Free  #
-Place, Suite 330, Boston, MA 02111-1307 USA
+# 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 logging
 import os

openlp/plugins/custom/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/custom/customplugin.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/custom/forms/__init__.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/custom/forms/editcustomdialog.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #

openlp/plugins/custom/forms/editcustomform.py

@@ -6,8 +6,8 @@
 # --------------------------------------------------------------------------- #
 # Copyright (c) 2008-2010 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin      #
-# Carsten Tinggaard                                                           #
+# Thompson, Jon Tibble, Carsten Tinggaard                                     #
 # --------------------------------------------------------------------------- #
 # 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  #
@@ -22,6 +22,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
+
 import logging
 
 from PyQt4 import QtCore, QtGui