AaronFiore/electrum
1
0
Fork 0
Code Activity

Revert "Added proxy options to network dialog"

Browse Source 
This reverts commit 83bb644135.
This commit is contained in:
bkkcoins
2012-09-20 16:55:15 +07:00
parent af750d9363
commit 6e0b3620d2
4 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/gui_qt.py
View File

@@ -1380,22 +1380,6 @@ class ElectrumWindow(QMainWindow):
hbox.addWidget(radio2)
vbox.addLayout(hbox)
hbox = QHBoxLayout()
proxy_mode = QComboBox()
proxy_host = QLineEdit()
proxy_port = QLineEdit()
proxy_mode.addItems(['NONE', 'SOCKS4', 'SOCKS5', 'HTTP'])
proxy_mode.setCurrentIndex(proxy_mode.findText(str(interface.proxy["mode"]).upper()))
proxy_host.setText(interface.proxy["host"])
proxy_port.setText(interface.proxy["port"])
hbox.addWidget(QLabel(_('Proxy') + ':'))
hbox.addWidget(proxy_mode)
hbox.addWidget(proxy_host)
hbox.addWidget(proxy_port)
vbox.addLayout(hbox)
hbox = QHBoxLayout()
if wallet.interface.servers:
label = _('Active Servers')
@@ -1429,8 +1413,7 @@ class ElectrumWindow(QMainWindow):
server = unicode( host_line.text() )
try:
proxy = { u'mode':unicode(proxy_mode.currentText()).lower(), u'host':unicode(proxy_host.text()), u'port':unicode(proxy_port.text()) }
wallet.set_server(server, proxy)
wallet.set_server(server)
except:
QMessageBox.information(None, _('Error'), 'error', _('OK'))
if parent == None: