Fix file extensions

bzr-revno: 1157

openlp/plugins/bibles/forms/bibleimportform.py

@@ -253,14 +253,16 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
         """
         self.getFileName(
             translate('BiblesPlugin.ImportWizardForm', 'Open Books CSV File'),
-            self.booksLocationEdit)
+            self.booksLocationEdit, u'%s (*.csv)'
+            % translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
 
     def onCsvVersesFileButtonClicked(self):
         """
         Show the file open dialog for the verses CSV file.
         """
         self.getFileName(translate('BiblesPlugin.ImportWizardForm',
-            'Open Verses CSV File'), self.csvVerseLocationEdit)
+            'Open Verses CSV File'), self.csvVerseLocationEdit, u'%s (*.csv)'
+            % translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
 
     def onOpenSongBrowseButtonClicked(self):
         """
@@ -276,7 +278,9 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
         """
         self.getFileName(
             translate('BiblesPlugin.ImportWizardForm',
-            'Open openlp.org 1.x Bible'), self.openlp1LocationEdit)
+            'Open openlp.org 1.x Bible'), self.openlp1LocationEdit,
+            u'%s (*.bible)' % translate('BiblesPlugin.ImportWizardForm',
+            'openlp.org 1.x bible'))
 
     def onCurrentIdChanged(self, pageId):
         if pageId == 3:
@@ -402,9 +406,29 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
             if books_file:
                 books_file.close()
 
-    def getFileName(self, title, editbox):
+    def getFileName(self, title, editbox, filters=u''):
+        """
+        Opens a QFileDialog and saves the filename to the given editbox.
+
+        ``title``
+            The title of the dialog (unicode).
+
+        ``editbox``
+            A editbox (QLineEdit).
+
+        ``filters``
+            The file extension filters. It should contain the file description as
+            well as the file extension. For example::
+
+                u'openlp.org 1.x bible (*.bible)'
+        """
+        if filters:
+            filters += u';;'
+        filters += u'%s (*)' % translate('BiblesPlugin.ImportWizardForm',
+            'All Files')
         filename = QtGui.QFileDialog.getOpenFileName(self, title,
-            SettingsManager.get_last_dir(self.bibleplugin.settingsSection, 1))
+            os.path.dirname(SettingsManager.get_last_dir(
+            self.bibleplugin.settingsSection, 1)), filters)
         if filename:
             editbox.setText(filename)
             SettingsManager.set_last_dir(

openlp/plugins/songs/forms/songimportform.py

@@ -169,15 +169,15 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
                     self.openLP1BrowseButton.setFocus()
                     return False
             elif source_format == SongFormat.OpenLyrics:
-                #if self.openLyricsFileListWidget.count() == 0:
+#                if self.openLyricsFileListWidget.count() == 0:
-                #    QtGui.QMessageBox.critical(self,
+#                    QtGui.QMessageBox.critical(self,
-                #        translate('SongsPlugin.ImportWizardForm',
+#                        translate('SongsPlugin.ImportWizardForm',
-                #            'No OpenLyrics Files Selected'),
+#                        'No OpenLyrics Files Selected'),
-                #        translate('SongsPlugin.ImportWizardForm',
+#                        translate('SongsPlugin.ImportWizardForm',
-                #            'You need to add at least one OpenLyrics '
+#                        'You need to add at least one OpenLyrics '
-                #            'song file to import from.'))
+#                        'song file to import from.'))
-                #    self.openLyricsAddButton.setFocus()
+#                    self.openLyricsAddButton.setFocus()
-                #    return False
+#                    return False
                 return False
             elif source_format == SongFormat.OpenSong:
                 if self.openSongFileListWidget.count() == 0:
@@ -254,24 +254,57 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
             # Progress page
             return True
 
-    def getFileName(self, title, editbox,
+    def getFileName(self, title, editbox, filters=u''):
-        filters = '%s (*)' % translate('SongsPlugin.ImportWizardForm',
+        """
-            'All Files')):
+        Opens a QFileDialog and writes the filename to the given editbox.
+
+        ``title``
+            The title of the dialog (unicode).
+
+        ``editbox``
+            A editbox (QLineEdit).
+
+        ``filters``
+            The file extension filters. It should contain the file descriptions
+            as well as the file extensions. For example::
+
+                u'OpenLP 2.0 Databases (*.sqlite)'
+        """
+        if filters:
+            filters += u';;'
+        filters += u'%s (*)' % translate('SongsPlugin.ImportWizardForm',
+            'All Files')
         filename = QtGui.QFileDialog.getOpenFileName(self, title,
-            SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
+            os.path.dirname(SettingsManager.get_last_dir(
-            filters)
+            self.plugin.settingsSection, 1)), filters)
         if filename:
             editbox.setText(filename)
-            SettingsManager.set_last_dir(
+            SettingsManager.set_last_dir(self.plugin.settingsSection,
-                self.plugin.settingsSection,
                 os.path.split(unicode(filename))[0], 1)
 
-    def getFiles(self, title, listbox,
+    def getFiles(self, title, listbox, filters=u''):
-        filters = u'%s (*)' % translate('SongsPlugin.ImportWizardForm',
+        """
-            'All Files')):
+        Opens a QFileDialog and writes the filenames to the given listbox.
+
+        ``title``
+            The title of the dialog (unicode).
+
+        ``listbox``
+            A listbox (QListWidget).
+
+        ``filters``
+            The file extension filters. It should contain the file descriptions
+            as well as the file extensions. For example::
+
+                u'SongBeamer files (*.sng)'
+        """
+        if filters:
+            filters += u';;'
+        filters += u'%s (*)' % translate('SongsPlugin.ImportWizardForm',
+            'All Files')
         filenames = QtGui.QFileDialog.getOpenFileNames(self, title,
-            SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
+            os.path.dirname(SettingsManager.get_last_dir(
-            filters)
+            self.plugin.settingsSection, 1)), filters)
         if filenames:
             listbox.addItems(filenames)
             SettingsManager.set_last_dir(
@@ -293,24 +326,18 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
         self.getFileName(
             translate('SongsPlugin.ImportWizardForm',
             'Select OpenLP 2.0 Database File'),
-            self.openLP2FilenameEdit,
+            self.openLP2FilenameEdit, u'%s (*.sqlite)'
-            u'%s (*.sqlite);;%s (*)'
             % (translate('SongsPlugin.ImportWizardForm',
-            'OpenLP 2.0 Databases'),
+            'OpenLP 2.0 Databases'))
-            translate('SongsPlugin.ImportWizardForm',
-            'All Files'))
         )
 
     def onOpenLP1BrowseButtonClicked(self):
         self.getFileName(
             translate('SongsPlugin.ImportWizardForm',
             'Select openlp.org 1.x Database File'),
-            self.openLP1FilenameEdit,
+            self.openLP1FilenameEdit, u'%s (*.olp)'
-            u'%s (*.olp);;%s (*)'
+            % translate('SongsPlugin.ImportWizardForm',
-            % (translate('SongsPlugin.ImportWizardForm',
+            'openlp.org v1.x Databases')
-            'openlp.org v1.x Databases'),
-            translate('SongsPlugin.ImportWizardForm',
-            'All Files'))
         )
 
     #def onOpenLyricsAddButtonClicked(self):
@@ -337,12 +364,9 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
         self.getFiles(
             translate('SongsPlugin.ImportWizardForm',
             'Select Words of Worship Files'),
-            self.wordsOfWorshipFileListWidget,
+            self.wordsOfWorshipFileListWidget, u'%s (*.wsg *.wow-song)'
-            u'%s (*.wsg *.wow-song);;%s (*)'
+            % translate('SongsPlugin.ImportWizardForm',
-            % (translate('SongsPlugin.ImportWizardForm',
+            'Words Of Worship Song Files')
-            'Words Of Worship Song Files'),
-            translate('SongsPlugin.ImportWizardForm',
-            'All Files'))
         )
 
     def onWordsOfWorshipRemoveButtonClicked(self):
@@ -362,12 +386,9 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
         self.getFiles(
             translate('SongsPlugin.ImportWizardForm',
             'Select Songs of Fellowship Files'),
-            self.songsOfFellowshipFileListWidget,
+            self.songsOfFellowshipFileListWidget, u'%s (*.rtf)'
-            u'%s (*.rtf);;%s (*)'
+            % translate('SongsPlugin.ImportWizardForm',
-            % (translate('SongsPlugin.ImportWizardForm',
+            'Songs Of Felloship Song Files')
-            'Songs Of Felloship Song Files'),
-            translate('SongsPlugin.ImportWizardForm',
-            'All Files'))
         )
 
     def onSongsOfFellowshipRemoveButtonClicked(self):
@@ -394,7 +415,8 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
         self.getFiles(
             translate('SongsPlugin.ImportWizardForm',
             'Select SongBeamer Files'),
-            self.songBeamerFileListWidget
+            self.songBeamerFileListWidget, u'%s (*.sng)' %
+            translate('SongsPlugin.ImportWizardForm', 'SongBeamer files')
         )
 
     def onSongBeamerRemoveButtonClicked(self):