mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Disable the start wireless device connection menu item when a wired device is connected
This commit is contained in:
parent
76c07f7d49
commit
2cdc6c03b3
@ -139,10 +139,13 @@ class ShareConnMenu(QMenu): # {{{
|
||||
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 @@ class ConnectShareAction(InterfaceAction):
|
||||
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()
|
||||
|
@ -929,7 +929,8 @@ class DeviceMixin(object): # {{{
|
||||
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 @@ class DeviceMixin(object): # {{{
|
||||
# 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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user