AaronFiore/electrum
1
0
Fork 0
Code Activity

Added proxy settings save to config.json

Browse Source
This commit is contained in:
bkkcoins
2012-09-20 18:24:36 +07:00
parent 9c4023ba58
commit 9121654e8a
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/gui_qt.py
View File

@@ -37,6 +37,7 @@ except:
sys.exit("Error: Could not import icons_rc.py, please generate it with: 'pyrcc4 icons.qrc -o lib/icons_rc.py'") sys.exit("Error: Could not import icons_rc.py, please generate it with: 'pyrcc4 icons.qrc -o lib/icons_rc.py'")
from wallet import format_satoshis from wallet import format_satoshis
from simple_config import SimpleConfig
import bmp, mnemonic, pyqrnative, qrscanner import bmp, mnemonic, pyqrnative, qrscanner
from decimal import Decimal from decimal import Decimal
@@ -1384,7 +1385,9 @@ class ElectrumWindow(QMainWindow):
hbox = QHBoxLayout() hbox = QHBoxLayout()
proxy_mode = QComboBox() proxy_mode = QComboBox()
proxy_host = QLineEdit() proxy_host = QLineEdit()
proxy_host.setFixedWidth(200)
proxy_port = QLineEdit() proxy_port = QLineEdit()
proxy_port.setFixedWidth(50)
proxy_mode.addItems(['NONE', 'SOCKS4', 'SOCKS5', 'HTTP']) proxy_mode.addItems(['NONE', 'SOCKS4', 'SOCKS5', 'HTTP'])
proxy_mode.setCurrentIndex(proxy_mode.findText(str(interface.proxy["mode"]).upper())) proxy_mode.setCurrentIndex(proxy_mode.findText(str(interface.proxy["mode"]).upper()))
proxy_host.setText(interface.proxy["host"]) proxy_host.setText(interface.proxy["host"])
@@ -1429,10 +1432,12 @@ class ElectrumWindow(QMainWindow):
server = unicode( host_line.text() ) server = unicode( host_line.text() )
try: try:
proxy = { u'mode':unicode(proxy_mode.currentText()).lower(), u'host':unicode(proxy_host.text()), u'port':unicode(proxy_port.text()) } cfg = SimpleConfig()
wallet.set_server(server, proxy) cfg.config["proxy"] = { u'mode':unicode(proxy_mode.currentText()).lower(), u'host':unicode(proxy_host.text()), u'port':unicode(proxy_port.text()) }
except: cfg.save_config()
QMessageBox.information(None, _('Error'), 'error', _('OK')) wallet.set_server(server, cfg.config["proxy"])
except Exception as err:
QMessageBox.information(None, _('Error'), str(err), _('OK'))
if parent == None: if parent == None:
sys.exit(1) sys.exit(1)
else: else:

1
lib/interface.py
View File

@@ -342,7 +342,6 @@ class WalletSynchronizer(threading.Thread):
self.proxy = proxy self.proxy = proxy
self.init_interface() self.init_interface()
self.servers_loaded_callback = servers_loaded_callback self.servers_loaded_callback = servers_loaded_callback
def init_interface(self): def init_interface(self):
try: try: