From 468f6cc25677bf0aa0b3f09ac44392a3090471e3 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 21 Feb 2009 20:02:33 +0000 Subject: [PATCH] Fix up after merge clash bzr-revno: 338 --- openlp/core/ui/mainwindow.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 8e9a2c205..abfe01031 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -24,9 +24,10 @@ from PyQt4 import * from PyQt4 import QtCore, QtGui from openlp.core.resources import * -from openlp.core.ui import AboutForm, AlertForm, SettingsDialog + from openlp.core.ui import SlideController, ServiceManager -from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab, Receiver +from openlp.core.ui import AboutForm, AlertForm, SettingsDialog, SlideController +from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab from openlp.core import PluginManager import logging @@ -56,11 +57,6 @@ class MainWindow(object): log.info("hook media") self.plugin_manager.hook_media_manager(self.MediaToolBox) # End adding media manager items. - self.receiver = Receiver() - QtCore.QObject.connect(self.receiver.get_receiver(),QtCore.SIGNAL("openlprepaint"),self.repaint) - - def repaint(self): - self.main_window.repaint() def setupUi(self): self.main_window.setObjectName("main_window")