Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-08 22:53:38 +02:00
Code Issues Projects Releases Wiki Activity

Disable the start wireless device connection menu item when a wired device is connected

Browse source
This commit is contained in:
Kovid Goyal 2012-09-16 20:39:16 +05:30
parent 76c07f7d49
commit 2cdc6c03b3
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/calibre/gui2/actions/device.py
View file

@ -139,10 +139,13 @@ def build_email_entries(self, sync_menu):
def setup_email(self, *args):
self.config_email.emit()
def set_state(self, device_connected):
def set_state(self, device_connected, device):
self.connect_to_folder_action.setEnabled(not device_connected)
self.connect_to_itunes_action.setEnabled(not device_connected)
self.connect_to_bambook_action.setEnabled(not device_connected)
enabled = not device_connected or (device_connected and
device.__class__.__name__ == 'SMART_DEVICE_APP')
self.control_smartdevice_action.setEnabled(enabled)
# }}}
@ -187,8 +190,8 @@ def location_selected(self, loc):
enabled = loc == 'library'
self.qaction.setEnabled(enabled)
def set_state(self, device_connected):
self.share_conn_menu.set_state(device_connected)
def set_state(self, device_connected, device):
self.share_conn_menu.set_state(device_connected, device)
def build_email_entries(self):
m = self.gui.iactions['Send To Device'].qaction.menu()

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

@ -929,7 +929,8 @@ def create_device_menu(self):
self._sync_menu.fetch_annotations.connect(
self.iactions['Fetch Annotations'].fetch_annotations)
self._sync_menu.disconnect_mounted_device.connect(self.disconnect_mounted_device)
self.iactions['Connect Share'].set_state(self.device_connected)
self.iactions['Connect Share'].set_state(self.device_connected,
None)
if self.device_connected:
self._sync_menu.disconnect_mounted_device_action.setEnabled(True)
else:
@ -968,7 +969,8 @@ def device_job_exception(self, job):
# Device connected {{{
def set_device_menu_items_state(self, connected):
self.iactions['Connect Share'].set_state(connected)
self.iactions['Connect Share'].set_state(connected,
self.device_manager.device)
if connected:
self._sync_menu.disconnect_mounted_device_action.setEnabled(True)
self._sync_menu.enable_device_actions(True,