From a0ecae3f47ba78a1845c3682015271f10602b3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= Date: Sat, 31 Dec 2011 16:18:05 +0200 Subject: [PATCH] Rename EasiSlides to EasySlides. Fixes: https://launchpad.net/bugs/904384 --- openlp/core/ui/wizard.py | 2 +- openlp/plugins/songs/forms/songimportform.py | 34 +++++++++---------- ...asislidesimport.py => easyslidesimport.py} | 8 ++--- openlp/plugins/songs/lib/importer.py | 10 +++--- 4 files changed, 27 insertions(+), 27 deletions(-) rename openlp/plugins/songs/lib/{easislidesimport.py => easyslidesimport.py} (98%) diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py index fbec69c9b..91aa42e43 100644 --- a/openlp/core/ui/wizard.py +++ b/openlp/core/ui/wizard.py @@ -47,7 +47,7 @@ class WizardStrings(object): CCLI = u'CCLI/SongSelect' CSV = u'CSV' EW = u'EasyWorship' - ES = u'EasiSlides' + ES = u'EasySlides' FP = u'Foilpresenter' OL = u'OpenLyrics' OS = u'OpenSong' diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index 6538aa61c..db4d9bf56 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -141,9 +141,9 @@ class SongImportForm(OpenLPWizard): QtCore.QObject.connect(self.genericRemoveButton, QtCore.SIGNAL(u'clicked()'), self.onGenericRemoveButtonClicked) - QtCore.QObject.connect(self.easiSlidesBrowseButton, + QtCore.QObject.connect(self.easySlidesBrowseButton, QtCore.SIGNAL(u'clicked()'), - self.onEasiSlidesBrowseButtonClicked) + self.onEasySlidesBrowseButtonClicked) QtCore.QObject.connect(self.ewBrowseButton, QtCore.SIGNAL(u'clicked()'), self.onEWBrowseButtonClicked) @@ -201,8 +201,8 @@ class SongImportForm(OpenLPWizard): self.addFileSelectItem(u'generic', None, True) # CCLI File import self.addFileSelectItem(u'ccli') - # EasiSlides - self.addFileSelectItem(u'easiSlides', single_select=True) + # EasySlides + self.addFileSelectItem(u'easySlides', single_select=True) # EasyWorship self.addFileSelectItem(u'ew', single_select=True) # Foilpresenter @@ -248,7 +248,7 @@ class SongImportForm(OpenLPWizard): 'Generic Document/Presentation')) self.formatComboBox.setItemText(SongFormat.CCLI, WizardStrings.CCLI) self.formatComboBox.setItemText( - SongFormat.EasiSlides, WizardStrings.ES) + SongFormat.EasySlides, WizardStrings.ES) self.formatComboBox.setItemText( SongFormat.EasyWorship, WizardStrings.EW) self.formatComboBox.setItemText( @@ -307,9 +307,9 @@ class SongImportForm(OpenLPWizard): translate('SongsPlugin.ImportWizardForm', 'The generic document/' 'presentation importer has been disabled because OpenLP cannot ' 'access OpenOffice or LibreOffice.')) - self.easiSlidesFilenameLabel.setText( + self.easySlidesFilenameLabel.setText( translate('SongsPlugin.ImportWizardForm', 'Filename:')) - self.easiSlidesBrowseButton.setText(UiStrings().Browse) + self.easySlidesBrowseButton.setText(UiStrings().Browse) self.ewFilenameLabel.setText( translate('SongsPlugin.ImportWizardForm', 'Filename:')) self.ewBrowseButton.setText(UiStrings().Browse) @@ -411,11 +411,11 @@ class SongImportForm(OpenLPWizard): 'presentation file to import from.')) self.genericAddButton.setFocus() return False - elif source_format == SongFormat.EasiSlides: - if self.easiSlidesFilenameEdit.text().isEmpty(): + elif source_format == SongFormat.EasySlides: + if self.easySlidesFilenameEdit.text().isEmpty(): critical_error_message_box(UiStrings().NFSp, WizardStrings.YouSpecifyFile % WizardStrings.ES) - self.easiSlidesBrowseButton.setFocus() + self.easySlidesBrowseButton.setFocus() return False elif source_format == SongFormat.EasyWorship: if self.ewFilenameEdit.text().isEmpty(): @@ -594,9 +594,9 @@ class SongImportForm(OpenLPWizard): """ self.removeSelectedItems(self.genericFileListWidget) - def onEasiSlidesBrowseButtonClicked(self): + def onEasySlidesBrowseButtonClicked(self): self.getFileName(WizardStrings.OpenTypeFile % WizardStrings.ES, - self.easiSlidesFilenameEdit) + self.easySlidesFilenameEdit) def onEWBrowseButtonClicked(self): """ @@ -673,7 +673,7 @@ class SongImportForm(OpenLPWizard): self.ccliFileListWidget.clear() self.songsOfFellowshipFileListWidget.clear() self.genericFileListWidget.clear() - self.easiSlidesFilenameEdit.setText(u'') + self.easySlidesFilenameEdit.setText(u'') self.ewFilenameEdit.setText(u'') self.songBeamerFileListWidget.clear() self.songShowPlusFileListWidget.clear() @@ -743,10 +743,10 @@ class SongImportForm(OpenLPWizard): importer = self.plugin.importSongs(SongFormat.Generic, filenames=self.getListOfFiles(self.genericFileListWidget) ) - elif source_format == SongFormat.EasiSlides: - # Import an EasiSlides export file - importer = self.plugin.importSongs(SongFormat.EasiSlides, - filename=unicode(self.easiSlidesFilenameEdit.text()) + elif source_format == SongFormat.EasySlides: + # Import an EasySlides export file + importer = self.plugin.importSongs(SongFormat.EasySlides, + filename=unicode(self.easySlidesFilenameEdit.text()) ) elif source_format == SongFormat.EasyWorship: # Import an EasyWorship database diff --git a/openlp/plugins/songs/lib/easislidesimport.py b/openlp/plugins/songs/lib/easyslidesimport.py similarity index 98% rename from openlp/plugins/songs/lib/easislidesimport.py rename to openlp/plugins/songs/lib/easyslidesimport.py index b4ed010c3..a5e2b5696 100644 --- a/openlp/plugins/songs/lib/easislidesimport.py +++ b/openlp/plugins/songs/lib/easyslidesimport.py @@ -35,9 +35,9 @@ from openlp.plugins.songs.lib.songimport import SongImport log = logging.getLogger(__name__) -class EasiSlidesImport(SongImport): +class EasySlidesImport(SongImport): """ - Import songs exported from EasiSlides + Import songs exported from EasySlides The format example is here: http://wiki.openlp.org/Development:EasiSlides_-_Song_Data_Format @@ -56,7 +56,7 @@ class EasiSlidesImport(SongImport): multiple opensong files. If `self.commit` is set False, the import will not be committed to the database (useful for test scripts). """ - log.info(u'Importing EasiSlides XML file %s', self.importSource) + log.info(u'Importing EasySlides XML file %s', self.importSource) parser = etree.XMLParser(remove_blank_text=True) parsed_file = etree.parse(self.importSource, parser) xml = unicode(etree.tostring(parsed_file)) @@ -177,7 +177,7 @@ class EasiSlidesImport(SongImport): separators = (separatorlines > 0) # the number of different regions in song - 1 if len(regionlines) > 1: - log.info(u'EasiSlidesImport: the file contained a song named "%s"' + log.info(u'EasySlidesImport: the file contained a song named "%s"' u'with more than two regions, but only two regions are', u'tested, encountered regions were: %s', self.title, u','.join(regionlines.keys())) diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py index 2a220b6cb..867b28c91 100644 --- a/openlp/plugins/songs/lib/importer.py +++ b/openlp/plugins/songs/lib/importer.py @@ -30,7 +30,7 @@ The :mod:`importer` modules provides the general song import functionality. import logging from opensongimport import OpenSongImport -from easislidesimport import EasiSlidesImport +from easyslidesimport import EasySlidesImport from olpimport import OpenLPSongImport from openlyricsimport import OpenLyricsImport from wowimport import WowImport @@ -73,7 +73,7 @@ class SongFormat(object): OpenLP1 = 2 Generic = 3 CCLI = 4 - EasiSlides = 5 + EasySlides = 5 EasyWorship = 6 FoilPresenter = 7 OpenSong = 8 @@ -107,8 +107,8 @@ class SongFormat(object): return OooImport elif format == SongFormat.CCLI: return CCLIFileImport - elif format == SongFormat.EasiSlides: - return EasiSlidesImport + elif format == SongFormat.EasySlides: + return EasySlidesImport elif format == SongFormat.EasyWorship: return EasyWorshipSongImport elif format == SongFormat.SongBeamer: @@ -130,7 +130,7 @@ class SongFormat(object): SongFormat.OpenLP1, SongFormat.Generic, SongFormat.CCLI, - SongFormat.EasiSlides, + SongFormat.EasySlides, SongFormat.EasyWorship, SongFormat.FoilPresenter, SongFormat.OpenSong,