renamed attribute

This commit is contained in:
Andreas Preikschat 2012-05-23 18:59:28 +02:00
parent 45c05e700d
commit 0517f3d8d7
1 changed files with 5 additions and 5 deletions

View File

@ -542,15 +542,15 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
""" """
log.info(u'MainWindow loaded') log.info(u'MainWindow loaded')
def __init__(self, parent): def __init__(self, application):
""" """
This constructor sets up the interface, the various managers, and the This constructor sets up the interface, the various managers, and the
plugins. plugins.
""" """
QtGui.QMainWindow.__init__(self) QtGui.QMainWindow.__init__(self)
self.parent = lambda: parent self.application = lambda: application
self.clipboard = self.mainwindow().clipboard() self.clipboard = self.application().clipboard()
self.arguments = self.mainwindow().args self.arguments = self.application().args
# Set up settings sections for the main application # Set up settings sections for the main application
# (not for use by plugins) # (not for use by plugins)
self.uiSettingsSection = u'user interface' self.uiSettingsSection = u'user interface'
@ -1135,7 +1135,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
""" """
# The MainApplication did not even enter the event loop (this happens # The MainApplication did not even enter the event loop (this happens
# when OpenLP is not fully loaded). Just ignore the event. # when OpenLP is not fully loaded). Just ignore the event.
if not self.mainwindow().eventLoopIsActive: if not self.application().eventLoopIsActive:
event.ignore() event.ignore()
return return
# If we just did a settings import, close without saving changes. # If we just did a settings import, close without saving changes.