Fix up after merge clash

bzr-revno: 338
This commit is contained in:
Tim Bentley 2009-02-21 20:02:33 +00:00
parent ec6c106009
commit 468f6cc256
1 changed files with 3 additions and 7 deletions

View File

@ -24,9 +24,10 @@ from PyQt4 import *
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.resources import * from openlp.core.resources import *
from openlp.core.ui import AboutForm, AlertForm, SettingsDialog
from openlp.core.ui import SlideController, ServiceManager 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 from openlp.core import PluginManager
import logging import logging
@ -56,11 +57,6 @@ class MainWindow(object):
log.info("hook media") log.info("hook media")
self.plugin_manager.hook_media_manager(self.MediaToolBox) self.plugin_manager.hook_media_manager(self.MediaToolBox)
# End adding media manager items. # 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): def setupUi(self):
self.main_window.setObjectName("main_window") self.main_window.setObjectName("main_window")