From 165c8471ea133d4326a4665607ad6c82e4425837 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 28 May 2010 15:37:20 -0600 Subject: [PATCH] oops --- src/calibre/gui2/device.py | 7 +++---- src/calibre/gui2/ui.py | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 283d3bf5ec..d3c2e4f10f 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -81,9 +81,7 @@ class DeviceJob(BaseJob): class DeviceManager(Thread): - open_feedback = pyqtSignal(object) - - def __init__(self, connected_slot, job_manager, sleep_time=2): + def __init__(self, connected_slot, job_manager, open_feedback_slot, sleep_time=2): ''' :sleep_time: Time to sleep between device probes in secs ''' @@ -102,6 +100,7 @@ class DeviceManager(Thread): self.ejected_devices = set([]) self.connected_device_is_folder = False self.folder_connection_requests = Queue.Queue(0) + self.open_feedback_slot = open_feedback_slot def report_progress(self, *args): pass @@ -117,7 +116,7 @@ class DeviceManager(Thread): def do_connect(self, connected_devices, is_folder_device): for dev, detected_device in connected_devices: if dev.OPEN_FEEDBACK_MESSAGE is not None: - self.open_feedback.emit(dev.OPEN_FEEDBACK_MESSAGE) + self.open_feedback_slot(dev.OPEN_FEEDBACK_MESSAGE) dev.reset(detected_device=detected_device, report_progress=self.report_progress) try: diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 8669aa55eb..8bc85e7195 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -234,9 +234,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): ####################### Setup device detection ######################## self.device_manager = DeviceManager(Dispatcher(self.device_detected), - self.job_manager) - self.device_manager.open_feedback.connect(self.status.showMessage, - type=Qt.QueuedConnection) + self.job_manager, Dispatcher(self.status_bar.showMessage)) self.device_manager.start()