← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~edwinlunando/openlp/bug-902492 into lp:openlp

 

Edwin Lunando has proposed merging lp:~edwinlunando/openlp/bug-902492 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #902492 in OpenLP: "Theme Wizard does not use the live screen's size as default when overwriting "Output Area Locations" "
  https://bugs.launchpad.net/openlp/+bug/902492

For more details, see:
https://code.launchpad.net/~edwinlunando/openlp/bug-902492/+merge/99206

I've resolved the bug 902492
at themeform.py line 426 at function setPositionPageValues(self):
i set the main and footer page height and width according to the screen size.
-- 
https://code.launchpad.net/~edwinlunando/openlp/bug-902492/+merge/99206
Your team OpenLP Core is requested to review the proposed merge of lp:~edwinlunando/openlp/bug-902492 into lp:openlp.
=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2012-01-04 17:19:49 +0000
+++ openlp/core/ui/themeform.py	2012-03-25 12:45:23 +0000
@@ -427,25 +427,28 @@
         """
         Handle the display and state of the Position page.
         """
+        # Get the QRect of a screen
+        screen = QtGui.QDesktopWidget().availableGeometry()
         # Main Area
         self.mainPositionCheckBox.setChecked(not self.theme.font_main_override)
         self.setField(u'mainPositionX', QtCore.QVariant(self.theme.font_main_x))
         self.setField(u'mainPositionY', QtCore.QVariant(self.theme.font_main_y))
         self.setField(u'mainPositionHeight',
-            QtCore.QVariant(self.theme.font_main_height))
+            QtCore.QVariant(screen.height() - 110))
         self.setField(u'mainPositionWidth',
-            QtCore.QVariant(self.theme.font_main_width))
+            QtCore.QVariant(screen.width() - 20))
         # Footer
         self.footerPositionCheckBox.setChecked(
             not self.theme.font_footer_override)
         self.setField(u'footerPositionX',
             QtCore.QVariant(self.theme.font_footer_x))
         self.setField(u'footerPositionY',
-            QtCore.QVariant(self.theme.font_footer_y))
+            QtCore.QVariant(screen.height() - 100))
         self.setField(u'footerPositionHeight',
-            QtCore.QVariant(self.theme.font_footer_height))
+            QtCore.QVariant(120))
+
         self.setField(u'footerPositionWidth',
-            QtCore.QVariant(self.theme.font_footer_width))
+            QtCore.QVariant(screen.width() - 20))
 
     def setAlignmentPageValues(self):
         """


Follow ups