Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2012-08-23 13:08:39 +05:30
commit a8db5812a2
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,11 +53,13 @@ class SmartdeviceDialog(QDialog, Ui_Dialog):
if pw: if pw:
self.password_box.setText(pw) self.password_box.setText(pw)
use_fixed_port = self.device_manager.get_option('smartdevice', 'use_fixed_port') self.orig_fixed_port = self.device_manager.get_option('smartdevice',
port_number = self.device_manager.get_option('smartdevice', 'port_number') 'use_fixed_port')
self.fixed_port.setText(port_number) self.orig_port_number = self.device_manager.get_option('smartdevice',
self.use_fixed_port.setChecked(use_fixed_port); 'port_number')
if not use_fixed_port: self.fixed_port.setText(self.orig_port_number)
self.use_fixed_port.setChecked(self.orig_fixed_port);
if not self.orig_fixed_port:
self.fixed_port.setEnabled(False); self.fixed_port.setEnabled(False);
if pw: if pw:
@ -85,8 +87,13 @@ class SmartdeviceDialog(QDialog, Ui_Dialog):
message = self.device_manager.start_plugin('smartdevice') message = self.device_manager.start_plugin('smartdevice')
if not self.device_manager.is_running('smartdevice'): if not self.device_manager.is_running('smartdevice'):
error_dialog(self, _('Problem starting smartdevice'), error_dialog(self, _('Problem starting the wireless device'),
_('The snart device driver did not start. It said "%s"')%message, show=True) _('The wireless device driver did not start. It said "%s"')%message,
show=True)
self.device_manager.set_option('smartdevice', 'use_fixed_port',
self.orig_fixed_port)
self.device_manager.set_option('smartdevice', 'port_number',
self.orig_port_number)
else: else:
QDialog.accept(self) QDialog.accept(self)

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

@ -339,14 +339,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
if config['autolaunch_server']: if config['autolaunch_server']:
self.start_content_server() self.start_content_server()
smartdevice_action = self.iactions['Connect Share']
smartdevice_action.check_smartdevice_menus()
if self.device_manager.get_option('smartdevice', 'autostart'):
try:
self.device_manager.start_plugin('smartdevice')
except:
pass
smartdevice_action.set_smartdevice_action_state()
self.keyboard_interrupt.connect(self.quit, type=Qt.QueuedConnection) self.keyboard_interrupt.connect(self.quit, type=Qt.QueuedConnection)
@ -381,9 +373,29 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
'the file: %s<p>The ' 'the file: %s<p>The '
'log will be displayed automatically.')%self.gui_debug, show=True) 'log will be displayed automatically.')%self.gui_debug, show=True)
self.iactions['Connect Share'].check_smartdevice_menus()
QTimer.singleShot(1, self.start_smartdevice)
def esc(self, *args): def esc(self, *args):
self.clear_button.click() self.clear_button.click()
def start_smartdevice(self):
message = None
if self.device_manager.get_option('smartdevice', 'autostart'):
try:
message = self.device_manager.start_plugin('smartdevice')
except:
message = 'start smartdevice unknown exception'
prints(message)
import traceback
traceback.print_exc()
if message:
if not self.device_manager.is_running('Wireless Devices'):
error_dialog(self, _('Problem starting the wireless device'),
_('The wireless device driver did not start. '
'It said "%s"')%message, show=True)
self.iactions['Connect Share'].set_smartdevice_action_state()
def start_content_server(self, check_started=True): def start_content_server(self, check_started=True):
from calibre.library.server.main import start_threaded_server from calibre.library.server.main import start_threaded_server
from calibre.library.server import server_config from calibre.library.server import server_config