diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index b4440e038..7381e32e7 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -78,6 +78,8 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): QtCore.SIGNAL(u'clicked()'), self.onGradientEndButtonClicked) QtCore.QObject.connect(self.imageBrowseButton, QtCore.SIGNAL(u'clicked()'), self.onImageBrowseButtonClicked) + QtCore.QObject.connect(self.imageFileEdit, + QtCore.SIGNAL(u'editingFinished()'), self.onImageFileEditEditingFinished) QtCore.QObject.connect(self.mainColorButton, QtCore.SIGNAL(u'clicked()'), self.onMainColorButtonClicked) QtCore.QObject.connect(self.outlineColorButton, @@ -233,7 +235,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): background_image = BackgroundType.to_string(BackgroundType.Image) if self.page(self.currentId()) == self.backgroundPage and \ self.theme.background_type == background_image and \ - is_not_image_file(self.imageFileEdit.text()): + is_not_image_file(self.theme.background_filename): QtGui.QMessageBox.critical(self, translate('OpenLP.ThemeWizard', 'Background Image Empty'), translate('OpenLP.ThemeWizard', 'You have not selected a ' @@ -545,6 +547,12 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): self.theme.background_filename = unicode(filename) self.setBackgroundPageValues() + def onImageFileEditEditingFinished(self): + """ + Background image path edited + """ + self.theme.background_filename = unicode(self.imageFileEdit.text()) + def onMainColorButtonClicked(self): self.theme.font_main_color = \ self._colorButton(self.theme.font_main_color) diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index faef00a82..a33cd2604 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -371,15 +371,14 @@ def is_not_image_file(file_name): ``file_name`` File name to be checked. """ - if file_name.isEmpty(): - return True - else: - formats = [unicode(fmt).lower() - for fmt in QtGui.QImageReader.supportedImageFormats()] - file_part, file_extension = os.path.splitext(unicode(file_name)) - if file_extension[1:].lower() in formats and os.path.exists(file_name): - return False + if not file_name: return True + formats = [unicode(fmt).lower() + for fmt in QtGui.QImageReader.supportedImageFormats()] + file_part, file_extension = os.path.splitext(unicode(file_name)) + if file_extension[1:].lower() in formats and os.path.exists(file_name): + return False + return True def join_url(base, *args): """