openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugs into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #686122 Theme change main area font color error
  https://bugs.launchpad.net/bugs/686122


Fix Theme Bug text color.
Fix serious spelling error.
-- 
https://code.launchpad.net/~trb143/openlp/bugs/+merge/42916
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugs into lp:openlp.

=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py	2010-12-03 20:22:59 +0000
+++ openlp/core/lib/theme.py	2010-12-07 08:02:54 +0000
@@ -325,7 +325,7 @@
         # Create Font name element
         self.child_element(background, u'name', name)
         # Create Font color element
-        self.child_element(background, u'color', color)
+        self.child_element(background, u'color', unicode(color))
         # Create Proportion name element
         self.child_element(background, u'size', unicode(size))
         # Create weight name element

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-12-02 14:37:38 +0000
+++ openlp/core/ui/maindisplay.py	2010-12-07 08:02:54 +0000
@@ -23,7 +23,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-
+"""
+"""
 import logging
 import os
 

=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2010-12-05 18:02:36 +0000
+++ openlp/core/ui/themeform.py	2010-12-07 08:02:54 +0000
@@ -502,12 +502,6 @@
             self.theme.background_filename = unicode(filename)
         self.setBackgroundTabValues()
 
-#    def onMainFontComboBox(self):
-#        """
-#        Main Font Combo box changed
-#        """
-#        self.theme.font_main_name = self.mainFontComboBox.currentFont().family()
-
     def onMainColourPushButtonClicked(self):
         self.theme.font_main_color = \
             self._colorButton(self.theme.font_main_color)

=== modified file 'openlp/core/ui/themewizard.py'
--- openlp/core/ui/themewizard.py	2010-12-05 18:02:36 +0000
+++ openlp/core/ui/themewizard.py	2010-12-07 08:02:54 +0000
@@ -708,7 +708,7 @@
         self.horizontalComboBox.setItemText(2,
             translate('OpenLP.ThemeWizard', 'Center'))
         self.verticalLabel.setText(
-            translate('OpenLP.ThemeWizard', 'Vertcal Align:'))
+            translate('OpenLP.ThemeWizard', 'Vertical Align:'))
         self.verticalComboBox.setItemText(0,
             translate('OpenLP.ThemeWizard', 'Top'))
         self.verticalComboBox.setItemText(1,