tkivy: update settings dialog before display - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 6ca699459a0971946380bee34f0e4bbb85accd97
DIR parent 8bc0fcf541d79a1e615ce1003b419b7b2feecf55
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sun, 6 Mar 2016 12:57:21 +0100
kivy: update settings dialog before display
Diffstat:
M gui/kivy/main_window.py | 1 +
M gui/kivy/uix/dialogs/settings.py | 20 ++++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
---
DIR diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
t@@ -432,6 +432,7 @@ class ElectrumWindow(App):
if self._settings_dialog is None:
from uix.dialogs.settings import SettingsDialog
self._settings_dialog = SettingsDialog(self)
+ self._settings_dialog.update()
self._settings_dialog.open()
def popup_dialog(self, name):
DIR diff --git a/gui/kivy/uix/dialogs/settings.py b/gui/kivy/uix/dialogs/settings.py
t@@ -47,6 +47,8 @@ Builder.load_string('''
<SettingsDialog@Popup>
id: settings
title: _('Electrum Settings')
+ watching_only: False
+ use_encryption: False
BoxLayout:
orientation: 'vertical'
ScrollView:
t@@ -63,8 +65,8 @@ Builder.load_string('''
action: partial(root.language_dialog, self)
CardSeparator
SettingsItem:
- status: root.password_status()
- disabled: app.wallet.is_watching_only()
+ status: 'watching-only' if root.watching_only else ('ON' if root.use_encryption else 'OFF')
+ disabled: root.watching_only
title: _('PIN code') + ': ' + self.status
description: _("Change your PIN code.")
action: partial(root.change_password, self)
t@@ -125,18 +127,16 @@ class SettingsDialog(Factory.Popup):
self._unit_dialog = None
self._coinselect_dialog = None
+ def update(self):
+ self.wallet = self.app.wallet
+ self.watching_only = self.wallet.is_watching_only()
+ self.use_encryption = self.wallet.use_encryption
+
def get_language_name(self):
return languages.get(self.config.get('language', 'en_UK'), '')
- def password_status(self):
- if self.app.wallet.is_watching_only():
- return 'watching-only'
- return 'ON' if self.app.wallet.use_encryption else 'OFF'
-
def change_password(self, item, dt):
- def cb():
- item.status = self.password_status()
- self.app.change_password(cb)
+ self.app.change_password(self.update)
def language_dialog(self, item, dt):
if self._language_dialog is None: