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

Display the forced IP address in the Connect/Share menu and the Wireless device dialog.

Browse Source
This commit is contained in:
Charles Haley 2012-09-05 13:06:41 +02:00
parent 1a19cd7c19
commit fd80b279cd
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/smart_device_app/driver.py
View File

@ -505,6 +505,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
return self.OPT_USE_PORT return self.OPT_USE_PORT
elif opt_string == 'port_number': elif opt_string == 'port_number':
return self.OPT_PORT_NUMBER return self.OPT_PORT_NUMBER
elif opt_string == 'force_ip_address':
return self.OPT_FORCE_IP_ADDRESS
else: else:
return None return None

5
src/calibre/gui2/actions/device.py
View File

@ -240,6 +240,11 @@ class ConnectShareAction(InterfaceAction):
from calibre.gui2.dialogs.smartdevice import get_all_ip_addresses from calibre.gui2.dialogs.smartdevice import get_all_ip_addresses
dm = self.gui.device_manager dm = self.gui.device_manager
forced_ip = dm.get_option('smartdevice', 'force_ip_address')
if forced_ip:
formatted_addresses = forced_ip
show_port = True
else:
all_ips = get_all_ip_addresses() all_ips = get_all_ip_addresses()
if len(all_ips) > 3: if len(all_ips) > 3:
formatted_addresses = _('Many IP addresses. See Start/Stop dialog.') formatted_addresses = _('Many IP addresses. See Start/Stop dialog.')

4
src/calibre/gui2/dialogs/smartdevice.py
View File

@ -115,6 +115,10 @@ class SmartdeviceDialog(QDialog, Ui_Dialog):
self.auto_mgmt_button.setText(_('Automatic metadata management is enabled')) self.auto_mgmt_button.setText(_('Automatic metadata management is enabled'))
self.auto_mgmt_button.setEnabled(False) self.auto_mgmt_button.setEnabled(False)
forced_ip = self.device_manager.get_option('smartdevice', 'force_ip_address')
if forced_ip:
self.ip_addresses.setText(forced_ip)
else:
self.ip_addresses.setText(', '.join(get_all_ip_addresses())) self.ip_addresses.setText(', '.join(get_all_ip_addresses()))
self.resize(self.sizeHint()) self.resize(self.sizeHint())