Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-04-21 12:43:27 +02:00
Code Issues Projects Releases Wiki Activity

Very strange change to prevent calibre from dieing when device_metadata_available or device_connection_changed is emitted.

Browse source
This commit is contained in:
Charles Haley 2011-04-19 13:42:09 +01:00
parent d95d6eca67
commit b4dda27923
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/calibre/gui2/device.py
View file

@ -7,7 +7,7 @@
from threading import Thread
from PyQt4.Qt import QMenu, QAction, QActionGroup, QIcon, SIGNAL, \
Qt, pyqtSignal, QDialog
Qt, pyqtSignal, QDialog, QObject
from calibre.customize.ui import available_input_formats, available_output_formats, \
device_plugins
@ -587,8 +587,7 @@ def enable_device_actions(self, enable, card_prefix=(None, None),
# }}}
class DeviceMixin(object): # {{{
class DeviceSignals(QObject):
#: This signal is emitted once, after metadata is downloaded from the
#: connected device.
#: The sequence: gui.device_manager.is_device_connected will become True,
@ -599,6 +598,10 @@ class DeviceMixin(object): # {{{
device_metadata_available = pyqtSignal()
device_connection_changed = pyqtSignal(object)
device_signals = DeviceSignals()
class DeviceMixin(object): # {{{
def __init__(self):
self.device_error_dialog = error_dialog(self, _('Error'),
_('Error communicating with device'), ' ')
@ -745,7 +748,7 @@ def device_detected(self, connected, device_kind):
self.location_manager.update_devices()
self.library_view.set_device_connected(self.device_connected)
self.refresh_ondevice()
self.device_connection_changed.emit(connected)
device_signals.device_connection_changed.emit(connected)
def info_read(self, job):
'''
@ -784,7 +787,7 @@ def metadata_downloaded(self, job):
self.sync_news()
self.sync_catalogs()
self.refresh_ondevice()
self.device_metadata_available.emit()
device_signals.device_metadata_available.emit()
def refresh_ondevice(self, reset_only = False):
'''