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

Implement #5139 (An option for ejecting a device from the tray icon)

Browse Source
This commit is contained in:
Kovid Goyal 2010-04-17 18:04:49 +05:30
parent 709a33340d
commit c1e1221256
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,7 +154,7 @@ class DeviceManager(Thread):
if not self.do_connect(possibly_connected_devices): if not self.do_connect(possibly_connected_devices):
print 'Device connect failed again, giving up' print 'Device connect failed again, giving up'
def umount_device(self): def umount_device(self, *args):
if self.is_device_connected: if self.is_device_connected:
self.connected_device.eject() self.connected_device.eject()
self.ejected_devices.add(self.connected_device) self.ejected_devices.add(self.connected_device)

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

@ -194,6 +194,9 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
self.donate_action = self.system_tray_menu.addAction( self.donate_action = self.system_tray_menu.addAction(
QIcon(I('donate.svg')), _('&Donate to support calibre')) QIcon(I('donate.svg')), _('&Donate to support calibre'))
self.donate_button.setDefaultAction(self.donate_action) self.donate_button.setDefaultAction(self.donate_action)
self.eject_action = self.system_tray_menu.addAction(
QIcon(I('eject.svg')), _('&Eject connected device'))
self.eject_action.setEnabled(False)
if not config['show_donate_button']: if not config['show_donate_button']:
self.donate_button.setVisible(False) self.donate_button.setVisible(False)
self.addAction(self.quit_action) self.addAction(self.quit_action)
@ -234,6 +237,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
QObject.connect(self.location_view, QObject.connect(self.location_view,
SIGNAL('umount_device()'), SIGNAL('umount_device()'),
self.device_manager.umount_device) self.device_manager.umount_device)
self.eject_action.triggered.connect(self.device_manager.umount_device)
####################### Vanity ######################## ####################### Vanity ########################
self.vanity_template = _('<p>For help see the: <a href="%s">User Manual</a>' self.vanity_template = _('<p>For help see the: <a href="%s">User Manual</a>'
@ -889,6 +893,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
self.device_manager.device.card_prefix(), self.device_manager.device.card_prefix(),
self.device_manager.device) self.device_manager.device)
self.location_view.model().device_connected(self.device_manager.device) self.location_view.model().device_connected(self.device_manager.device)
self.eject_action.setEnabled(True)
else: else:
self.save_device_view_settings() self.save_device_view_settings()
self.device_connected = False self.device_connected = False
@ -900,6 +905,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
if self.current_view() != self.library_view: if self.current_view() != self.library_view:
self.status_bar.reset_info() self.status_bar.reset_info()
self.location_view.setCurrentIndex(self.location_view.model().index(0)) self.location_view.setCurrentIndex(self.location_view.model().index(0))
self.eject_action.setEnabled(False)
def info_read(self, job): def info_read(self, job):
''' '''