Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

KG revisions

Browse Source
This commit is contained in:
GRiker 2010-05-28 15:42:52 -06:00
commit 178c06b43e
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/device.py
View File

@ -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:

4
src/calibre/gui2/ui.py
View File

@ -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()