Revert some changes - functional Ok. Interfaces mess

This commit is contained in:
Tim Bentley 2013-02-17 20:21:15 +00:00
parent 5c0fa26289
commit 219fec12d2
3 changed files with 6 additions and 2 deletions

View File

@ -7,3 +7,7 @@ sip.setapi(u'QTime', 2)
sip.setapi(u'QUrl', 2) sip.setapi(u'QUrl', 2)
sip.setapi(u'QVariant', 2) sip.setapi(u'QVariant', 2)
from PyQt4 import QtGui
# Only one QApplication can be created. Use QtGui.QApplication.instance() when you need to "create" a QApplication.
application = QtGui.QApplication([])

View File

@ -20,7 +20,7 @@ class TestImageManager(TestCase):
Create the UI Create the UI
""" """
Registry.create() Registry.create()
self.app = QtGui.QApplication([]) self.app = QtGui.QApplication.instance()
ScreenList.create(self.app.desktop()) ScreenList.create(self.app.desktop())
self.image_manager = ImageManager() self.image_manager = ImageManager()

View File

@ -23,8 +23,8 @@ class TestScreenList(TestCase):
""" """
Set up the components need for all tests. Set up the components need for all tests.
""" """
self.application = QtGui.QApplication.instance()
Registry.create() Registry.create()
self.application = QtGui.QApplication([])
self.application.setOrganizationName(u'OpenLP-tests') self.application.setOrganizationName(u'OpenLP-tests')
self.application.setOrganizationDomain(u'openlp.org') self.application.setOrganizationDomain(u'openlp.org')
self.screens = ScreenList.create(self.application.desktop()) self.screens = ScreenList.create(self.application.desktop())