From a4f0df76cc516e395dc8c9b3d5adfdfca6426be5 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Mon, 14 Jun 2010 14:23:19 +0100 Subject: [PATCH] Fix QColorDialog usage --- openlp/core/ui/amendthemeform.py | 80 +++++++++++++++----------- openlp/plugins/alerts/lib/alertstab.py | 24 ++++---- 2 files changed, 60 insertions(+), 44 deletions(-) diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index a2db71ff3..00e6a5d16 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -239,12 +239,13 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.previewTheme() def onFontMainColorPushButtonClicked(self): - self.theme.font_main_color = QtGui.QColorDialog.getColor( - QtGui.QColor(self.theme.font_main_color), self).name() - - self.FontMainColorPushButton.setStyleSheet( - u'background-color: %s' % unicode(self.theme.font_main_color)) - self.previewTheme() + new_color = QtGui.QColorDialog.getColor( + QtGui.QColor(self.theme.font_main_color), self) + if new_color.isValid(): + self.theme.font_main_color = new_color.name() + self.FontMainColorPushButton.setStyleSheet( + u'background-color: %s' % unicode(self.theme.font_main_color)) + self.previewTheme() def onFontMainSizeSpinBoxChanged(self): if self.theme.font_main_proportion != self.FontMainSizeSpinBox.value(): @@ -332,11 +333,13 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.previewTheme() def onFontFooterColorPushButtonClicked(self): - self.theme.font_footer_color = QtGui.QColorDialog.getColor( - QtGui.QColor(self.theme.font_footer_color), self).name() - self.FontFooterColorPushButton.setStyleSheet( - 'background-color: %s' % unicode(self.theme.font_footer_color)) - self.previewTheme() + new_color = QtGui.QColorDialog.getColor( + QtGui.QColor(self.theme.background_color), self) + if new_color.isValid(): + self.theme.font_footer_color = new_color.name() + self.FontFooterColorPushButton.setStyleSheet( + u'background-color: %s' % unicode(self.theme.font_footer_color)) + self.previewTheme() def onFontFooterSizeSpinBoxChanged(self): if self.theme.font_footer_proportion != \ @@ -431,24 +434,29 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): def onColor1PushButtonClicked(self): if self.theme.background_type == u'solid': - self.theme.background_color = QtGui.QColorDialog.getColor( - QtGui.QColor(self.theme.background_color), self).name() - self.Color1PushButton.setStyleSheet( - u'background-color: %s' % unicode(self.theme.background_color)) + new_color = QtGui.QColorDialog.getColor( + QtGui.QColor(self.theme.background_color), self) + if new_color.isValid(): + self.theme.background_color = new_color.name() + self.Color1PushButton.setStyleSheet(u'background-color: %s' % + unicode(self.theme.background_color)) else: - self.theme.background_startColor = QtGui.QColorDialog.getColor( - QtGui.QColor(self.theme.background_startColor), self).name() - self.Color1PushButton.setStyleSheet( - u'background-color: %s' % \ + new_color = QtGui.QColorDialog.getColor( + QtGui.QColor(self.theme.background_color), self) + if new_color.isValid(): + self.theme.background_startColor = new_color.name() + self.Color1PushButton.setStyleSheet(u'background-color: %s' % unicode(self.theme.background_startColor)) self.previewTheme() def onColor2PushButtonClicked(self): - self.theme.background_endColor = QtGui.QColorDialog.getColor( - QtGui.QColor(self.theme.background_endColor), self).name() - self.Color2PushButton.setStyleSheet( - u'background-color: %s' % unicode(self.theme.background_endColor)) - self.previewTheme() + new_color = QtGui.QColorDialog.getColor( + QtGui.QColor(self.theme.background_color), self) + if new_color.isValid(): + self.theme.background_endColor = new_color.name() + self.Color2PushButton.setStyleSheet(u'background-color: %s' % + unicode(self.theme.background_endColor)) + self.previewTheme() # #Other Tab @@ -472,11 +480,13 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.previewTheme() def onOutlineColorPushButtonClicked(self): - self.theme.display_outline_color = QtGui.QColorDialog.getColor( - QtGui.QColor(self.theme.display_outline_color), self).name() - self.OutlineColorPushButton.setStyleSheet( - u'background-color: %s' % unicode(self.theme.display_outline_color)) - self.previewTheme() + new_color = QtGui.QColorDialog.getColor( + QtGui.QColor(self.theme.background_color), self) + if new_color.isValid(): + self.theme.display_outline_color = new_color.name() + self.OutlineColorPushButton.setStyleSheet(u'background-color: %s' % + unicode(self.theme.display_outline_color)) + self.previewTheme() def onShadowCheckBoxChanged(self, value): if value == 2: # checked @@ -495,11 +505,13 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.previewTheme() def onShadowColorPushButtonClicked(self): - self.theme.display_shadow_color = QtGui.QColorDialog.getColor( - QtGui.QColor(self.theme.display_shadow_color), self).name() - self.ShadowColorPushButton.setStyleSheet( - u'background-color: %s' % unicode(self.theme.display_shadow_color)) - self.previewTheme() + new_color = QtGui.QColorDialog.getColor( + QtGui.QColor(self.theme.background_color), self) + if new_color.isValid(): + self.theme.display_shadow_color = new_color.name() + self.ShadowColorPushButton.setStyleSheet(u'background-color: %s' % + unicode(self.theme.display_shadow_color)) + self.previewTheme() def onHorizontalComboBoxSelected(self, currentIndex): self.theme.display_horizontalAlign = currentIndex diff --git a/openlp/plugins/alerts/lib/alertstab.py b/openlp/plugins/alerts/lib/alertstab.py index 9e6e98489..43c299070 100644 --- a/openlp/plugins/alerts/lib/alertstab.py +++ b/openlp/plugins/alerts/lib/alertstab.py @@ -214,11 +214,13 @@ class AlertsTab(SettingsTab): translate(u'AlertsPlugin.AlertsTab', u'Bottom')) def onBackgroundColorButtonClicked(self): - self.bg_color = QtGui.QColorDialog.getColor( - QtGui.QColor(self.bg_color), self).name() - self.BackgroundColorButton.setStyleSheet( - u'background-color: %s' % self.bg_color) - self.updateDisplay() + new_color = QtGui.QColorDialog.getColor( + QtGui.QColor(self.theme.background_color), self) + if new_color.isValid(): + self.bg_color = new_color.name() + self.BackgroundColorButton.setStyleSheet( + u'background-color: %s' % self.bg_color) + self.updateDisplay() def onFontComboBoxClicked(self): self.updateDisplay() @@ -227,11 +229,13 @@ class AlertsTab(SettingsTab): self.location = location def onFontColorButtonClicked(self): - self.font_color = QtGui.QColorDialog.getColor( - QtGui.QColor(self.font_color), self).name() - self.FontColorButton.setStyleSheet( - u'background-color: %s' % self.font_color) - self.updateDisplay() + new_color = QtGui.QColorDialog.getColor( + QtGui.QColor(self.theme.background_color), self) + if new_color.isValid(): + self.font_color = new_color.name() + self.FontColorButton.setStyleSheet( + u'background-color: %s' % self.font_color) + self.updateDisplay() def onTimeoutSpinBoxChanged(self): self.timeout = self.TimeoutSpinBox.value()