From e662b785db077d31ff13ae33cb55b9b5e2067b75 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 29 Oct 2009 23:27:45 +0000 Subject: [PATCH] Fix font names in theme editing --- openlp/core/ui/amendthemeform.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index b95a88ca2..e71a4ada9 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -481,25 +481,26 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): def paintUi(self, theme): self.stateChanging(theme) self.ThemeNameEdit.setText(self.theme.theme_name) + # Background Tab if self.theme.background_mode == u'opaque': self.BackgroundComboBox.setCurrentIndex(0) else: self.BackgroundComboBox.setCurrentIndex(1) - if theme.background_type == u'solid': self.BackgroundTypeComboBox.setCurrentIndex(0) elif theme.background_type == u'gradient': self.BackgroundTypeComboBox.setCurrentIndex(1) else: self.BackgroundTypeComboBox.setCurrentIndex(2) - if self.theme.background_direction == u'horizontal': self.GradientComboBox.setCurrentIndex(0) elif self.theme.background_direction == u'vertical': self.GradientComboBox.setCurrentIndex(1) else: self.GradientComboBox.setCurrentIndex(2) - + # Font Main Tab + self.FontMainComboBox.setCurrentFont( + QtGui.QFont(self.theme.font_main_name)) self.FontMainSizeSpinBox.setValue(int(self.theme.font_main_proportion)) if not self.theme.font_main_italics and \ self.theme.font_main_weight == u'Normal': @@ -517,6 +518,9 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.FontMainYSpinBox.setValue(int(self.theme.font_main_y)) self.FontMainWidthSpinBox.setValue(int(self.theme.font_main_width)) self.FontMainHeightSpinBox.setValue(int(self.theme.font_main_height)) + # Font Footer Tab + self.FontFooterComboBox.setCurrentFont( + QtGui.QFont(self.theme.font_footer_name)) self.FontFooterSizeSpinBox.setValue( int(self.theme.font_footer_proportion)) if not self.theme.font_footer_italics and \