From e63d76a300551f40c74fa6d9554c17672dd636cf Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 1 Aug 2012 15:39:46 +0530 Subject: [PATCH] ... --- src/calibre/gui2/dialogs/smartdevice.py | 10 +++++++--- src/calibre/gui2/dialogs/smartdevice.ui | 11 ++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/calibre/gui2/dialogs/smartdevice.py b/src/calibre/gui2/dialogs/smartdevice.py index b9e16cfcd3..d62011b9fe 100644 --- a/src/calibre/gui2/dialogs/smartdevice.py +++ b/src/calibre/gui2/dialogs/smartdevice.py @@ -1,8 +1,11 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from __future__ import (unicode_literals, division, absolute_import, + print_function) __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' -from PyQt4.QtGui import QDialog, QLineEdit -from PyQt4.QtCore import SIGNAL, Qt +from PyQt4.Qt import (QDialog, QLineEdit, Qt) from calibre.gui2.dialogs.smartdevice_ui import Ui_Dialog @@ -24,7 +27,7 @@ class SmartdeviceDialog(QDialog, Ui_Dialog): 'smart device interface when calibre starts. You should not do ' 'this if you are using a network that is not secure and you ' 'are not setting a password.') + '

') - self.connect(self.show_password, SIGNAL('stateChanged(int)'), self.toggle_password) + self.show_password.stateChanged[int].connect(self.toggle_password) self.device_manager = parent.device_manager @@ -34,6 +37,7 @@ class SmartdeviceDialog(QDialog, Ui_Dialog): pw = self.device_manager.get_option('smartdevice', 'password') if pw: self.password_box.setText(pw) + self.resize(self.sizeHint()) def toggle_password(self, state): if state == Qt.Unchecked: diff --git a/src/calibre/gui2/dialogs/smartdevice.ui b/src/calibre/gui2/dialogs/smartdevice.ui index 0e31cd12ac..512adef09d 100644 --- a/src/calibre/gui2/dialogs/smartdevice.ui +++ b/src/calibre/gui2/dialogs/smartdevice.ui @@ -71,7 +71,7 @@ - + Qt::Horizontal @@ -81,20 +81,13 @@ - + &Automatically allow connections at startup - - - - &Allow connections - - -