From 3cc63840f4eddd3058fa719348d7204a0d383c0a Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 9 Dec 2009 17:09:45 +0000 Subject: [PATCH] Fix up theme string issues to False is matched Remove any Print statements --- openlp/core/lib/themexmlhandler.py | 1 + openlp/core/ui/amendthemeform.py | 13 +++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/openlp/core/lib/themexmlhandler.py b/openlp/core/lib/themexmlhandler.py index dc5ae432b..42743d1bd 100644 --- a/openlp/core/lib/themexmlhandler.py +++ b/openlp/core/lib/themexmlhandler.py @@ -386,6 +386,7 @@ class ThemeXML(object): else: if element.tag: field = master + element.tag + element.text = element.text.strip().lstrip() if element.text == u'True' or element.text == u'False': setattr(self, field, str_to_bool(element.text)) else: diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index fd660d6d2..da56ce3c4 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -450,9 +450,8 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.previewTheme() def onSlideTransitionCheckedBoxChanged(self, value): - print "changed" if value == 2: # checked - self.theme.display_slideTransition= True + self.theme.display_slideTransition = True else: self.theme.display_slideTransition = False self.stateChanging(self.theme) @@ -574,11 +573,10 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.ShadowCheckBox.setChecked(False) self.ShadowColorPushButton.setEnabled(False) - print self.theme.display_slideTransition if self.theme.display_slideTransition: - self.SlideTransitionCheckedBox.setChecked(True) + self.SlideTransitionCheckedBox.setCheckState(QtCore.Qt.Checked) else: - self.SlideTransitionCheckedBox.setChecked(False) + self.SlideTransitionCheckedBox.setCheckState(QtCore.Qt.Unchecked) self.HorizontalComboBox.setCurrentIndex( self.theme.display_horizontalAlign) @@ -672,11 +670,6 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): else: self.ShadowColorPushButton.setEnabled(False) - if self.theme.display_slideTransition: - self.SlideTransitionCheckedBox.setChecked(True) - else: - self.SlideTransitionCheckedBox.setChecked(False) - def previewTheme(self): if self.allowPreview: #calculate main number of rows