raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for #828385, more sensible and partly alphabetical order of import formats.

Browse Source
This commit is contained in:
Mattias Põldaru 2011-12-13 02:34:46 +02:00
parent d2659a64fc
commit 88d7176900
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/plugins/songs/forms/songimportform.py
View File

@ -238,7 +238,8 @@ class SongImportForm(OpenLPWizard):
self.sourcePage.setTitle(WizardStrings.ImportSelect) self.sourcePage.setTitle(WizardStrings.ImportSelect)
self.sourcePage.setSubTitle(WizardStrings.ImportSelectLong) self.sourcePage.setSubTitle(WizardStrings.ImportSelectLong)
self.formatLabel.setText(WizardStrings.FormatLabel) self.formatLabel.setText(WizardStrings.FormatLabel)
self.formatComboBox.setItemText(SongFormat.OpenLP2, UiStrings().OLPV2) self.formatComboBox.setItemText(SongFormat.OpenLP2,
translate('SongsPlugin.ImportWizardForm', 'OpenLP 2.0 database'))
self.formatComboBox.setItemText(SongFormat.OpenLP1, UiStrings().OLPV1) self.formatComboBox.setItemText(SongFormat.OpenLP1, UiStrings().OLPV1)
self.formatComboBox.setItemText(SongFormat.OpenLyrics, self.formatComboBox.setItemText(SongFormat.OpenLyrics,
translate('SongsPlugin.ImportWizardForm', translate('SongsPlugin.ImportWizardForm',

26
openlp/plugins/songs/lib/importer.py
View File

@ -68,19 +68,19 @@ class SongFormat(object):
""" """
_format_availability = {} _format_availability = {}
Unknown = -1 Unknown = -1
OpenLP2 = 0 OpenLyrics = 0
OpenLP1 = 1 OpenLP2 = 1
OpenLyrics = 2 OpenLP1 = 2
OpenSong = 3 Generic = 3
WordsOfWorship = 4 CCLI = 4
CCLI = 5 EasiSlides = 5
SongsOfFellowship = 6 EasyWorship = 6
Generic = 7 FoilPresenter = 7
EasiSlides = 8 OpenSong = 8
EasyWorship = 9 SongBeamer = 9
SongBeamer = 10 SongShowPlus = 10
SongShowPlus = 11 SongsOfFellowship = 11
FoilPresenter = 12 WordsOfWorship = 12
#CSV = 13 #CSV = 13
@staticmethod @staticmethod