Comment 14.02.2011

openlp/plugins/songs/forms/songimportform.py

@@ -140,6 +140,12 @@ class SongImportForm(OpenLPWizard):
         QtCore.QObject.connect(self.songBeamerRemoveButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onSongBeamerRemoveButtonClicked)
+        QtCore.QObject.connect(self.foilPresenterAddButton,
+            QtCore.SIGNAL(u'clicked()'),
+            self.onFoilPresenterAddButtonClicked), 
+        QtCore.QObject.connect(self.foilPresenterRemoveButton,
+            QtCore.SIGNAL(u'clicked()'),
+            self.onFoilPresenterRemoveButtonClicked)
 
     def addCustomPages(self):
         """
@@ -186,6 +192,8 @@ class SongImportForm(OpenLPWizard):
         self.addSingleFileSelectItem(u'ew')
         # Words of Worship
         self.addMultiFileSelectItem(u'songBeamer')
+        # Foilpresenter
+        self.addMultiFileSelectItem(u'foilPresenter')
 #        Commented out for future use.
 #        self.addSingleFileSelectItem(u'csv', u'CSV')
         self.sourceLayout.addLayout(self.formatStack)
@@ -236,6 +244,8 @@ class SongImportForm(OpenLPWizard):
             translate('SongsPlugin.ImportWizardForm', 'EasyWorship'))
         self.formatComboBox.setItemText(10,
             translate('SongsPlugin.ImportWizardForm', 'SongBeamer'))
+        self.formatComboBox.setItemText(11,
+            translate('SongsPlugin.ImportWizardForm', 'FoilPresenter'))
 #        self.formatComboBox.setItemText(11,
 #            translate('SongsPlugin.ImportWizardForm', 'CSV'))
         self.openLP2FilenameLabel.setText(
@@ -300,6 +310,10 @@ class SongImportForm(OpenLPWizard):
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.songBeamerRemoveButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+        self.foilPresenterAddButton.setText(
+            translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+        self.foilPresenterRemoveButton.setText(
+            translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
 #        self.csvFilenameLabel.setText(
 #            translate('SongsPlugin.ImportWizardForm', 'Filename:'))
 #        self.csvBrowseButton.setText(
@@ -447,6 +461,16 @@ class SongImportForm(OpenLPWizard):
                         'file to import from.'))
                     self.songBeamerAddButton.setFocus()
                     return False
+            elif source_format == SongFormat.FoilPresenter:
+                if self.foilPresenterFileListWidget.count() == 0:
+                    criticalErrorMessageBox(
+                        translate('SongsPlugin.ImportWizardForm',
+                        'No Foilpresenter Files Selected'),
+                        translate('SongsPlugin.ImportWizardForm',
+                        'You need to add at least one Foilpresenter '
+                        'song file to import from.'))
+                    self.foilPresenterAddButton.setFocus()
+                    return False
             return True
         elif self.currentPage() == self.progressPage:
             return True
@@ -682,6 +706,22 @@ class SongImportForm(OpenLPWizard):
         """
         self.removeSelectedItems(self.songBeamerFileListWidget)
 
+    def onFoilPresenterAddButtonClicked(self):
+        """
+        Get FoilPresenter song database files
+        """
+        self.getFiles(
+            translate('SongsPlugin.ImportWizardForm',
+            'Select FoilPresenter Files'),
+            self.foilPresenterFileListWidget
+        )
+
+    def onFoilPresenterRemoveButtonClicked(self):
+        """
+        Remove selected FoilPresenter files from the import list
+        """
+        self.removeSelectedItems(self.foilPresenterFileListWidget)
+
     def registerFields(self):
         """
         Register song import wizard fields.
@@ -707,6 +747,7 @@ class SongImportForm(OpenLPWizard):
         self.easiSlidesFilenameEdit.setText(u'')
         self.ewFilenameEdit.setText(u'')
         self.songBeamerFileListWidget.clear()
+        self.foilPresenterFileListWidget.clear()
         #self.csvFilenameEdit.setText(u'')
 
     def preWizard(self):
@@ -783,6 +824,11 @@ class SongImportForm(OpenLPWizard):
             importer = self.plugin.importSongs(SongFormat.SongBeamer,
                 filenames=self.getListOfFiles(self.songBeamerFileListWidget)
             )
+        elif source_format == SongFormat.FoilPresenter:
+            # Import Foilpresenter songs
+            importer = self.plugin.importSongs(SongFormat.FoilPresenter,
+                filenames=self.getListOfFiles(self.foilPresenterFileListWidget)
+            )
         if importer.do_import():
             # reload songs
             self.progressLabel.setText(

openlp/plugins/songs/lib/importer.py

@@ -34,6 +34,7 @@ from wowimport import WowImport
 from cclifileimport import CCLIFileImport
 from ewimport import EasyWorshipSongImport
 from songbeamerimport import SongBeamerImport
+from foilpresenterimport import FoilPresenterImport
 # Imports that might fail
 try:
     from olp1import import OpenLP1SongImport
@@ -71,6 +72,7 @@ class SongFormat(object):
     EasiSlides = 8
     EasyWorship = 9
     SongBeamer = 10
+    FoilPresenter = 11
 
     @staticmethod
     def get_class(format):
@@ -102,6 +104,8 @@ class SongFormat(object):
             return EasyWorshipSongImport
         elif format == SongFormat.SongBeamer:
             return SongBeamerImport
+        elif format == SongFormat.FoilPresenter:
+            return FoilPresenterImport
         return None
 
     @staticmethod
@@ -120,7 +124,8 @@ class SongFormat(object):
             SongFormat.Generic,
             SongFormat.EasiSlides,
             SongFormat.EasyWorship,
-            SongFormat.SongBeamer
+            SongFormat.SongBeamer,
+            SongFormat.FoilPresenter
         ]
 
     @staticmethod