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

Make to code more robust

Browse Source
This commit is contained in:
Tim Bentley 2013-07-11 20:19:26 +01:00
parent 98b5c6b1fd
commit 61b769a064
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/core/ui/themeform.py
View File

@ -36,7 +36,7 @@ from openlp.core.lib import Receiver, translate
from openlp.core.lib.theme import BackgroundType, BackgroundGradientType
from openlp.core.lib.ui import UiStrings, critical_error_message_box
from openlp.core.ui import ThemeLayoutForm
from openlp.core.utils import get_images_filter
from openlp.core.utils import get_images_filter, is_not_image_file
from themewizard import Ui_ThemeWizard
log = logging.getLogger(__name__)
@ -233,8 +233,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 \
(self.imageFileEdit.text().isEmpty() or
os.path.exists(self.imageFileEdit.text())):
is_not_image_file(self.imageFileEdit.text()):
QtGui.QMessageBox.critical(self,
translate('OpenLP.ThemeWizard', 'Background Image Empty'),
translate('OpenLP.ThemeWizard', 'You have not selected a '

16
openlp/core/utils/__init__.py
View File

@ -364,6 +364,22 @@ def get_images_filter():
visible_formats, actual_formats)
return IMAGES_FILTER
def is_not_image_file(file_name):
"""
Validate that the file is an image file.
``file_name``
File name to be checked.
"""
formats = [unicode(fmt)
for fmt in QtGui.QImageReader.supportedImageFormats()]
if file_name.isEmpty():
return True
else:
file_part, file_extension = os.path.splitext(unicode(file_name))
if file_extension[1:] in formats and os.path.exists(file_name):
return False
return True
def join_url(base, *args):
"""