openlp-core team mailing list archive

[Stevan Pettit <openlp@xxxxxxxxxxxxxxx>]

Stevan Pettit has proposed merging lp:~smpettit/openlp/bug-832345 into lp:openlp.

Requested reviews:
  Andreas Preikschat (googol)
Related bugs:
  Bug #832345 in OpenLP: "Make it more obvious what the importer should be used to import exported songs (openlyrics)"
  https://bugs.launchpad.net/openlp/+bug/832345

For more details, see:
https://code.launchpad.net/~smpettit/openlp/bug-832345/+merge/77791

Bug #832345

Modified the description of the OpenLyrics import item to include a reference to OpernLP 2.0 song export.

Added code to select .xml files when OpenLyrics is selected as song import type.

Added code to translate the new OpenLyrics import description.
-- 
https://code.launchpad.net/~smpettit/openlp/bug-832345/+merge/77791
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/wizard.py'
--- openlp/core/ui/wizard.py	2011-06-20 21:57:34 +0000
+++ openlp/core/ui/wizard.py	2011-10-01 15:12:24 +0000
@@ -49,7 +49,7 @@
     EW = u'EasyWorship'
     ES = u'EasiSlides'
     FP = u'Foilpresenter'
-    OL = u'OpenLyrics'
+    OL = u'OpenLyrics or OpenLP 2.0 Exported Song'
     OS = u'OpenSong'
     OSIS = u'OSIS'
     SB = u'SongBeamer'

=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py	2011-09-12 16:35:32 +0000
+++ openlp/plugins/songs/forms/songimportform.py	2011-10-01 15:12:24 +0000
@@ -240,8 +240,8 @@
         self.formatLabel.setText(WizardStrings.FormatLabel)
         self.formatComboBox.setItemText(SongFormat.OpenLP2, UiStrings().OLPV2)
         self.formatComboBox.setItemText(SongFormat.OpenLP1, UiStrings().OLPV1)
-        self.formatComboBox.setItemText(
-            SongFormat.OpenLyrics, WizardStrings.OL)
+        self.formatComboBox.setItemText(SongFormat.OpenLyrics,
+            translate('SongsPlugin.ImportWizardForm', WizardStrings.OL))
         self.formatComboBox.setItemText(SongFormat.OpenSong, WizardStrings.OS)
         self.formatComboBox.setItemText(
             SongFormat.WordsOfWorship, WizardStrings.WoW)
@@ -508,7 +508,8 @@
         Get OpenLyrics song database files
         """
         self.getFiles(WizardStrings.OpenTypeFile % WizardStrings.OL,
-            self.openLyricsFileListWidget)
+            self.openLyricsFileListWidget, u'%s (*.xml)' %
+            translate('SongsPlugin.ImportWizardForm', 'OpenLyrics Files'))
 
     def onOpenLyricsRemoveButtonClicked(self):
         """