tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit c19c314c0fb86f5baaeb636036849d3e51a52bb7
DIR parent 728ef1f76cd4b6ac03493401376039915e2d509a
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 30 Oct 2015 15:45:23 +0100
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M gui/kivy/main_window.py | 15 +++++++++++----
M gui/kivy/uix/ui_screens/amount.kv | 2 +-
2 files changed, 12 insertions(+), 5 deletions(-)
---
DIR diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
t@@ -425,7 +425,7 @@ class ElectrumWindow(App):
self.status = text.strip() + ' ' + self.base_unit
else:
self.status = _("Not connected")
-
+
return
print self.root.manager.ids
t@@ -733,6 +733,16 @@ class ElectrumWindow(App):
def amount_dialog(self, label, callback):
popup = Builder.load_file('gui/kivy/uix/ui_screens/amount.kv')
+ # Hide max_button
+ show_max = False
+ but_max = popup.ids.but_max
+ if not show_max:
+ but_max.disabled = True
+ but_max.opacity = 0
+ else:
+ but_max.disabled = False
+ but_max.opacity = 1
+
if label.text != label.default_text:
a, u = label.text.split()
assert u == self.base_unit
t@@ -755,6 +765,3 @@ class ElectrumWindow(App):
popup.open()
else:
apply(f, args + (None,))
-
-
-
DIR diff --git a/gui/kivy/uix/ui_screens/amount.kv b/gui/kivy/uix/ui_screens/amount.kv
t@@ -66,6 +66,7 @@ Popup:
text: '<'
label: a
Button:
+ id: but_max
size_hint: 1, None
height: '48dp'
text: 'Max'
t@@ -84,4 +85,3 @@ Popup:
height: '48dp'
text: _('OK')
on_release: popup.dismiss()
-