BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

kivy: gui improvements

This commit is contained in:
ThomasV 2017-07-12 17:23:21 +02:00
parent 73b023e967
commit 96a685a765
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui/kivy/main_window.py
View File

@ -80,6 +80,7 @@ class ElectrumWindow(App):
num_nodes = NumericProperty(0)
server_host = StringProperty('')
server_port = StringProperty('')
blockchain_name = StringProperty('')
auto_connect = BooleanProperty(False)
def on_auto_connect(self, instance, x):
@ -593,18 +594,19 @@ class ElectrumWindow(App):
if len(self.network.blockchains)>1:
msg = self.network.get_blockchain_name(self.network.blockchain())
else:
msg = _('Genesis block')
msg = _('Genesis')
return msg
def blockchain_info(self):
if len(self.network.blockchains)>1:
checkpoint = self.network.get_checkpoint()
msg = _('Chain split detected at block %d')%checkpoint
msg = _('Fork detected at block %d')%checkpoint
else:
msg = _('No chain split detected')
msg = _('The blockchain appears to be one')
return msg
def on_network(self, event, *args):
self.blockchain_name = self.blockchain_status()
if self.network.interface:
self.server_host = self.network.interface.host
if event == 'updated':

43
gui/kivy/uix/ui_screens/network.kv
View File

@ -14,33 +14,14 @@ Popup:
value: _("%d connections.")% app.num_nodes if app.num_nodes else _("Not connected")
title: _("Status") + ': ' + self.value
description: _("Connections with Electrum servers")
action: lambda x: x
action: lambda x: None
CardSeparator
SettingsItem:
title: _("Server") + ': ' + app.server_host
description: _("Server used to request your history.")
description: _("Server used to query your history.")
action: lambda x: app.popup_dialog('server')
CardSeparator
SettingsItem:
title: _("Auto-connect") + ': ' + ('ON' if app.auto_connect else 'OFF')
description: _("Find a server automatically")
action: app.toggle_auto_connect
CardSeparator
SettingsItem:
value: "%d blocks" % app.num_blocks
title: _("Blockchain") + ': ' + self.value
description: _("Verified block headers.")
action: lambda x: x
CardSeparator
SettingsItem:
title: _("Checkpoint") + ': ' + app.blockchain_status()
description: app.blockchain_info()
action: app.choose_blockchain_dialog
CardSeparator
SettingsItem:
proxy: app.proxy_config.get('mode')
@ -50,4 +31,24 @@ Popup:
description: _('Proxy configuration')
action: lambda x: app.popup_dialog('proxy')
CardSeparator
SettingsItem:
title: _("Auto-connect") + ': ' + ('ON' if app.auto_connect else 'OFF')
description: _("Select your server automatically")
action: app.toggle_auto_connect
CardSeparator
SettingsItem:
value: "%d blocks" % app.num_blocks
title: _("Blockchain") + ': ' + self.value
description: _('Verified block headers')
action: lambda x: x
CardSeparator
SettingsItem:
title: app.blockchain_info()
fork_description: (_('You are following branch') if app.auto_connect else _("Your server is on branch")) + ' ' + app.blockchain_name
description: _('Everything is fine') if self.disabled else self.fork_description
action: app.choose_blockchain_dialog
disabled: len(app.network.blockchains) == 1