kivy: connect do_clear button, fixes
This commit is contained in:
parent
4a0fceca90
commit
c478122cb1
|
@ -581,7 +581,6 @@ class ElectrumWindow(App):
|
|||
#Logger.info('orientation: {}'.format(self._orientation))
|
||||
#Logger.info('ui_mode: {}'.format(self._ui_mode))
|
||||
|
||||
|
||||
def save_new_contact(self, address, label):
|
||||
address = unicode(address)
|
||||
label = unicode(label)
|
||||
|
@ -657,18 +656,6 @@ class ElectrumWindow(App):
|
|||
# wait for screen to load
|
||||
Clock.schedule_once(set_address, .5)
|
||||
|
||||
def do_clear(self):
|
||||
tabs = self.tabs
|
||||
screen_send = tabs.ids.screen_send
|
||||
content = screen_send.ids.content
|
||||
cts = content.ids
|
||||
cts.payto_e.text = cts.message_e.text = cts.amount_e.text = \
|
||||
cts.fee_e.text = ''
|
||||
|
||||
self.set_frozen(content, False)
|
||||
|
||||
self.update_status()
|
||||
|
||||
def set_frozen(self, entry, frozen):
|
||||
if frozen:
|
||||
entry.disabled = True
|
||||
|
|
|
@ -203,6 +203,12 @@ class SendScreen(CScreen):
|
|||
self.ids.message_e.text = uri.get('message', '')
|
||||
self.ids.amount_e.text = uri.get('amount', '')
|
||||
|
||||
def do_clear(self):
|
||||
cts = self.ids
|
||||
cts.payto_e.text = cts.message_e.text = cts.amount_e.text = ''
|
||||
#self.set_frozen(content, False)
|
||||
#self.update_status()
|
||||
|
||||
def do_send(self):
|
||||
scrn = self.ids
|
||||
label = unicode(scrn.message_e.text)
|
||||
|
@ -216,11 +222,10 @@ class SendScreen(CScreen):
|
|||
return
|
||||
|
||||
amount = self.app.get_amount(scrn.amount_e.text)
|
||||
fee = scrn.fee_e.amt
|
||||
if not fee:
|
||||
app.show_error(_('Invalid Fee'))
|
||||
return
|
||||
|
||||
#fee = scrn.fee_e.amt
|
||||
#if not fee:
|
||||
# app.show_error(_('Invalid Fee'))
|
||||
# return
|
||||
fee = None
|
||||
message = 'sending {} {} to {}'.format(self.app.base_unit, scrn.amount_e.text, r)
|
||||
outputs = [('address', to_address, amount)]
|
||||
|
|
|
@ -164,12 +164,11 @@ SendScreen:
|
|||
text: _('Clear')
|
||||
size_hint_y: None
|
||||
height: '38dp'
|
||||
disabled: False
|
||||
on_release: send_screen.do_clear()
|
||||
Button:
|
||||
text: _('Send')
|
||||
size_hint_y: None
|
||||
height: '38dp'
|
||||
disabled: False
|
||||
on_release: send_screen.do_send()
|
||||
Widget
|
||||
|
||||
|
|
Loading…
Reference in New Issue