From 9d73d37b9427d9125090c6e828df9274940de9cc Mon Sep 17 00:00:00 2001 From: Samuel Findlay Date: Mon, 9 Jul 2012 15:49:10 +1000 Subject: [PATCH 1/2] Song Import Wizard: disabledLabelTextfor default and MediaShout --- openlp/plugins/songs/lib/importer.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py index 0c3a0f07f..660cf3f93 100644 --- a/openlp/plugins/songs/lib/importer.py +++ b/openlp/plugins/songs/lib/importer.py @@ -169,7 +169,8 @@ class SongFormat(object): u'selectMode': SongFormatSelect.MultipleFiles, u'filter': u'', u'comboBoxText': None, - u'disabledLabelText': u'', + u'disabledLabelText': translate('SongsPlugin.ImportWizardForm', + 'This importer has been disabled.'), u'getFilesTitle': None, u'invalidSourceMsg': None, u'descriptionText': None @@ -257,7 +258,11 @@ class SongFormat(object): u'canDisable': True, u'selectMode': SongFormatSelect.SingleFile, u'filter': u'%s (*.mdb)' % translate('SongsPlugin.ImportWizardForm', - 'MediaShout Database') + 'MediaShout Database'), + u'disabledLabelText': translate('SongsPlugin.ImportWizardForm', + 'The MediaShout importer has been disabled because the pyodbc ' + 'module is not available. This importer is only available on ' + 'Windows.') }, OpenSong: { u'class': OpenSongImport, From 6089c89f8a1c4cf8818f5b1278e26cc98ccbf9e3 Mon Sep 17 00:00:00 2001 From: Samuel Findlay Date: Mon, 9 Jul 2012 18:12:29 +1000 Subject: [PATCH 2/2] Improved disabledLabelText for MediaShout --- openlp/plugins/songs/lib/importer.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py index 660cf3f93..a8de7172e 100644 --- a/openlp/plugins/songs/lib/importer.py +++ b/openlp/plugins/songs/lib/importer.py @@ -260,9 +260,10 @@ class SongFormat(object): u'filter': u'%s (*.mdb)' % translate('SongsPlugin.ImportWizardForm', 'MediaShout Database'), u'disabledLabelText': translate('SongsPlugin.ImportWizardForm', - 'The MediaShout importer has been disabled because the pyodbc ' - 'module is not available. This importer is only available on ' - 'Windows.') + 'The MediaShout importer is only supported on Windows. It has ' + 'been disabled due to a missing Python module. If you want to ' + 'use this importer, you will need to install the "pyodbc" ' + 'module.') }, OpenSong: { u'class': OpenSongImport,