← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~meths/openlp/trivialfixes into lp:openlp

 

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Refactor and remove dead code:
* Remove old song import/export forms
* Refactor theme migration method - method parameters should not be created just for debug logging
* Small refactors of duplicated code in Bibles and Presentations
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/27274
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2010-06-10 00:03:38 +0000
+++ openlp/core/ui/thememanager.py	2010-06-10 14:21:34 +0000
@@ -366,8 +366,7 @@
                         if os.path.splitext(file)[1].lower() in [u'.xml']:
                             if self.checkVersion1(xml_data):
                                 # upgrade theme xml
-                                filexml = self.migrateVersion122(filename,
-                                    fullpath, xml_data)
+                                filexml = self.migrateVersion122(xml_data)
                             else:
                                 filexml = xml_data
                             outfile = open(fullpath, u'w')
@@ -399,13 +398,12 @@
         else:
             return True
 
-    def migrateVersion122(self, filename, fullpath, xml_data):
+    def migrateVersion122(self, xml_data):
         """
         Called by convert the xml data from version 1 format
         to the current format.
         New fields are defaulted but the new theme is useable
         """
-        log.debug(u'migrateVersion122 %s %s', filename, fullpath)
         theme = Theme(xml_data)
         newtheme = ThemeXML()
         newtheme.new_document(theme.Name)

=== modified file 'openlp/plugins/bibles/lib/csvbible.py'
--- openlp/plugins/bibles/lib/csvbible.py	2010-05-29 19:50:50 +0000
+++ openlp/plugins/bibles/lib/csvbible.py	2010-06-10 14:21:34 +0000
@@ -56,13 +56,6 @@
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'bibles_stop_import'), self.stop_import)
 
-    def stop_import(self):
-        """
-        Stops the import of the Bible.
-        """
-        log.debug('Stopping import!')
-        self.stop_import_flag = True
-
     def do_import(self):
         #Populate the Tables
         success = True

=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py	2010-06-01 17:13:54 +0000
+++ openlp/plugins/bibles/lib/db.py	2010-06-10 14:21:34 +0000
@@ -92,6 +92,13 @@
         if u'file' in kwargs:
             self.get_name()
 
+    def stop_import(self):
+        """
+        Stops the import of the Bible.
+        """
+        log.debug('Stopping import')
+        self.stop_import_flag = True
+
     def get_name(self):
         """
         Returns the version name of the Bible.

=== modified file 'openlp/plugins/bibles/lib/opensong.py'
--- openlp/plugins/bibles/lib/opensong.py	2010-06-08 15:38:09 +0000
+++ openlp/plugins/bibles/lib/opensong.py	2010-06-10 14:21:34 +0000
@@ -51,13 +51,6 @@
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'bibles_stop_import'), self.stop_import)
 
-    def stop_import(self):
-        """
-        Stops the import of the Bible.
-        """
-        log.debug('Stopping import!')
-        self.stop_import_flag = True
-
     def do_import(self):
         """
         Loads a Bible from file.

=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py	2010-05-29 19:50:50 +0000
+++ openlp/plugins/bibles/lib/osis.py	2010-06-10 14:21:34 +0000
@@ -86,13 +86,6 @@
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'bibles_stop_import'), self.stop_import)
 
-    def stop_import(self):
-        """
-        Stops the import of the Bible.
-        """
-        log.debug('Stopping import!')
-        self.stop_import_flag = True
-
     def do_import(self):
         """
         Loads a Bible from file.

=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2010-06-08 15:38:09 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2010-06-10 14:21:34 +0000
@@ -370,21 +370,6 @@
         """
         self.control.gotoPreviousSlide()
 
-    def get_slide_preview_file(self, slide_no):
-        """
-        Returns an image path containing a preview for the
-        requested slide
-
-        ``slide_no``
-        The slide an image is required for, starting at 1
-        """
-        path = os.path.join(self.thumbnailpath,
-            self.controller.thumbnailprefix + unicode(slide_no) + u'.png')
-        if os.path.isfile(path):
-            return path
-        else:
-            return None
-
     def get_slide_text(self, slide_no):
         """
         Returns the text on the slide

=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py	2010-06-08 15:38:09 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py	2010-06-10 14:21:34 +0000
@@ -269,20 +269,6 @@
         """
         self.presentation.SlideShowWindow.View.Previous()
 
-    def get_slide_preview_file(self, slide_no):
-        """
-        Returns an image path containing a preview for the requested slide
-
-        ``slide_no``
-        The slide an image is required for, starting at 1
-        """
-        path = os.path.join(self.thumbnailpath,
-            self.controller.thumbnailprefix + unicode(slide_no) + u'.png')
-        if os.path.isfile(path):
-            return path
-        else:
-            return None
-
     def get_slide_text(self, slide_no):
         """
         Returns the text on the slide

=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
--- openlp/plugins/presentations/lib/presentationcontroller.py	2010-06-08 15:38:09 +0000
+++ openlp/plugins/presentations/lib/presentationcontroller.py	2010-06-10 14:21:34 +0000
@@ -357,7 +357,12 @@
         ``slide_no``
             The slide an image is required for, starting at 1
         """
-        return None
+        path = os.path.join(self.thumbnailpath,
+            self.controller.thumbnailprefix + unicode(slide_no) + u'.png')
+        if os.path.isfile(path):
+            return path
+        else:
+            return None
 
     def poll_slidenumber(self, is_live):
         """

=== modified file 'openlp/plugins/songs/forms/__init__.py'
--- openlp/plugins/songs/forms/__init__.py	2010-06-08 15:38:09 +0000
+++ openlp/plugins/songs/forms/__init__.py	2010-06-10 14:21:34 +0000
@@ -81,10 +81,4 @@
 from editverseform import EditVerseForm
 from editsongform import EditSongForm
 from songmaintenanceform import SongMaintenanceForm
-
-#from openlpexportform import OpenLPExportForm
-#from openlpimportform import OpenLPImportForm
-#from opensongexportform import OpenSongExportForm
-#from opensongimportform import OpenSongImportForm
-
 from songimportform import ImportWizardForm

=== removed file 'openlp/plugins/songs/forms/openlpexportdialog.py'
--- openlp/plugins/songs/forms/openlpexportdialog.py	2010-06-06 14:22:00 +0000
+++ openlp/plugins/songs/forms/openlpexportdialog.py	1970-01-01 00:00:00 +0000
@@ -1,326 +0,0 @@
-# -*- 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                          #
-###############################################################################
-
-from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
-
-class Ui_OpenLPExportDialog(object):
-    def setupUi(self, OpenLPExportDialog):
-        OpenLPExportDialog.setObjectName(u'OpenLPExportDialog')
-        OpenLPExportDialog.resize(473, 459)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        OpenLPExportDialog.setWindowIcon(icon)
-        self.verticalLayout_5 = QtGui.QVBoxLayout(OpenLPExportDialog)
-        self.verticalLayout_5.setMargin(8)
-        self.verticalLayout_5.setObjectName(u'verticalLayout_5')
-        self.ExportFileWidget = QtGui.QWidget(OpenLPExportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ExportFileWidget.sizePolicy().hasHeightForWidth())
-        self.ExportFileWidget.setSizePolicy(sizePolicy)
-        self.ExportFileWidget.setObjectName(u'ExportFileWidget')
-        self.horizontalLayout = QtGui.QHBoxLayout(self.ExportFileWidget)
-        self.horizontalLayout.setSpacing(3)
-        self.horizontalLayout.setMargin(0)
-        self.horizontalLayout.setObjectName(u'horizontalLayout')
-        self.ExportFileLabel = QtGui.QLabel(self.ExportFileWidget)
-        self.ExportFileLabel.setObjectName(u'ExportFileLabel')
-        self.horizontalLayout.addWidget(self.ExportFileLabel)
-        self.ExportFileLineEdit = QtGui.QLineEdit(self.ExportFileWidget)
-        self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit')
-        self.horizontalLayout.addWidget(self.ExportFileLineEdit)
-        self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget)
-        icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(u':/general/general_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.ExportFileSelectPushButton.setIcon(icon1)
-        self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton')
-        self.horizontalLayout.addWidget(self.ExportFileSelectPushButton)
-        self.verticalLayout_5.addWidget(self.ExportFileWidget)
-        self.SongListFrame = QtGui.QFrame(OpenLPExportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth())
-        self.SongListFrame.setSizePolicy(sizePolicy)
-        self.SongListFrame.setFrameShape(QtGui.QFrame.Box)
-        self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised)
-        self.SongListFrame.setObjectName(u'SongListFrame')
-        self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame)
-        self.horizontalLayout_6.setSpacing(8)
-        self.horizontalLayout_6.setMargin(8)
-        self.horizontalLayout_6.setObjectName(u'horizontalLayout_6')
-        self.ExportFileSongListWidget = QtGui.QWidget(self.SongListFrame)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ExportFileSongListWidget.sizePolicy().hasHeightForWidth())
-        self.ExportFileSongListWidget.setSizePolicy(sizePolicy)
-        self.ExportFileSongListWidget.setObjectName(u'ExportFileSongListWidget')
-        self.verticalLayout = QtGui.QVBoxLayout(self.ExportFileSongListWidget)
-        self.verticalLayout.setSpacing(6)
-        self.verticalLayout.setMargin(0)
-        self.verticalLayout.setObjectName(u'verticalLayout')
-        self.ExportListLabel = QtGui.QLabel(self.ExportFileSongListWidget)
-        self.ExportListLabel.setObjectName(u'ExportListLabel')
-        self.verticalLayout.addWidget(self.ExportListLabel)
-        self.ExportListTable = QtGui.QTableWidget(self.ExportFileSongListWidget)
-        self.ExportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection)
-        self.ExportListTable.setShowGrid(False)
-        self.ExportListTable.setWordWrap(False)
-        self.ExportListTable.setCornerButtonEnabled(False)
-        self.ExportListTable.setObjectName(u'ExportListTable')
-        self.ExportListTable.setColumnCount(2)
-        self.ExportListTable.setRowCount(0)
-        item = QtGui.QTableWidgetItem()
-        self.ExportListTable.setHorizontalHeaderItem(0, item)
-        item = QtGui.QTableWidgetItem()
-        self.ExportListTable.setHorizontalHeaderItem(1, item)
-        self.verticalLayout.addWidget(self.ExportListTable)
-        self.ExportSelectAllWidget = QtGui.QWidget(self.ExportFileSongListWidget)
-        self.ExportSelectAllWidget.setObjectName(u'ExportSelectAllWidget')
-        self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ExportSelectAllWidget)
-        self.horizontalLayout_2.setSpacing(6)
-        self.horizontalLayout_2.setMargin(0)
-        self.horizontalLayout_2.setObjectName(u'horizontalLayout_2')
-        self.ExportSelectAllPushButton = QtGui.QPushButton(self.ExportSelectAllWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth())
-        self.ExportSelectAllPushButton.setSizePolicy(sizePolicy)
-        self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0))
-        icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(u':/exports/export_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.ExportSelectAllPushButton.setIcon(icon2)
-        self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton')
-        self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton)
-        spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem)
-        self.verticalLayout.addWidget(self.ExportSelectAllWidget)
-        self.exportFilterWidget = QtGui.QWidget(self.ExportFileSongListWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.exportFilterWidget.sizePolicy().hasHeightForWidth())
-        self.exportFilterWidget.setSizePolicy(sizePolicy)
-        self.exportFilterWidget.setMinimumSize(QtCore.QSize(0, 0))
-        self.exportFilterWidget.setObjectName(u'exportFilterWidget')
-        self.horizontalLayout_3 = QtGui.QHBoxLayout(self.exportFilterWidget)
-        self.horizontalLayout_3.setMargin(0)
-        self.horizontalLayout_3.setObjectName(u'horizontalLayout_3')
-        self.ExportFilterComboBox = QtGui.QComboBox(self.exportFilterWidget)
-        self.ExportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0))
-        self.ExportFilterComboBox.setObjectName(u'ExportFilterComboBox')
-        self.ExportFilterComboBox.addItem(QtCore.QString())
-        self.ExportFilterComboBox.addItem(QtCore.QString())
-        self.ExportFilterComboBox.addItem(QtCore.QString())
-        self.horizontalLayout_3.addWidget(self.ExportFilterComboBox)
-        self.ExportFilterLineEdit = QtGui.QLineEdit(self.exportFilterWidget)
-        self.ExportFilterLineEdit.setObjectName(u'ExportFilterLineEdit')
-        self.horizontalLayout_3.addWidget(self.ExportFilterLineEdit)
-        self.verticalLayout.addWidget(self.exportFilterWidget)
-        self.horizontalLayout_6.addWidget(self.ExportFileSongListWidget)
-        self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth())
-        self.AddSelectedWidget.setSizePolicy(sizePolicy)
-        self.AddSelectedWidget.setObjectName(u'AddSelectedWidget')
-        self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget)
-        self.verticalLayout_3.setMargin(0)
-        self.verticalLayout_3.setObjectName(u'verticalLayout_3')
-        spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout_3.addItem(spacerItem1)
-        self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth())
-        self.AddSelectedPushButton.setSizePolicy(sizePolicy)
-        self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25))
-        icon3 = QtGui.QIcon()
-        icon3.addPixmap(QtGui.QPixmap(u':/exports/export_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.AddSelectedPushButton.setIcon(icon3)
-        self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton')
-        self.verticalLayout_3.addWidget(self.AddSelectedPushButton)
-        spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout_3.addItem(spacerItem2)
-        self.horizontalLayout_6.addWidget(self.AddSelectedWidget)
-        self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth())
-        self.SelectedFileListWidget.setSizePolicy(sizePolicy)
-        self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget')
-        self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget)
-        self.verticalLayout_2.setMargin(0)
-        self.verticalLayout_2.setObjectName(u'verticalLayout_2')
-        self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget)
-        self.SelectedListLabel.setObjectName(u'SelectedListLabel')
-        self.verticalLayout_2.addWidget(self.SelectedListLabel)
-        self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget)
-        self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection)
-        self.SelectedListTable.setShowGrid(False)
-        self.SelectedListTable.setWordWrap(False)
-        self.SelectedListTable.setCornerButtonEnabled(False)
-        self.SelectedListTable.setObjectName(u'SelectedListTable')
-        self.SelectedListTable.setColumnCount(2)
-        self.SelectedListTable.setRowCount(0)
-        item = QtGui.QTableWidgetItem()
-        self.SelectedListTable.setHorizontalHeaderItem(0, item)
-        item = QtGui.QTableWidgetItem()
-        self.SelectedListTable.setHorizontalHeaderItem(1, item)
-        self.verticalLayout_2.addWidget(self.SelectedListTable)
-        self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget)
-        self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget')
-        self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget)
-        self.horizontalLayout_4.setSpacing(6)
-        self.horizontalLayout_4.setMargin(0)
-        self.horizontalLayout_4.setObjectName(u'horizontalLayout_4')
-        self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth())
-        self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy)
-        self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0))
-        self.SelectedSelectAllPushButton.setIcon(icon2)
-        self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton')
-        self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton)
-        spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_4.addItem(spacerItem3)
-        self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget)
-        self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth())
-        self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy)
-        self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget')
-        self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget)
-        self.horizontalLayout_5.setMargin(0)
-        self.horizontalLayout_5.setObjectName(u'horizontalLayout_5')
-        self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth())
-        self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy)
-        self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0))
-        icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(u':/exports/export_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.SelectedRemoveSelectedButton.setIcon(icon4)
-        self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton')
-        self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton)
-        spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_5.addItem(spacerItem4)
-        self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget)
-        self.horizontalLayout_6.addWidget(self.SelectedFileListWidget)
-        self.verticalLayout_5.addWidget(self.SongListFrame)
-        self.ProgressGroupBox = QtGui.QGroupBox(OpenLPExportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth())
-        self.ProgressGroupBox.setSizePolicy(sizePolicy)
-        self.ProgressGroupBox.setObjectName(u'ProgressGroupBox')
-        self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox)
-        self.verticalLayout_4.setSpacing(8)
-        self.verticalLayout_4.setContentsMargins(8, 0, 8, 8)
-        self.verticalLayout_4.setObjectName(u'verticalLayout_4')
-        self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox)
-        self.ProgressLabel.setObjectName(u'ProgressLabel')
-        self.verticalLayout_4.addWidget(self.ProgressLabel)
-        self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox)
-        self.ProgressBar.setProperty(u'value', QtCore.QVariant(24))
-        self.ProgressBar.setObjectName(u'ProgressBar')
-        self.verticalLayout_4.addWidget(self.ProgressBar)
-        self.verticalLayout_5.addWidget(self.ProgressGroupBox)
-        self.ButtonBarWidget = QtGui.QWidget(OpenLPExportDialog)
-        self.ButtonBarWidget.setObjectName(u'ButtonBarWidget')
-        self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget)
-        self.horizontalLayout_7.setSpacing(8)
-        self.horizontalLayout_7.setMargin(0)
-        self.horizontalLayout_7.setObjectName(u'horizontalLayout_7')
-        spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem5)
-        self.ExportPushButton = QtGui.QPushButton(self.ButtonBarWidget)
-        self.ExportPushButton.setObjectName(u'ExportPushButton')
-        self.horizontalLayout_7.addWidget(self.ExportPushButton)
-        self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget)
-        self.ClosePushButton.setObjectName(u'ClosePushButton')
-        self.horizontalLayout_7.addWidget(self.ClosePushButton)
-        self.verticalLayout_5.addWidget(self.ButtonBarWidget)
-
-        self.retranslateUi(OpenLPExportDialog)
-        QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenLPExportDialog.close)
-        QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll)
-        QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll)
-        QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear)
-        QtCore.QMetaObject.connectSlotsByName(OpenLPExportDialog)
-
-    def retranslateUi(self, OpenLPExportDialog):
-        OpenLPExportDialog.setWindowTitle(
-            translate(u'SongsPlugin.OpenLPExportForm',
-                u'openlp.org Song Exporter'))
-        self.ExportFileLabel.setText(
-            translate(u'SongsPlugin.OpenLPExportForm',
-                u'Select openlp.org export filename:'))
-        self.ExportListLabel.setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Full Song List'))
-        self.ExportListTable.horizontalHeaderItem(0).setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Song Title'))
-        self.ExportListTable.horizontalHeaderItem(1).setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Author'))
-        self.ExportSelectAllPushButton.setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Select All'))
-        self.ExportFilterComboBox.setItemText(0, 
-            translate(u'SongsPlugin.OpenLPExportForm', u'Lyrics'))
-        self.ExportFilterComboBox.setItemText(1, 
-            translate(u'SongsPlugin.OpenLPExportForm', u'Title'))
-        self.ExportFilterComboBox.setItemText(2, 
-            translate(u'SongsPlugin.OpenLPExportForm', u'Author'))
-        self.SelectedListLabel.setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Song Export List'))
-        self.SelectedListTable.horizontalHeaderItem(0).setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Song Title'))
-        self.SelectedListTable.horizontalHeaderItem(1).setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Author'))
-        self.SelectedSelectAllPushButton.setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Select All'))
-        self.SelectedRemoveSelectedButton.setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Remove Selected'))
-        self.ProgressGroupBox.setTitle(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Progress:'))
-        self.ProgressLabel.setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Ready to export'))
-        self.ExportPushButton.setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Export'))
-        self.ClosePushButton.setText(
-            translate(u'SongsPlugin.OpenLPExportForm', u'Close'))

=== removed file 'openlp/plugins/songs/forms/openlpexportform.py'
--- openlp/plugins/songs/forms/openlpexportform.py	2010-03-21 23:58:01 +0000
+++ openlp/plugins/songs/forms/openlpexportform.py	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-# -*- 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                          #
-###############################################################################
-
-from PyQt4 import QtGui
-
-from openlp.plugins.songs.forms.openlpexportdialog import Ui_OpenLPExportDialog
-
-class OpenLPExportForm(QtGui.QDialog, Ui_OpenLPExportDialog):
-
-    def __init__(self, parent=None):
-        QtGui.QDialog.__init__(self, parent)
-        self.setupUi(self)

=== removed file 'openlp/plugins/songs/forms/openlpimportdialog.py'
--- openlp/plugins/songs/forms/openlpimportdialog.py	2010-06-06 14:22:00 +0000
+++ openlp/plugins/songs/forms/openlpimportdialog.py	1970-01-01 00:00:00 +0000
@@ -1,327 +0,0 @@
-# -*- 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                          #
-###############################################################################
-
-from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
-
-class Ui_OpenLPImportDialog(object):
-    def setupUi(self, OpenLPImportDialog):
-        OpenLPImportDialog.setObjectName(u'OpenLPImportDialog')
-        OpenLPImportDialog.resize(473, 459)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        OpenLPImportDialog.setWindowIcon(icon)
-        self.verticalLayout_5 = QtGui.QVBoxLayout(OpenLPImportDialog)
-        self.verticalLayout_5.setMargin(8)
-        self.verticalLayout_5.setObjectName(u'verticalLayout_5')
-        self.ImportFileWidget = QtGui.QWidget(OpenLPImportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ImportFileWidget.sizePolicy().hasHeightForWidth())
-        self.ImportFileWidget.setSizePolicy(sizePolicy)
-        self.ImportFileWidget.setObjectName(u'ImportFileWidget')
-        self.horizontalLayout = QtGui.QHBoxLayout(self.ImportFileWidget)
-        self.horizontalLayout.setSpacing(3)
-        self.horizontalLayout.setMargin(0)
-        self.horizontalLayout.setObjectName(u'horizontalLayout')
-        self.ImportFileLabel = QtGui.QLabel(self.ImportFileWidget)
-        self.ImportFileLabel.setObjectName(u'ImportFileLabel')
-        self.horizontalLayout.addWidget(self.ImportFileLabel)
-        self.ImportFileLineEdit = QtGui.QLineEdit(self.ImportFileWidget)
-        self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit')
-        self.horizontalLayout.addWidget(self.ImportFileLineEdit)
-        self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget)
-        icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.ImportFileSelectPushButton.setIcon(icon1)
-        self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton')
-        self.horizontalLayout.addWidget(self.ImportFileSelectPushButton)
-        self.verticalLayout_5.addWidget(self.ImportFileWidget)
-        self.SongListFrame = QtGui.QFrame(OpenLPImportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth())
-        self.SongListFrame.setSizePolicy(sizePolicy)
-        self.SongListFrame.setFrameShape(QtGui.QFrame.Box)
-        self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised)
-        self.SongListFrame.setObjectName(u'SongListFrame')
-        self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame)
-        self.horizontalLayout_6.setSpacing(8)
-        self.horizontalLayout_6.setMargin(8)
-        self.horizontalLayout_6.setObjectName(u'horizontalLayout_6')
-        self.ImportFileSongListWidget = QtGui.QWidget(self.SongListFrame)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ImportFileSongListWidget.sizePolicy().hasHeightForWidth())
-        self.ImportFileSongListWidget.setSizePolicy(sizePolicy)
-        self.ImportFileSongListWidget.setObjectName(u'ImportFileSongListWidget')
-        self.verticalLayout = QtGui.QVBoxLayout(self.ImportFileSongListWidget)
-        self.verticalLayout.setSpacing(6)
-        self.verticalLayout.setMargin(0)
-        self.verticalLayout.setObjectName(u'verticalLayout')
-        self.ImportListLabel = QtGui.QLabel(self.ImportFileSongListWidget)
-        self.ImportListLabel.setObjectName(u'ImportListLabel')
-        self.verticalLayout.addWidget(self.ImportListLabel)
-        self.ImportListTable = QtGui.QTableWidget(self.ImportFileSongListWidget)
-        self.ImportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection)
-        self.ImportListTable.setShowGrid(False)
-        self.ImportListTable.setWordWrap(False)
-        self.ImportListTable.setCornerButtonEnabled(False)
-        self.ImportListTable.setObjectName(u'ImportListTable')
-        self.ImportListTable.setColumnCount(2)
-        self.ImportListTable.setRowCount(0)
-        item = QtGui.QTableWidgetItem()
-        self.ImportListTable.setHorizontalHeaderItem(0, item)
-        item = QtGui.QTableWidgetItem()
-        self.ImportListTable.setHorizontalHeaderItem(1, item)
-        self.verticalLayout.addWidget(self.ImportListTable)
-        self.ImportSelectAllWidget = QtGui.QWidget(self.ImportFileSongListWidget)
-        self.ImportSelectAllWidget.setObjectName(u'ImportSelectAllWidget')
-        self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ImportSelectAllWidget)
-        self.horizontalLayout_2.setSpacing(6)
-        self.horizontalLayout_2.setMargin(0)
-        self.horizontalLayout_2.setObjectName(u'horizontalLayout_2')
-        self.ImportSelectAllPushButton = QtGui.QPushButton(self.ImportSelectAllWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ImportSelectAllPushButton.sizePolicy().hasHeightForWidth())
-        self.ImportSelectAllPushButton.setSizePolicy(sizePolicy)
-        self.ImportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0))
-        icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(u':/imports/import_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.ImportSelectAllPushButton.setIcon(icon2)
-        self.ImportSelectAllPushButton.setObjectName(u'ImportSelectAllPushButton')
-        self.horizontalLayout_2.addWidget(self.ImportSelectAllPushButton)
-        spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem)
-        self.verticalLayout.addWidget(self.ImportSelectAllWidget)
-        self.importFilterWidget = QtGui.QWidget(self.ImportFileSongListWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.importFilterWidget.sizePolicy().hasHeightForWidth())
-        self.importFilterWidget.setSizePolicy(sizePolicy)
-        self.importFilterWidget.setMinimumSize(QtCore.QSize(0, 0))
-        self.importFilterWidget.setObjectName(u'importFilterWidget')
-        self.horizontalLayout_3 = QtGui.QHBoxLayout(self.importFilterWidget)
-        self.horizontalLayout_3.setMargin(0)
-        self.horizontalLayout_3.setObjectName(u'horizontalLayout_3')
-        self.ImportFilterComboBox = QtGui.QComboBox(self.importFilterWidget)
-        self.ImportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0))
-        self.ImportFilterComboBox.setObjectName(u'ImportFilterComboBox')
-        self.ImportFilterComboBox.addItem(QtCore.QString())
-        self.ImportFilterComboBox.addItem(QtCore.QString())
-        self.ImportFilterComboBox.addItem(QtCore.QString())
-        self.horizontalLayout_3.addWidget(self.ImportFilterComboBox)
-        self.importFilterLineEdit = QtGui.QLineEdit(self.importFilterWidget)
-        self.importFilterLineEdit.setObjectName(u'importFilterLineEdit')
-        self.horizontalLayout_3.addWidget(self.importFilterLineEdit)
-        self.verticalLayout.addWidget(self.importFilterWidget)
-        self.horizontalLayout_6.addWidget(self.ImportFileSongListWidget)
-        self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth())
-        self.AddSelectedWidget.setSizePolicy(sizePolicy)
-        self.AddSelectedWidget.setObjectName(u'AddSelectedWidget')
-        self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget)
-        self.verticalLayout_3.setMargin(0)
-        self.verticalLayout_3.setObjectName(u'verticalLayout_3')
-        spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout_3.addItem(spacerItem1)
-        self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth())
-        self.AddSelectedPushButton.setSizePolicy(sizePolicy)
-        self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25))
-        icon3 = QtGui.QIcon()
-        icon3.addPixmap(QtGui.QPixmap(u':/imports/import_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.AddSelectedPushButton.setIcon(icon3)
-        self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton')
-        self.verticalLayout_3.addWidget(self.AddSelectedPushButton)
-        spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout_3.addItem(spacerItem2)
-        self.horizontalLayout_6.addWidget(self.AddSelectedWidget)
-        self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth())
-        self.SelectedFileListWidget.setSizePolicy(sizePolicy)
-        self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget')
-        self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget)
-        self.verticalLayout_2.setMargin(0)
-        self.verticalLayout_2.setObjectName(u'verticalLayout_2')
-        self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget)
-        self.SelectedListLabel.setObjectName(u'SelectedListLabel')
-        self.verticalLayout_2.addWidget(self.SelectedListLabel)
-        self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget)
-        self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection)
-        self.SelectedListTable.setShowGrid(False)
-        self.SelectedListTable.setWordWrap(False)
-        self.SelectedListTable.setCornerButtonEnabled(False)
-        self.SelectedListTable.setObjectName(u'SelectedListTable')
-        self.SelectedListTable.setColumnCount(2)
-        self.SelectedListTable.setRowCount(0)
-        item = QtGui.QTableWidgetItem()
-        self.SelectedListTable.setHorizontalHeaderItem(0, item)
-        item = QtGui.QTableWidgetItem()
-        self.SelectedListTable.setHorizontalHeaderItem(1, item)
-        self.verticalLayout_2.addWidget(self.SelectedListTable)
-        self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget)
-        self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget')
-        self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget)
-        self.horizontalLayout_4.setSpacing(6)
-        self.horizontalLayout_4.setMargin(0)
-        self.horizontalLayout_4.setObjectName(u'horizontalLayout_4')
-        self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth())
-        self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy)
-        self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0))
-        self.SelectedSelectAllPushButton.setIcon(icon2)
-        self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton')
-        self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton)
-        spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_4.addItem(spacerItem3)
-        self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget)
-        self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth())
-        self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy)
-        self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget')
-        self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget)
-        self.horizontalLayout_5.setMargin(0)
-        self.horizontalLayout_5.setObjectName(u'horizontalLayout_5')
-        self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth())
-        self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy)
-        self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0))
-        icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(u':/imports/import_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.SelectedRemoveSelectedButton.setIcon(icon4)
-        self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton')
-        self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton)
-        spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_5.addItem(spacerItem4)
-        self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget)
-        self.horizontalLayout_6.addWidget(self.SelectedFileListWidget)
-        self.verticalLayout_5.addWidget(self.SongListFrame)
-        self.ProgressGroupBox = QtGui.QGroupBox(OpenLPImportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth())
-        self.ProgressGroupBox.setSizePolicy(sizePolicy)
-        self.ProgressGroupBox.setObjectName(u'ProgressGroupBox')
-        self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox)
-        self.verticalLayout_4.setSpacing(8)
-        self.verticalLayout_4.setContentsMargins(8, 0, 8, 8)
-        self.verticalLayout_4.setObjectName(u'verticalLayout_4')
-        self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox)
-        self.ProgressLabel.setObjectName(u'ProgressLabel')
-        self.verticalLayout_4.addWidget(self.ProgressLabel)
-        self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox)
-        self.ProgressBar.setProperty(u'value', QtCore.QVariant(24))
-        self.ProgressBar.setObjectName(u'ProgressBar')
-        self.verticalLayout_4.addWidget(self.ProgressBar)
-        self.verticalLayout_5.addWidget(self.ProgressGroupBox)
-        self.ButtonBarWidget = QtGui.QWidget(OpenLPImportDialog)
-        self.ButtonBarWidget.setObjectName(u'ButtonBarWidget')
-        self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget)
-        self.horizontalLayout_7.setSpacing(8)
-        self.horizontalLayout_7.setMargin(0)
-        self.horizontalLayout_7.setObjectName(u'horizontalLayout_7')
-        spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem5)
-        self.ImportPushButton = QtGui.QPushButton(self.ButtonBarWidget)
-        self.ImportPushButton.setObjectName(u'ImportPushButton')
-        self.horizontalLayout_7.addWidget(self.ImportPushButton)
-        self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget)
-        self.ClosePushButton.setObjectName(u'ClosePushButton')
-        self.horizontalLayout_7.addWidget(self.ClosePushButton)
-        self.verticalLayout_5.addWidget(self.ButtonBarWidget)
-
-        self.retranslateUi(OpenLPImportDialog)
-        QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenLPImportDialog.close)
-        QtCore.QObject.connect(self.ImportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ImportListTable.selectAll)
-        QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll)
-        QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear)
-        QtCore.QMetaObject.connectSlotsByName(OpenLPImportDialog)
-
-    def retranslateUi(self, OpenLPImportDialog):
-        OpenLPImportDialog.setWindowTitle(
-            translate(u'SongsPlugin.OpenLPImportForm',
-                u'openlp.org Song Importer'))
-        self.ImportFileLabel.setText(
-            translate(u'SongsPlugin.OpenLPImportForm', 
-                u'Select openlp.org songfile to import:'))
-        self.ImportListLabel.setText(
-            translate(u'SongsPlugin.OpenLPImportForm',
-                u'Import File Song List'))
-        self.ImportListTable.horizontalHeaderItem(0).setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Song Title'))
-        self.ImportListTable.horizontalHeaderItem(1).setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Author'))
-        self.ImportSelectAllPushButton.setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Select All'))
-        self.ImportFilterComboBox.setItemText(0, 
-            translate(u'SongsPlugin.OpenLPImportForm', u'Lyrics'))
-        self.ImportFilterComboBox.setItemText(1, 
-            translate(u'SongsPlugin.OpenLPImportForm', u'Title'))
-        self.ImportFilterComboBox.setItemText(2, 
-            translate(u'SongsPlugin.OpenLPImportForm', u'Author'))
-        self.SelectedListLabel.setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Song Import List'))
-        self.SelectedListTable.horizontalHeaderItem(0).setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Song Title'))
-        self.SelectedListTable.horizontalHeaderItem(1).setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Author'))
-        self.SelectedSelectAllPushButton.setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Select All'))
-        self.SelectedRemoveSelectedButton.setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Remove Selected'))
-        self.ProgressGroupBox.setTitle(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Progress:'))
-        self.ProgressLabel.setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Ready to import'))
-        self.ImportPushButton.setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Import'))
-        self.ClosePushButton.setText(
-            translate(u'SongsPlugin.OpenLPImportForm', u'Close'))

=== removed file 'openlp/plugins/songs/forms/openlpimportform.py'
--- openlp/plugins/songs/forms/openlpimportform.py	2010-03-21 23:58:01 +0000
+++ openlp/plugins/songs/forms/openlpimportform.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# -*- 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                          #
-###############################################################################
-
-from PyQt4 import QtGui
-from openlp.plugins.songs.forms.openlpimportdialog import Ui_OpenLPImportDialog
-
-class OpenLPImportForm(QtGui.QDialog, Ui_OpenLPImportDialog):
-
-    def __init__(self, parent=None):
-        QtGui.QDialog.__init__(self, parent)
-        self.setupUi(self)

=== removed file 'openlp/plugins/songs/forms/opensongexportdialog.py'
--- openlp/plugins/songs/forms/opensongexportdialog.py	2010-06-06 14:22:00 +0000
+++ openlp/plugins/songs/forms/opensongexportdialog.py	1970-01-01 00:00:00 +0000
@@ -1,324 +0,0 @@
-# -*- 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                          #
-###############################################################################
-
-from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
-
-class Ui_OpenSongExportDialog(object):
-    def setupUi(self, OpenSongExportDialog):
-        OpenSongExportDialog.setObjectName(u'OpenSongExportDialog')
-        OpenSongExportDialog.resize(473, 459)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        OpenSongExportDialog.setWindowIcon(icon)
-        self.verticalLayout_5 = QtGui.QVBoxLayout(OpenSongExportDialog)
-        self.verticalLayout_5.setMargin(8)
-        self.verticalLayout_5.setObjectName(u'verticalLayout_5')
-        self.ExportFileWidget = QtGui.QWidget(OpenSongExportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ExportFileWidget.sizePolicy().hasHeightForWidth())
-        self.ExportFileWidget.setSizePolicy(sizePolicy)
-        self.ExportFileWidget.setObjectName(u'ExportFileWidget')
-        self.horizontalLayout = QtGui.QHBoxLayout(self.ExportFileWidget)
-        self.horizontalLayout.setSpacing(3)
-        self.horizontalLayout.setMargin(0)
-        self.horizontalLayout.setObjectName(u'horizontalLayout')
-        self.ExportFileLabel = QtGui.QLabel(self.ExportFileWidget)
-        self.ExportFileLabel.setObjectName(u'ExportFileLabel')
-        self.horizontalLayout.addWidget(self.ExportFileLabel)
-        self.ExportFileLineEdit = QtGui.QLineEdit(self.ExportFileWidget)
-        self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit')
-        self.horizontalLayout.addWidget(self.ExportFileLineEdit)
-        self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget)
-        icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.ExportFileSelectPushButton.setIcon(icon1)
-        self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton')
-        self.horizontalLayout.addWidget(self.ExportFileSelectPushButton)
-        self.verticalLayout_5.addWidget(self.ExportFileWidget)
-        self.SongListFrame = QtGui.QFrame(OpenSongExportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SongListFrame.sizePolicy().hasHeightForWidth())
-        self.SongListFrame.setSizePolicy(sizePolicy)
-        self.SongListFrame.setFrameShape(QtGui.QFrame.Box)
-        self.SongListFrame.setFrameShadow(QtGui.QFrame.Raised)
-        self.SongListFrame.setObjectName(u'SongListFrame')
-        self.horizontalLayout_6 = QtGui.QHBoxLayout(self.SongListFrame)
-        self.horizontalLayout_6.setSpacing(8)
-        self.horizontalLayout_6.setMargin(8)
-        self.horizontalLayout_6.setObjectName(u'horizontalLayout_6')
-        self.ExportFileSongListWidget = QtGui.QWidget(self.SongListFrame)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ExportFileSongListWidget.sizePolicy().hasHeightForWidth())
-        self.ExportFileSongListWidget.setSizePolicy(sizePolicy)
-        self.ExportFileSongListWidget.setObjectName(u'ExportFileSongListWidget')
-        self.verticalLayout = QtGui.QVBoxLayout(self.ExportFileSongListWidget)
-        self.verticalLayout.setSpacing(6)
-        self.verticalLayout.setMargin(0)
-        self.verticalLayout.setObjectName(u'verticalLayout')
-        self.ExportListLabel = QtGui.QLabel(self.ExportFileSongListWidget)
-        self.ExportListLabel.setObjectName(u'ExportListLabel')
-        self.verticalLayout.addWidget(self.ExportListLabel)
-        self.ExportListTable = QtGui.QTableWidget(self.ExportFileSongListWidget)
-        self.ExportListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection)
-        self.ExportListTable.setShowGrid(False)
-        self.ExportListTable.setWordWrap(False)
-        self.ExportListTable.setCornerButtonEnabled(False)
-        self.ExportListTable.setObjectName(u'ExportListTable')
-        self.ExportListTable.setColumnCount(2)
-        self.ExportListTable.setRowCount(0)
-        item = QtGui.QTableWidgetItem()
-        self.ExportListTable.setHorizontalHeaderItem(0, item)
-        item = QtGui.QTableWidgetItem()
-        self.ExportListTable.setHorizontalHeaderItem(1, item)
-        self.verticalLayout.addWidget(self.ExportListTable)
-        self.ExportSelectAllWidget = QtGui.QWidget(self.ExportFileSongListWidget)
-        self.ExportSelectAllWidget.setObjectName(u'ExportSelectAllWidget')
-        self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ExportSelectAllWidget)
-        self.horizontalLayout_2.setSpacing(6)
-        self.horizontalLayout_2.setMargin(0)
-        self.horizontalLayout_2.setObjectName(u'horizontalLayout_2')
-        self.ExportSelectAllPushButton = QtGui.QPushButton(self.ExportSelectAllWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth())
-        self.ExportSelectAllPushButton.setSizePolicy(sizePolicy)
-        self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0))
-        icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(u':/exports/export_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.ExportSelectAllPushButton.setIcon(icon2)
-        self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton')
-        self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton)
-        spacerItem = QtGui.QSpacerItem(89, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem)
-        self.verticalLayout.addWidget(self.ExportSelectAllWidget)
-        self.exportFilterWidget = QtGui.QWidget(self.ExportFileSongListWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.exportFilterWidget.sizePolicy().hasHeightForWidth())
-        self.exportFilterWidget.setSizePolicy(sizePolicy)
-        self.exportFilterWidget.setMinimumSize(QtCore.QSize(0, 0))
-        self.exportFilterWidget.setObjectName(u'exportFilterWidget')
-        self.horizontalLayout_3 = QtGui.QHBoxLayout(self.exportFilterWidget)
-        self.horizontalLayout_3.setMargin(0)
-        self.horizontalLayout_3.setObjectName(u'horizontalLayout_3')
-        self.ExportFilterComboBox = QtGui.QComboBox(self.exportFilterWidget)
-        self.ExportFilterComboBox.setMinimumSize(QtCore.QSize(70, 0))
-        self.ExportFilterComboBox.setObjectName(u'ExportFilterComboBox')
-        self.ExportFilterComboBox.addItem(QtCore.QString())
-        self.ExportFilterComboBox.addItem(QtCore.QString())
-        self.ExportFilterComboBox.addItem(QtCore.QString())
-        self.horizontalLayout_3.addWidget(self.ExportFilterComboBox)
-        self.ExportFilterLineEdit = QtGui.QLineEdit(self.exportFilterWidget)
-        self.ExportFilterLineEdit.setObjectName(u'ExportFilterLineEdit')
-        self.horizontalLayout_3.addWidget(self.ExportFilterLineEdit)
-        self.verticalLayout.addWidget(self.exportFilterWidget)
-        self.horizontalLayout_6.addWidget(self.ExportFileSongListWidget)
-        self.AddSelectedWidget = QtGui.QWidget(self.SongListFrame)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.AddSelectedWidget.sizePolicy().hasHeightForWidth())
-        self.AddSelectedWidget.setSizePolicy(sizePolicy)
-        self.AddSelectedWidget.setObjectName(u'AddSelectedWidget')
-        self.verticalLayout_3 = QtGui.QVBoxLayout(self.AddSelectedWidget)
-        self.verticalLayout_3.setMargin(0)
-        self.verticalLayout_3.setObjectName(u'verticalLayout_3')
-        spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout_3.addItem(spacerItem1)
-        self.AddSelectedPushButton = QtGui.QPushButton(self.AddSelectedWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth())
-        self.AddSelectedPushButton.setSizePolicy(sizePolicy)
-        self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25))
-        icon3 = QtGui.QIcon()
-        icon3.addPixmap(QtGui.QPixmap(u':/exports/export_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.AddSelectedPushButton.setIcon(icon3)
-        self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton')
-        self.verticalLayout_3.addWidget(self.AddSelectedPushButton)
-        spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout_3.addItem(spacerItem2)
-        self.horizontalLayout_6.addWidget(self.AddSelectedWidget)
-        self.SelectedFileListWidget = QtGui.QWidget(self.SongListFrame)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedFileListWidget.sizePolicy().hasHeightForWidth())
-        self.SelectedFileListWidget.setSizePolicy(sizePolicy)
-        self.SelectedFileListWidget.setObjectName(u'SelectedFileListWidget')
-        self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedFileListWidget)
-        self.verticalLayout_2.setMargin(0)
-        self.verticalLayout_2.setObjectName(u'verticalLayout_2')
-        self.SelectedListLabel = QtGui.QLabel(self.SelectedFileListWidget)
-        self.SelectedListLabel.setObjectName(u'SelectedListLabel')
-        self.verticalLayout_2.addWidget(self.SelectedListLabel)
-        self.SelectedListTable = QtGui.QTableWidget(self.SelectedFileListWidget)
-        self.SelectedListTable.setSelectionMode(QtGui.QAbstractItemView.MultiSelection)
-        self.SelectedListTable.setShowGrid(False)
-        self.SelectedListTable.setWordWrap(False)
-        self.SelectedListTable.setCornerButtonEnabled(False)
-        self.SelectedListTable.setObjectName(u'SelectedListTable')
-        self.SelectedListTable.setColumnCount(2)
-        self.SelectedListTable.setRowCount(0)
-        item = QtGui.QTableWidgetItem()
-        self.SelectedListTable.setHorizontalHeaderItem(0, item)
-        item = QtGui.QTableWidgetItem()
-        self.SelectedListTable.setHorizontalHeaderItem(1, item)
-        self.verticalLayout_2.addWidget(self.SelectedListTable)
-        self.SelectedSelectAllWidget = QtGui.QWidget(self.SelectedFileListWidget)
-        self.SelectedSelectAllWidget.setObjectName(u'SelectedSelectAllWidget')
-        self.horizontalLayout_4 = QtGui.QHBoxLayout(self.SelectedSelectAllWidget)
-        self.horizontalLayout_4.setSpacing(6)
-        self.horizontalLayout_4.setMargin(0)
-        self.horizontalLayout_4.setObjectName(u'horizontalLayout_4')
-        self.SelectedSelectAllPushButton = QtGui.QPushButton(self.SelectedSelectAllWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedSelectAllPushButton.sizePolicy().hasHeightForWidth())
-        self.SelectedSelectAllPushButton.setSizePolicy(sizePolicy)
-        self.SelectedSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0))
-        self.SelectedSelectAllPushButton.setIcon(icon2)
-        self.SelectedSelectAllPushButton.setObjectName(u'SelectedSelectAllPushButton')
-        self.horizontalLayout_4.addWidget(self.SelectedSelectAllPushButton)
-        spacerItem3 = QtGui.QSpacerItem(92, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_4.addItem(spacerItem3)
-        self.verticalLayout_2.addWidget(self.SelectedSelectAllWidget)
-        self.SelectedRemoveSelectedWidget = QtGui.QWidget(self.SelectedFileListWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedWidget.sizePolicy().hasHeightForWidth())
-        self.SelectedRemoveSelectedWidget.setSizePolicy(sizePolicy)
-        self.SelectedRemoveSelectedWidget.setObjectName(u'SelectedRemoveSelectedWidget')
-        self.horizontalLayout_5 = QtGui.QHBoxLayout(self.SelectedRemoveSelectedWidget)
-        self.horizontalLayout_5.setMargin(0)
-        self.horizontalLayout_5.setObjectName(u'horizontalLayout_5')
-        self.SelectedRemoveSelectedButton = QtGui.QPushButton(self.SelectedRemoveSelectedWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth())
-        self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy)
-        self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0))
-        icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(u':/exports/export_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.SelectedRemoveSelectedButton.setIcon(icon4)
-        self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton')
-        self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton)
-        spacerItem4 = QtGui.QSpacerItem(49, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_5.addItem(spacerItem4)
-        self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget)
-        self.horizontalLayout_6.addWidget(self.SelectedFileListWidget)
-        self.verticalLayout_5.addWidget(self.SongListFrame)
-        self.ProgressGroupBox = QtGui.QGroupBox(OpenSongExportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth())
-        self.ProgressGroupBox.setSizePolicy(sizePolicy)
-        self.ProgressGroupBox.setObjectName(u'ProgressGroupBox')
-        self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox)
-        self.verticalLayout_4.setSpacing(8)
-        self.verticalLayout_4.setContentsMargins(8, 0, 8, 8)
-        self.verticalLayout_4.setObjectName(u'verticalLayout_4')
-        self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox)
-        self.ProgressLabel.setObjectName(u'ProgressLabel')
-        self.verticalLayout_4.addWidget(self.ProgressLabel)
-        self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox)
-        self.ProgressBar.setProperty(u'value', QtCore.QVariant(24))
-        self.ProgressBar.setObjectName(u'ProgressBar')
-        self.verticalLayout_4.addWidget(self.ProgressBar)
-        self.verticalLayout_5.addWidget(self.ProgressGroupBox)
-        self.ButtonBarWidget = QtGui.QWidget(OpenSongExportDialog)
-        self.ButtonBarWidget.setObjectName(u'ButtonBarWidget')
-        self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget)
-        self.horizontalLayout_7.setSpacing(8)
-        self.horizontalLayout_7.setMargin(0)
-        self.horizontalLayout_7.setObjectName(u'horizontalLayout_7')
-        spacerItem5 = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem5)
-        self.ExportPushButton = QtGui.QPushButton(self.ButtonBarWidget)
-        self.ExportPushButton.setObjectName(u'ExportPushButton')
-        self.horizontalLayout_7.addWidget(self.ExportPushButton)
-        self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget)
-        self.ClosePushButton.setObjectName(u'ClosePushButton')
-        self.horizontalLayout_7.addWidget(self.ClosePushButton)
-        self.verticalLayout_5.addWidget(self.ButtonBarWidget)
-
-        self.retranslateUi(OpenSongExportDialog)
-        QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongExportDialog.close)
-        QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll)
-        QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll)
-        QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear)
-        QtCore.QMetaObject.connectSlotsByName(OpenSongExportDialog)
-
-    def retranslateUi(self, OpenSongExportDialog):
-        OpenSongExportDialog.setWindowTitle(
-            translate(u'SongsPlugin.OpenSongExportForm', u'OpenSong Song Exporter'))
-        self.ExportFileLabel.setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Select OpenSong song folder:'))
-        self.ExportListLabel.setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Full Song List'))
-        self.ExportListTable.horizontalHeaderItem(0).setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Song Title'))
-        self.ExportListTable.horizontalHeaderItem(1).setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Author'))
-        self.ExportSelectAllPushButton.setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Select All'))
-        self.ExportFilterComboBox.setItemText(0, 
-            translate(u'SongsPlugin.OpenSongExportForm', u'Lyrics'))
-        self.ExportFilterComboBox.setItemText(1, 
-            translate(u'SongsPlugin.OpenSongExportForm', u'Title'))
-        self.ExportFilterComboBox.setItemText(2, 
-            translate(u'SongsPlugin.OpenSongExportForm', u'Author'))
-        self.SelectedListLabel.setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Song Export List'))
-        self.SelectedListTable.horizontalHeaderItem(0).setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Song Title'))
-        self.SelectedListTable.horizontalHeaderItem(1).setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Author'))
-        self.SelectedSelectAllPushButton.setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Select All'))
-        self.SelectedRemoveSelectedButton.setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Remove Selected'))
-        self.ProgressGroupBox.setTitle(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Progress:'))
-        self.ProgressLabel.setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Ready to export'))
-        self.ExportPushButton.setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Export'))
-        self.ClosePushButton.setText(
-            translate(u'SongsPlugin.OpenSongExportForm', u'Close'))

=== removed file 'openlp/plugins/songs/forms/opensongexportform.py'
--- openlp/plugins/songs/forms/opensongexportform.py	2010-03-21 23:58:01 +0000
+++ openlp/plugins/songs/forms/opensongexportform.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# -*- 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                          #
-###############################################################################
-
-from PyQt4 import QtGui
-from openlp.plugins.songs.forms.opensongexportdialog import Ui_OpenSongExportDialog
-
-class OpenSongExportForm(QtGui.QDialog, Ui_OpenSongExportDialog):
-
-    def __init__(self, parent=None):
-        QtGui.QDialog.__init__(self, parent)
-        self.setupUi(self)

=== removed file 'openlp/plugins/songs/forms/opensongimportdialog.py'
--- openlp/plugins/songs/forms/opensongimportdialog.py	2010-06-06 14:22:00 +0000
+++ openlp/plugins/songs/forms/opensongimportdialog.py	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-# -*- 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                          #
-###############################################################################
-
-from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
-
-class Ui_OpenSongImportDialog(object):
-    def setupUi(self, OpenSongImportDialog):
-        OpenSongImportDialog.setObjectName(u'OpenSongImportDialog')
-        OpenSongImportDialog.resize(481, 172)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        OpenSongImportDialog.setWindowIcon(icon)
-        self.verticalLayout = QtGui.QVBoxLayout(OpenSongImportDialog)
-        self.verticalLayout.setSpacing(6)
-        self.verticalLayout.setMargin(8)
-        self.verticalLayout.setObjectName(u'verticalLayout')
-        self.ImportFileWidget = QtGui.QWidget(OpenSongImportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ImportFileWidget.sizePolicy().hasHeightForWidth())
-        self.ImportFileWidget.setSizePolicy(sizePolicy)
-        self.ImportFileWidget.setObjectName(u'ImportFileWidget')
-        self.horizontalLayout = QtGui.QHBoxLayout(self.ImportFileWidget)
-        self.horizontalLayout.setSpacing(6)
-        self.horizontalLayout.setMargin(0)
-        self.horizontalLayout.setObjectName(u'horizontalLayout')
-        self.ImportFileLabel = QtGui.QLabel(self.ImportFileWidget)
-        self.ImportFileLabel.setObjectName(u'ImportFileLabel')
-        self.horizontalLayout.addWidget(self.ImportFileLabel)
-        self.ImportFileLineEdit = QtGui.QLineEdit(self.ImportFileWidget)
-        self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit')
-        self.horizontalLayout.addWidget(self.ImportFileLineEdit)
-        self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget)
-        icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.ImportFileSelectPushButton.setIcon(icon1)
-        self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton')
-        self.horizontalLayout.addWidget(self.ImportFileSelectPushButton)
-        self.verticalLayout.addWidget(self.ImportFileWidget)
-        self.ProgressGroupBox = QtGui.QGroupBox(OpenSongImportDialog)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ProgressGroupBox.sizePolicy().hasHeightForWidth())
-        self.ProgressGroupBox.setSizePolicy(sizePolicy)
-        self.ProgressGroupBox.setObjectName(u'ProgressGroupBox')
-        self.verticalLayout_4 = QtGui.QVBoxLayout(self.ProgressGroupBox)
-        self.verticalLayout_4.setSpacing(6)
-        self.verticalLayout_4.setContentsMargins(6, 0, 8, 8)
-        self.verticalLayout_4.setObjectName(u'verticalLayout_4')
-        self.ProgressLabel = QtGui.QLabel(self.ProgressGroupBox)
-        self.ProgressLabel.setObjectName(u'ProgressLabel')
-        self.verticalLayout_4.addWidget(self.ProgressLabel)
-        self.ProgressBar = QtGui.QProgressBar(self.ProgressGroupBox)
-        self.ProgressBar.setProperty(u'value', QtCore.QVariant(24))
-        self.ProgressBar.setObjectName(u'ProgressBar')
-        self.verticalLayout_4.addWidget(self.ProgressBar)
-        self.verticalLayout.addWidget(self.ProgressGroupBox)
-        self.ButtonBarWidget = QtGui.QWidget(OpenSongImportDialog)
-        self.ButtonBarWidget.setObjectName(u'ButtonBarWidget')
-        self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget)
-        self.horizontalLayout_7.setSpacing(8)
-        self.horizontalLayout_7.setMargin(0)
-        self.horizontalLayout_7.setObjectName(u'horizontalLayout_7')
-        spacerItem = QtGui.QSpacerItem(288, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem)
-        self.ImportPushButton = QtGui.QPushButton(self.ButtonBarWidget)
-        self.ImportPushButton.setObjectName(u'ImportPushButton')
-        self.horizontalLayout_7.addWidget(self.ImportPushButton)
-        self.ClosePushButton = QtGui.QPushButton(self.ButtonBarWidget)
-        self.ClosePushButton.setObjectName(u'ClosePushButton')
-        self.horizontalLayout_7.addWidget(self.ClosePushButton)
-        self.verticalLayout.addWidget(self.ButtonBarWidget)
-
-        self.retranslateUi(OpenSongImportDialog)
-        QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongImportDialog.close)
-        QtCore.QMetaObject.connectSlotsByName(OpenSongImportDialog)
-
-    def retranslateUi(self, OpenSongImportDialog):
-        OpenSongImportDialog.setWindowTitle(
-            translate(u'SongsPlugin.OpenSongImportForm', u'OpenSong Song Importer'))
-        self.ImportFileLabel.setText(
-            translate(u'SongsPlugin.OpenSongImportForm', u'OpenSong Folder:'))
-        self.ProgressGroupBox.setTitle(
-            translate(u'SongsPlugin.OpenSongImportForm', u'Progress:'))
-        self.ProgressLabel.setText(
-            translate(u'SongsPlugin.OpenSongImportForm', u'Ready to import'))
-        self.ImportPushButton.setText(
-            translate(u'SongsPlugin.OpenSongImportForm', u'Import'))
-        self.ClosePushButton.setText(
-            translate(u'SongsPlugin.OpenSongImportForm', u'Close'))

=== removed file 'openlp/plugins/songs/forms/opensongimportform.py'
--- openlp/plugins/songs/forms/opensongimportform.py	2010-03-21 23:58:01 +0000
+++ openlp/plugins/songs/forms/opensongimportform.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# -*- 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                          #
-###############################################################################
-
-from PyQt4 import QtGui
-from openlp.plugins.songs.forms.opensongimportdialog import Ui_OpenSongImportDialog
-
-class OpenSongImportForm(QtGui.QDialog, Ui_OpenSongImportDialog):
-
-    def __init__(self, parent=None):
-        QtGui.QDialog.__init__(self, parent)
-        self.setupUi(self)

=== removed file 'resources/forms/openlpexportform.ui'
--- resources/forms/openlpexportform.ui	2009-10-23 18:48:49 +0000
+++ resources/forms/openlpexportform.ui	1970-01-01 00:00:00 +0000
@@ -1,613 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OpenLPExportDialog</class>
- <widget class="QDialog" name="OpenLPExportDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>473</width>
-    <height>459</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>openlp.org Song Exporter</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_5">
-   <property name="margin">
-    <number>8</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="ExportFileWidget" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>3</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="ExportFileLabel">
-        <property name="text">
-         <string>Select openlp.org export filename:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="ExportFileLineEdit"/>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ExportFileSelectPushButton">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../images/openlp-2.qrc">
-          <normaloff>:/exports/export_load.png</normaloff>:/exports/export_load.png</iconset>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="SongListFrame">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_6">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="margin">
-       <number>8</number>
-      </property>
-      <item>
-       <widget class="QWidget" name="ExportFileSongListWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="ExportListLabel">
-           <property name="text">
-            <string>Full Song List</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTableWidget" name="ExportListTable">
-           <property name="selectionMode">
-            <enum>QAbstractItemView::MultiSelection</enum>
-           </property>
-           <property name="showGrid">
-            <bool>false</bool>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-           <property name="cornerButtonEnabled">
-            <bool>false</bool>
-           </property>
-           <column>
-            <property name="text">
-             <string>Song Title</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>Author</string>
-            </property>
-           </column>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="ExportSelectAllWidget" native="true">
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <property name="spacing">
-             <number>6</number>
-            </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="ExportSelectAllPushButton">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>100</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Select All</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../images/openlp-2.qrc">
-                <normaloff>:/exports/export_selectall.png</normaloff>:/exports/export_selectall.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="ExportSelectAllHSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Expanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>89</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="exportFilterWidget" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QComboBox" name="ExportFilterComboBox">
-              <property name="minimumSize">
-               <size>
-                <width>70</width>
-                <height>0</height>
-               </size>
-              </property>
-              <item>
-               <property name="text">
-                <string>Lyrics</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Title</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Author</string>
-               </property>
-              </item>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="ExportFilterLineEdit"/>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-        <zorder>exportFilterWidget</zorder>
-        <zorder>ExportListTable</zorder>
-        <zorder>ExportListLabel</zorder>
-        <zorder>ExportSelectAllWidget</zorder>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="AddSelectedWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <spacer name="AddSelectedTopVSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="AddSelectedPushButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>25</width>
-             <height>25</height>
-            </size>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset resource="../images/openlp-2.qrc">
-             <normaloff>:/exports/export_move_to_list.png</normaloff>:/exports/export_move_to_list.png</iconset>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="AddSelectedBottomVSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="SelectedFileListWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="SelectedListLabel">
-           <property name="text">
-            <string>Song Export List</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTableWidget" name="SelectedListTable">
-           <property name="selectionMode">
-            <enum>QAbstractItemView::MultiSelection</enum>
-           </property>
-           <property name="showGrid">
-            <bool>false</bool>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-           <property name="cornerButtonEnabled">
-            <bool>false</bool>
-           </property>
-           <column>
-            <property name="text">
-             <string>Song Title</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>Author</string>
-            </property>
-           </column>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="SelectedSelectAllWidget" native="true">
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <property name="spacing">
-             <number>6</number>
-            </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="SelectedSelectAllPushButton">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>100</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Select All</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../images/openlp-2.qrc">
-                <normaloff>:/exports/export_selectall.png</normaloff>:/exports/export_selectall.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="SelectedSelectAllHSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Expanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>92</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="SelectedRemoveSelectedWidget" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="SelectedRemoveSelectedButton">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>140</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Remove Selected</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../images/openlp-2.qrc">
-                <normaloff>:/exports/export_remove.png</normaloff>:/exports/export_remove.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="SelectedRemoveSelectedHSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>49</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-     <zorder>ExportFileSongListWidget</zorder>
-     <zorder>SelectedFileListWidget</zorder>
-     <zorder>AddSelectedWidget</zorder>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="ProgressGroupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Progress:</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="leftMargin">
-       <number>8</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>8</number>
-      </property>
-      <property name="bottomMargin">
-       <number>8</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="ProgressLabel">
-        <property name="text">
-         <string>Ready to export</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QProgressBar" name="ProgressBar">
-        <property name="value">
-         <number>24</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="ButtonBarWidget" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout_7">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <spacer name="ButtonBarHSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>288</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ExportPushButton">
-        <property name="text">
-         <string>Export</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ClosePushButton">
-        <property name="text">
-         <string>Close</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../images/openlp-2.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>ClosePushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>OpenLPExportDialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>436</x>
-     <y>436</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>462</x>
-     <y>455</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>ExportSelectAllPushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>ExportListTable</receiver>
-   <slot>selectAll()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>75</x>
-     <y>281</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>88</x>
-     <y>176</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>SelectedSelectAllPushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>SelectedListTable</receiver>
-   <slot>selectAll()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>311</x>
-     <y>277</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>339</x>
-     <y>190</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>SelectedRemoveSelectedButton</sender>
-   <signal>clicked()</signal>
-   <receiver>SelectedListTable</receiver>
-   <slot>clear()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>379</x>
-     <y>308</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>389</x>
-     <y>188</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

=== removed file 'resources/forms/openlpimportform.ui'
--- resources/forms/openlpimportform.ui	2009-10-23 18:48:49 +0000
+++ resources/forms/openlpimportform.ui	1970-01-01 00:00:00 +0000
@@ -1,613 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OpenLPImportDialog</class>
- <widget class="QDialog" name="OpenLPImportDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>473</width>
-    <height>459</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>openlp.org Song Importer</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_5">
-   <property name="margin">
-    <number>8</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="ImportFileWidget" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>3</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="ImportFileLabel">
-        <property name="text">
-         <string>Select openlp.org songfile to import:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="ImportFileLineEdit"/>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ImportFileSelectPushButton">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../images/openlp-2.qrc">
-          <normaloff>:/imports/import_load.png</normaloff>:/imports/import_load.png</iconset>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="SongListFrame">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_6">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="margin">
-       <number>8</number>
-      </property>
-      <item>
-       <widget class="QWidget" name="ImportFileSongListWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="ImportListLabel">
-           <property name="text">
-            <string>Import File Song List</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTableWidget" name="ImportListTable">
-           <property name="selectionMode">
-            <enum>QAbstractItemView::MultiSelection</enum>
-           </property>
-           <property name="showGrid">
-            <bool>false</bool>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-           <property name="cornerButtonEnabled">
-            <bool>false</bool>
-           </property>
-           <column>
-            <property name="text">
-             <string>Song Title</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>Author</string>
-            </property>
-           </column>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="ImportSelectAllWidget" native="true">
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <property name="spacing">
-             <number>6</number>
-            </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="ImportSelectAllPushButton">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>100</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Select All</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../images/openlp-2.qrc">
-                <normaloff>:/imports/import_selectall.png</normaloff>:/imports/import_selectall.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="ImportSelectAllHSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Expanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>89</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="importFilterWidget" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QComboBox" name="ImportFilterComboBox">
-              <property name="minimumSize">
-               <size>
-                <width>70</width>
-                <height>0</height>
-               </size>
-              </property>
-              <item>
-               <property name="text">
-                <string>Lyrics</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Title</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Author</string>
-               </property>
-              </item>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="importFilterLineEdit"/>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-        <zorder>ImportListTable</zorder>
-        <zorder>ImportListLabel</zorder>
-        <zorder>importFilterWidget</zorder>
-        <zorder>ImportSelectAllWidget</zorder>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="AddSelectedWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <spacer name="AddSelectedTopVSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="AddSelectedPushButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>25</width>
-             <height>25</height>
-            </size>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset resource="../images/openlp-2.qrc">
-             <normaloff>:/imports/import_move_to_list.png</normaloff>:/imports/import_move_to_list.png</iconset>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="AddSelectedBottomVSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="SelectedFileListWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="SelectedListLabel">
-           <property name="text">
-            <string>Song Import List</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTableWidget" name="SelectedListTable">
-           <property name="selectionMode">
-            <enum>QAbstractItemView::MultiSelection</enum>
-           </property>
-           <property name="showGrid">
-            <bool>false</bool>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-           <property name="cornerButtonEnabled">
-            <bool>false</bool>
-           </property>
-           <column>
-            <property name="text">
-             <string>Song Title</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>Author</string>
-            </property>
-           </column>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="SelectedSelectAllWidget" native="true">
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <property name="spacing">
-             <number>6</number>
-            </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="SelectedSelectAllPushButton">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>100</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Select All</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../images/openlp-2.qrc">
-                <normaloff>:/imports/import_selectall.png</normaloff>:/imports/import_selectall.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="SelectedSelectAllHSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Expanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>92</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="SelectedRemoveSelectedWidget" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="SelectedRemoveSelectedButton">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>140</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Remove Selected</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../images/openlp-2.qrc">
-                <normaloff>:/imports/import_remove.png</normaloff>:/imports/import_remove.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="SelectedRemoveSelectedHSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>49</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-     <zorder>ImportFileSongListWidget</zorder>
-     <zorder>SelectedFileListWidget</zorder>
-     <zorder>AddSelectedWidget</zorder>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="ProgressGroupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Progress:</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="leftMargin">
-       <number>8</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>8</number>
-      </property>
-      <property name="bottomMargin">
-       <number>8</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="ProgressLabel">
-        <property name="text">
-         <string>Ready to import</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QProgressBar" name="ProgressBar">
-        <property name="value">
-         <number>24</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="ButtonBarWidget" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout_7">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <spacer name="ButtonBarHSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>288</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ImportPushButton">
-        <property name="text">
-         <string>Import</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ClosePushButton">
-        <property name="text">
-         <string>Close</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../images/openlp-2.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>ClosePushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>OpenLPImportDialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>436</x>
-     <y>436</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>462</x>
-     <y>455</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>ImportSelectAllPushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>ImportListTable</receiver>
-   <slot>selectAll()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>75</x>
-     <y>281</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>88</x>
-     <y>176</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>SelectedSelectAllPushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>SelectedListTable</receiver>
-   <slot>selectAll()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>311</x>
-     <y>277</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>339</x>
-     <y>190</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>SelectedRemoveSelectedButton</sender>
-   <signal>clicked()</signal>
-   <receiver>SelectedListTable</receiver>
-   <slot>clear()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>379</x>
-     <y>308</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>389</x>
-     <y>188</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

=== removed file 'resources/forms/opensongexportform.ui'
--- resources/forms/opensongexportform.ui	2009-10-23 18:48:49 +0000
+++ resources/forms/opensongexportform.ui	1970-01-01 00:00:00 +0000
@@ -1,613 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OpenSongExportDialog</class>
- <widget class="QDialog" name="OpenSongExportDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>473</width>
-    <height>459</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>OpenSong Song Exporter</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_5">
-   <property name="margin">
-    <number>8</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="ExportFileWidget" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>3</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="ExportFileLabel">
-        <property name="text">
-         <string>Select OpenSong song folder:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="ExportFileLineEdit"/>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ExportFileSelectPushButton">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../images/openlp-2.qrc">
-          <normaloff>:/exports/export_load.png</normaloff>:/exports/export_load.png</iconset>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="SongListFrame">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_6">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="margin">
-       <number>8</number>
-      </property>
-      <item>
-       <widget class="QWidget" name="ExportFileSongListWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="ExportListLabel">
-           <property name="text">
-            <string>Full Song List</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTableWidget" name="ExportListTable">
-           <property name="selectionMode">
-            <enum>QAbstractItemView::MultiSelection</enum>
-           </property>
-           <property name="showGrid">
-            <bool>false</bool>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-           <property name="cornerButtonEnabled">
-            <bool>false</bool>
-           </property>
-           <column>
-            <property name="text">
-             <string>Song Title</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>Author</string>
-            </property>
-           </column>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="ExportSelectAllWidget" native="true">
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <property name="spacing">
-             <number>6</number>
-            </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="ExportSelectAllPushButton">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>100</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Select All</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../images/openlp-2.qrc">
-                <normaloff>:/exports/export_selectall.png</normaloff>:/exports/export_selectall.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="ExportSelectAllHSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Expanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>89</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="exportFilterWidget" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QComboBox" name="ExportFilterComboBox">
-              <property name="minimumSize">
-               <size>
-                <width>70</width>
-                <height>0</height>
-               </size>
-              </property>
-              <item>
-               <property name="text">
-                <string>Lyrics</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Title</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Author</string>
-               </property>
-              </item>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="ExportFilterLineEdit"/>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-        <zorder>exportFilterWidget</zorder>
-        <zorder>ExportListTable</zorder>
-        <zorder>ExportListLabel</zorder>
-        <zorder>ExportSelectAllWidget</zorder>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="AddSelectedWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <spacer name="AddSelectedTopVSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="AddSelectedPushButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>25</width>
-             <height>25</height>
-            </size>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset resource="../images/openlp-2.qrc">
-             <normaloff>:/exports/export_move_to_list.png</normaloff>:/exports/export_move_to_list.png</iconset>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="AddSelectedBottomVSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="SelectedFileListWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="SelectedListLabel">
-           <property name="text">
-            <string>Song Export List</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTableWidget" name="SelectedListTable">
-           <property name="selectionMode">
-            <enum>QAbstractItemView::MultiSelection</enum>
-           </property>
-           <property name="showGrid">
-            <bool>false</bool>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-           <property name="cornerButtonEnabled">
-            <bool>false</bool>
-           </property>
-           <column>
-            <property name="text">
-             <string>Song Title</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>Author</string>
-            </property>
-           </column>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="SelectedSelectAllWidget" native="true">
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <property name="spacing">
-             <number>6</number>
-            </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="SelectedSelectAllPushButton">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>100</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Select All</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../images/openlp-2.qrc">
-                <normaloff>:/exports/export_selectall.png</normaloff>:/exports/export_selectall.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="SelectedSelectAllHSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Expanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>92</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="SelectedRemoveSelectedWidget" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="SelectedRemoveSelectedButton">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>140</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Remove Selected</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../images/openlp-2.qrc">
-                <normaloff>:/exports/export_remove.png</normaloff>:/exports/export_remove.png</iconset>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="SelectedRemoveSelectedHSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>49</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-     <zorder>ExportFileSongListWidget</zorder>
-     <zorder>SelectedFileListWidget</zorder>
-     <zorder>AddSelectedWidget</zorder>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="ProgressGroupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Progress:</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="leftMargin">
-       <number>8</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>8</number>
-      </property>
-      <property name="bottomMargin">
-       <number>8</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="ProgressLabel">
-        <property name="text">
-         <string>Ready to export</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QProgressBar" name="ProgressBar">
-        <property name="value">
-         <number>24</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="ButtonBarWidget" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout_7">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <spacer name="ButtonBarHSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>288</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ExportPushButton">
-        <property name="text">
-         <string>Export</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ClosePushButton">
-        <property name="text">
-         <string>Close</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../images/openlp-2.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>ClosePushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>OpenSongExportDialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>436</x>
-     <y>436</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>462</x>
-     <y>455</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>ExportSelectAllPushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>ExportListTable</receiver>
-   <slot>selectAll()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>75</x>
-     <y>281</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>88</x>
-     <y>176</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>SelectedSelectAllPushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>SelectedListTable</receiver>
-   <slot>selectAll()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>311</x>
-     <y>277</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>339</x>
-     <y>190</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>SelectedRemoveSelectedButton</sender>
-   <signal>clicked()</signal>
-   <receiver>SelectedListTable</receiver>
-   <slot>clear()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>379</x>
-     <y>308</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>389</x>
-     <y>188</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

=== removed file 'resources/forms/opensongimportform.ui'
--- resources/forms/opensongimportform.ui	2009-10-23 18:48:49 +0000
+++ resources/forms/opensongimportform.ui	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OpenSongImportDialog</class>
- <widget class="QDialog" name="OpenSongImportDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>481</width>
-    <height>172</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>OpenSong Song Importer</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <property name="margin">
-    <number>8</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="ImportFileWidget" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="ImportFileLabel">
-        <property name="text">
-         <string>OpenSong Folder:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="ImportFileLineEdit"/>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ImportFileSelectPushButton">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../images/openlp-2.qrc">
-          <normaloff>:/imports/import_load.png</normaloff>:/imports/import_load.png</iconset>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="ProgressGroupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Progress:</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="leftMargin">
-       <number>6</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>8</number>
-      </property>
-      <property name="bottomMargin">
-       <number>8</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="ProgressLabel">
-        <property name="text">
-         <string>Ready to import</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QProgressBar" name="ProgressBar">
-        <property name="value">
-         <number>24</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="ButtonBarWidget" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout_7">
-      <property name="spacing">
-       <number>8</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <spacer name="ButtonBarHSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>288</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ImportPushButton">
-        <property name="text">
-         <string>Import</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="ClosePushButton">
-        <property name="text">
-         <string>Close</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../images/openlp-2.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>ClosePushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>OpenSongImportDialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>424</x>
-     <y>132</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>288</x>
-     <y>-25</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>


Follow ups