From d8fc6cd4dd6fe8716280b25a42c188802b8b4d44 Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Fri, 30 Sep 2011 17:45:59 -0400 Subject: [PATCH 1/4] Added additional desctiption to OpenLyrics import selection and added code to select xml files for import --- openlp/core/ui/wizard.py | 2 +- openlp/plugins/songs/forms/songimportform.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py index 9d8a106ed..40591872b 100644 --- a/openlp/core/ui/wizard.py +++ b/openlp/core/ui/wizard.py @@ -49,7 +49,7 @@ class WizardStrings(object): 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' diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index 6f09c9b8c..f3f7b1fce 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -508,7 +508,8 @@ class SongImportForm(OpenLPWizard): 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): """ From dc41fa4318e4be18e0d83c4779049b06b31e7acd Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Sat, 1 Oct 2011 10:34:30 -0400 Subject: [PATCH 2/4] Added coded to translate the modified OpenLyrics import description --- openlp/plugins/songs/forms/songimportform.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index f3f7b1fce..72048e409 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -240,8 +240,8 @@ class SongImportForm(OpenLPWizard): 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) From 5dfa0c95cefe96337e3f29a2cea1d40d3d7a5a64 Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Wed, 5 Oct 2011 15:50:17 -0400 Subject: [PATCH 3/4] Modified code so new Openlyrics song import description will appear for translate --- openlp/core/ui/wizard.py | 2 +- openlp/plugins/songs/forms/songimportform.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py index 40591872b..9d8a106ed 100644 --- a/openlp/core/ui/wizard.py +++ b/openlp/core/ui/wizard.py @@ -49,7 +49,7 @@ class WizardStrings(object): EW = u'EasyWorship' ES = u'EasiSlides' FP = u'Foilpresenter' - OL = u'OpenLyrics or OpenLP 2.0 Exported Song' + OL = u'OpenLyrics' OS = u'OpenSong' OSIS = u'OSIS' SB = u'SongBeamer' diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index 72048e409..18a66fb85 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -241,7 +241,8 @@ class SongImportForm(OpenLPWizard): self.formatComboBox.setItemText(SongFormat.OpenLP2, UiStrings().OLPV2) self.formatComboBox.setItemText(SongFormat.OpenLP1, UiStrings().OLPV1) self.formatComboBox.setItemText(SongFormat.OpenLyrics, - translate('SongsPlugin.ImportWizardForm', WizardStrings.OL)) + translate('SongsPlugin.ImportWizardForm', + 'OpenLyrics or OpenLP 2.0 Exported Song')) self.formatComboBox.setItemText(SongFormat.OpenSong, WizardStrings.OS) self.formatComboBox.setItemText( SongFormat.WordsOfWorship, WizardStrings.WoW) From 2a1d0009a8152ed4b6673feade755ff2d8b8e64b Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Wed, 5 Oct 2011 18:17:57 -0400 Subject: [PATCH 4/4] Removed whitespace --- openlp/plugins/songs/forms/songimportform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index 18a66fb85..b79e56f7b 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -241,7 +241,7 @@ class SongImportForm(OpenLPWizard): self.formatComboBox.setItemText(SongFormat.OpenLP2, UiStrings().OLPV2) self.formatComboBox.setItemText(SongFormat.OpenLP1, UiStrings().OLPV1) self.formatComboBox.setItemText(SongFormat.OpenLyrics, - translate('SongsPlugin.ImportWizardForm', + translate('SongsPlugin.ImportWizardForm', 'OpenLyrics or OpenLP 2.0 Exported Song')) self.formatComboBox.setItemText(SongFormat.OpenSong, WizardStrings.OS) self.formatComboBox.setItemText(