Dmitriy Marmyshev has proposed merging lp:~marmyshev/openlp/bug_1117098 into
lp:openlp.
Requested reviews:
Tim Bentley (trb143)
Raoul Snyman (raoul-snyman)
Jonathan Corwin (j-corwin)
Related bugs:
Bug #1117098 in OpenLP: "Transparen theme is white on Mac OSX"
https://bugs.launchpad.net/openlp/+bug/1117098
For more details, see:
https://code.launchpad.net/~marmyshev/openlp/bug_1117098/+merge/192582
Fixed transparent display on OS X
--
https://code.launchpad.net/~marmyshev/openlp/bug_1117098/+merge/192582
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2013-10-23 18:49:39 +0000
+++ openlp/core/ui/maindisplay.py 2013-10-24 20:26:19 +0000
@@ -167,8 +167,10 @@
"""
if enabled:
self.setAutoFillBackground(False)
+ self.setStyleSheet("QGraphicsView {background: transparent; border: 0px;}")
else:
self.setAttribute(QtCore.Qt.WA_NoSystemBackground, False)
+ self.setStyleSheet("QGraphicsView {}")
self.setAttribute(QtCore.Qt.WA_TranslucentBackground, enabled)
self.repaint()
=== added file 'tests/functional/openlp_core_ui/test_maindisplay.py'
--- tests/functional/openlp_core_ui/test_maindisplay.py 1970-01-01 00:00:00 +0000
+++ tests/functional/openlp_core_ui/test_maindisplay.py 2013-10-24 20:26:19 +0000
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2013 Raoul Snyman #
+# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky, Patrick Zimmermann, Dmitriy Marmyshev #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+"""
+Package to test the openlp.core.lib.maindisplay package.
+"""
+from unittest import TestCase
+
+from mock import MagicMock
+from PyQt4 import QtCore
+
+from openlp.core.ui.maindisplay import MainDisplay
+
+
+class TestMainDisplay(TestCase):
+ """
+ Test the functions in the :mod:`MainDisplay` module.
+ """
+ #TODO: The following classes still need tests written for
+ # - Display
+ # - MainDisplay
+ # - AudioPlayer
+
+
+ def set_transparency_enable_test(self):
+ """
+ Test creating an instance of the MainDisplay class
+ """
+ # GIVEN: get an instance of MainDisplay
+ display = MagicMock()
+ main_display = MainDisplay(display)
+
+ # WHEN: MainDisplay.set_transparency is called with a true value"
+ main_display.set_transparency(True)
+
+ # THEN: check MainDisplay.setAutoFillBackground, MainDisplay.setStyleSheet, MainDisplay.setAttribute,
+ assert main_display.StyleSheet == "QGraphicsView {background: transparent; border: 0px;}", \
+ 'MainDisplay instance should be transparent'
+ assert main_display.getAutoFillBackground == False, \
+ 'MainDisplay instance should be without background auto fill'
+ assert main_display.getAttribute(QtCore.Qt.WA_TranslucentBackground) == True, \
+ 'MainDisplay hasnt translusent background'
+
+ def set_transparency_disable_test(self):
+ """
+ Test creating an instance of the MainDisplay class
+ """
+ # GIVEN: get an instance of MainDisplay
+ display = MagicMock()
+ main_display = MainDisplay(display)
+
+ # WHEN: MainDispaly.set_transparency is called with a False value"
+ main_display.set_transparency(False)
+
+ # THEN: check MainDisplay.setAutoFillBackground, MainDisplay.setStyleSheet, MainDisplay.setAttribute,
+ assert main_display.StyleSheet == "QGraphicsView {}", \
+ 'MainDisplay instance should not be transparent'
+ assert main_display.getAutoFillBackground == True, 'MainDisplay instance should be with background auto fill'
+ assert main_display.getAttribute(QtCore.Qt.WA_TranslucentBackground) == True, \
+ 'MainDisplay hasnt translusent background'
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
