tadd explanations to network dialog - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 9b99693ca11382a35ba010c103ecd339c2955431
DIR parent d3c537d0db0454f207ddd836339621c55bde30d9
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 22 Feb 2016 11:49:37 +0100
add explanations to network dialog
Diffstat:
M gui/kivy/uix/dialogs/settings.py | 18 ++++++++++--------
M gui/kivy/uix/ui_screens/network.kv | 12 +++++++-----
2 files changed, 17 insertions(+), 13 deletions(-)
---
DIR diff --git a/gui/kivy/uix/dialogs/settings.py b/gui/kivy/uix/dialogs/settings.py
t@@ -156,15 +156,17 @@ class SettingsDialog(Factory.Popup):
d = ChoiceDialog(_('Coin selection'), choosers, chooser_name, cb)
d.open()
- def openalias_dialog(self, label, dt):
- from label_dialog import LabelDialog
- def callback(text):
- label.text = text
- d = LabelDialog(_('OpenAlias'), '', callback)
- d.open()
-
- def network_dialog(self, label, dt):
+ def network_dialog(self, item, dt):
+ server, port, protocol, proxy, auto_connect = self.app.network.get_parameters()
+ def cb(popup):
+ server = popup.ids.host.text
+ auto_connect = popup.ids.auto_connect.active
+ self.app.network.set_parameters(server, port, protocol, proxy, auto_connect)
+ item.status = self.network_status()
popup = Builder.load_file('gui/kivy/uix/ui_screens/network.kv')
+ popup.ids.host.text = server
+ popup.ids.auto_connect.active = auto_connect
+ popup.on_dismiss = lambda: cb(popup)
popup.open()
def network_status(self):
DIR diff --git a/gui/kivy/uix/ui_screens/network.kv b/gui/kivy/uix/ui_screens/network.kv
t@@ -4,8 +4,6 @@ Popup:
n_nodes: len(app.network.get_interfaces())
blockchain_height: app.network.get_local_height()
is_connected: app.network.is_connected()
- on_open:
- host.text, nd.port, nd.protocol, nd.proxy, auto_connect.active = app.network.get_parameters()
BoxLayout:
orientation: 'vertical'
t@@ -20,7 +18,7 @@ Popup:
GridLayout:
cols: 2
Label:
- text: _('Address server')
+ text: _('Server')
Spinner:
id: host
height: '48dp'
t@@ -35,7 +33,12 @@ Popup:
Widget:
size_hint: 1, 0.1
TopLabel:
- text: _("Electrum retrieves your wallet information from a single server (Address server). In addition, it connects to a number of extra nodes, in order to fetch block headers. Block headers are used to verify the information sent by the address server, using Simple Payment Verification (SPV).")
+ text: _("Electrum retrieves your wallet information from a single node (address server). In addition, it connects to a number of extra nodes, in order to fetch block headers. Block headers are used to verify the information sent by the address server, using Simple Payment Verification (SPV).")
+ font_size: '6pt'
+ Widget:
+ size_hint: 1, 0.1
+ TopLabel:
+ text: _("If auto-connect is checked, the address server will be selected automatically.")
font_size: '6pt'
Widget:
size_hint: 1, 0.1
t@@ -48,5 +51,4 @@ Popup:
height: '48dp'
text: _('OK')
on_release:
- app.network.set_parameters(host.text, nd.port, nd.protocol, nd.proxy, auto_connect.active)
nd.dismiss()