electrum

commit 9580cd62f61865553de0802af39bfd6edcca1fa8
parent 488bdbf4b51a107361cbcf8c6b0506ecaf6c820d
Author: ThomasV <thomasv@electrum.org>
Date:   Sat, 23 Jan 2016 19:28:01 +0100

kivy: use Clock.schedule_once for actions in settings menu

Diffstat:
M
gui/kivy/uix/dialogs/settings.py
 | 
43
+++++++++++++++++++++----------------------

1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/gui/kivy/uix/dialogs/settings.py b/gui/kivy/uix/dialogs/settings.py
@@ -10,6 +10,8 @@ from electrum.plugins import run_hook
 from electrum.bitcoin import RECOMMENDED_FEE
 
 Builder.load_string('''
+#:import partial functools.partial
+
 <SettingsItem@ButtonBehavior+BoxLayout>
     orientation: 'vertical'
     title: ''
@@ -22,6 +24,8 @@ Builder.load_string('''
         Rectangle:
             size: self.size
             pos: self.pos
+    on_release:
+        Clock.schedule_once(self.action)
 
     Label:
         id: title
@@ -55,45 +59,37 @@ Builder.load_string('''
                     lang: settings.get_language_name()
                     title: _('Language') + ': %s'%self.lang
                     description: _("Language")
-                    on_release:
-                        settings.language_dialog(self)
+                    action: partial(root.language_dialog, self)
                     height: '48dp'
                 SettingsItem:
                     status: 'ON' if app.wallet.use_encryption else 'OFF'
                     title: _('PIN code') + ': ' + self.status
                     description: _("Change your PIN code.")
-                    on_release:
-                        app.change_password()
-                        self.status = 'ON' if app.wallet.use_encryption else 'OFF'
+                    action: partial(root.change_password, self)
                 SettingsItem:
                     bu: app.base_unit
                     title: _('Denomination') + ': ' + self.bu
                     description: _("Base unit for Bitcoin amounts.")
-                    on_release:
-                        settings.unit_dialog(self)
+                    action: partial(root.unit_dialog, self)
                 SettingsItem:
                     status: root.fee_status()
                     title: _('Fees') + ': ' + self.status
                     description: _("Fees paid to the Bitcoin miners.")
-                    on_release:
-                        root.fee_dialog(self)
+                    action: partial(root.fee_dialog, self)
                 SettingsItem:
                     status: root.fx_status()
                     title: _('Fiat Currency') + ': ' + self.status
                     description: _("Display amounts in fiat currency.")
-                    on_release:
-                        root.fx_dialog(self)
+                    action: partial(root.fx_dialog, self)
                 SettingsItem:
                     status: 'ON' if bool(app.plugins.get('labels')) else 'OFF'
                     title: _('Labels Sync') + ': ' + self.status
                     description: "Synchronize labels."
-                    on_release:
-                        settings.plugin_dialog('labels', self)
+                    action: partial(root.plugin_dialog, 'labels', self)
                 SettingsItem:
                     title: _('OpenAlias')
                     description: "DNS record that stores one of your Bitcoin addresses."
-                    on_release:
-                        settings.openalias_dialog()
+                    action: partial(root.openalias_dialog, self)
         BoxLayout:
             size_hint: 1, 0.1
             Widget:
@@ -119,7 +115,10 @@ class SettingsDialog(Factory.Popup):
     def get_language_name(self):
         return languages.get(self.config.get('language', 'en_UK'), '')
 
-    def language_dialog(self, item):
+    def change_password(self, label, dt):
+        self.app.change_password()
+
+    def language_dialog(self, item, dt):
         from choice_dialog import ChoiceDialog
         l = self.config.get('language', 'en_UK')
         def cb(key):
@@ -129,7 +128,7 @@ class SettingsDialog(Factory.Popup):
         d = ChoiceDialog(_('Language'), languages, l, cb)
         d.open()
 
-    def unit_dialog(self, item):
+    def unit_dialog(self, item, dt):
         from choice_dialog import ChoiceDialog
         def cb(text):
             self.app._set_bu(text)
@@ -137,14 +136,14 @@ class SettingsDialog(Factory.Popup):
         d = ChoiceDialog(_('Denomination'), base_units.keys(), self.app.base_unit, cb)
         d.open()
 
-    def openalias_dialog(self):
+    def openalias_dialog(self, label, dt):
         from label_dialog import LabelDialog
         def callback(text):
-            pass
+            label.text = text
         d = LabelDialog(_('OpenAlias'), '', callback)
         d.open()
 
-    def plugin_dialog(self, name, label):
+    def plugin_dialog(self, name, label, dt):
         from checkbox_dialog import CheckBoxDialog
         def callback(status):
             self.plugins.enable(name) if status else self.plugins.disable(name)
@@ -165,7 +164,7 @@ class SettingsDialog(Factory.Popup):
             F = self.config.get('fee_per_kb', RECOMMENDED_FEE)
             return self.app.format_amount(F) + ' ' + self.app.base_unit + '/kB'
 
-    def fee_dialog(self, label):
+    def fee_dialog(self, label, dt):
         from fee_dialog import FeeDialog
         def cb():
             label.status = self.fee_status()
@@ -181,7 +180,7 @@ class SettingsDialog(Factory.Popup):
         else:
             return 'Disabled'
 
-    def fx_dialog(self, label):
+    def fx_dialog(self, label, dt):
         from fx_dialog import FxDialog
         def cb():
             label.status = self.fx_status()