tkivy: add server chooser 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 6bd191966e2ddf389147e7003013f996816fb8d8
DIR parent 59948d725c243dd6fd289561ada9ec23c587ed7b
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 15 Oct 2015 11:57:07 +0200
kivy: add server chooser to network dialog
Diffstat:
M gui/kivy/uix/ui_screens/network.kv | 27 ++++++++++++++++++---------
M gui/kivy/uix/ui_screens/settings.kv | 5 +++--
2 files changed, 21 insertions(+), 11 deletions(-)
---
DIR diff --git a/gui/kivy/uix/ui_screens/network.kv b/gui/kivy/uix/ui_screens/network.kv
t@@ -5,9 +5,6 @@ Popup:
on_open:
host.text, nd.port, nd.protocol, nd.proxy, auto_connect.active = app.network.get_parameters()
- on_dismiss:
- app.network.set_parameters(host.text, nd.port, nd.protocol, nd.proxy, auto_connect.active)
-
BoxLayout:
orientation: 'vertical'
t@@ -21,14 +18,26 @@ Popup:
size_hint_y: None
Label:
text: _('Server')
- Label:
+ Spinner:
id: host
+ text: ''
+ values: app.network.get_servers()
+
- Button:
- size_hint: 0.5, None
- height: '48dp'
- text: _('Close')
- on_release: nd.dismiss()
+ BoxLayout:
+ Button:
+ size_hint: 0.5, None
+ height: '48dp'
+ text: _('Cancel')
+ on_release:
+ nd.dismiss()
+ Button:
+ size_hint: 0.5, None
+ height: '48dp'
+ text: _('OK')
+ on_release:
+ app.network.set_parameters(host.text, nd.port, nd.protocol, nd.proxy, auto_connect.active)
+ nd.dismiss()
Widget:
size_hint: 1, 1
DIR diff --git a/gui/kivy/uix/ui_screens/settings.kv b/gui/kivy/uix/ui_screens/settings.kv
t@@ -9,10 +9,11 @@ Popup:
GridLayout:
cols: 2
size_hint: 1, None
+ height: '100dp'
Label:
text: _('Base unit')
- height: '48dp'
size_hint: 1, None
+ height: '48dp'
Button:
text: app.base_unit
size_hint: 1, None
t@@ -35,5 +36,5 @@ Popup:
on_release: settings.dismiss()
Widget:
- size_hint: 1, 0.8
+ size_hint: 1, 1