openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


Fix font loading in theme editing
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/14195
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py	2009-10-25 16:12:41 +0000
+++ openlp/core/ui/amendthemeform.py	2009-10-29 23:35:17 +0000
@@ -481,25 +481,26 @@
     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 @@
         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 \