AaronFiore/electrum
1
0
Fork 0
Code Activity

removed trailing whitespace and fixed indentation in history widget

Browse Source
This commit is contained in:
Tafelpoot
2014-10-21 19:05:51 +02:00
parent 49c0a3a08f
commit d9c5250a6f
35 changed files with 230 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gui/qt/network_dialog.py
View File

@@ -56,7 +56,7 @@ class NetworkDialog(QDialog):
else:
status = _("Not connected")
if network.is_connected():
status += "\n" + _("Server") + ": %s"%(host)
status += "\n" + _("Server") + ": %s"%(host)
else:
status += "\n" + _("Disconnected from server")
else:
@@ -117,14 +117,14 @@ class NetworkDialog(QDialog):
self.change_server(host, protocol)
self.set_protocol(protocol)
self.servers_list_widget.connect(self.servers_list_widget,
SIGNAL('currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)'),
self.servers_list_widget.connect(self.servers_list_widget,
SIGNAL('currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)'),
lambda x,y: self.server_changed(x))
grid.addWidget(self.servers_list_widget, 1, 1, 1, 3)
if not config.is_modifiable('server'):
for w in [self.server_host, self.server_port, self.server_protocol, self.servers_list_widget]: w.setEnabled(False)
def enable_set_server():
enabled = not self.autocycle_cb.isChecked()
self.server_host.setEnabled(enabled)
@@ -167,7 +167,7 @@ class NetworkDialog(QDialog):
# buttons
vbox.addLayout(ok_cancel_buttons(self))
self.setLayout(vbox)
self.setLayout(vbox)
def init_servers_list(self):
@@ -182,7 +182,7 @@ class NetworkDialog(QDialog):
if protocol != self.protocol:
self.protocol = protocol
self.init_servers_list()
def change_protocol(self, index):
p = protocol_letters[index]
host = unicode(self.server_host.text())
@@ -195,7 +195,7 @@ class NetworkDialog(QDialog):
self.set_protocol(p)
def server_changed(self, x):
if x:
if x:
self.change_server(str(x.text(0)), self.protocol)
def change_server(self, host, protocol):
@@ -204,7 +204,7 @@ class NetworkDialog(QDialog):
if protocol:
port = pp.get(protocol)
if not port: protocol = None
if not protocol:
if 's' in pp.keys():
protocol = 's'
@@ -212,7 +212,7 @@ class NetworkDialog(QDialog):
else:
protocol = pp.keys()[0]
port = pp.get(protocol)
self.server_host.setText( host )
self.server_port.setText( port )
self.server_protocol.setCurrentIndex(protocol_letters.index(protocol))
@@ -237,8 +237,8 @@ class NetworkDialog(QDialog):
protocol = protocol_letters[self.server_protocol.currentIndex()]
if self.proxy_mode.currentText() != 'NONE':
proxy = { 'mode':str(self.proxy_mode.currentText()).lower(),
'host':str(self.proxy_host.text()),
proxy = { 'mode':str(self.proxy_mode.currentText()).lower(),
'host':str(self.proxy_host.text()),
'port':str(self.proxy_port.text()) }
else:
proxy = None