RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kivy: cleanup addresses dialog

Browse Source
This commit is contained in:
ThomasV 2018-04-07 18:16:33 +02:00
parent 7b50790584
commit a03449c1be
1 changed files with 10 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
gui/kivy/uix/dialogs/addresses.py
View File

@ -118,19 +118,13 @@ class AddressesDialog(Factory.Popup):
ci.screen = self ci.screen = self
ci.address = addr ci.address = addr
self.cards[addr] = ci self.cards[addr] = ci
ci.memo = label ci.memo = label
ci.amount = self.app.format_amount_and_units(balance) ci.amount = self.app.format_amount_and_units(balance)
request = self.app.wallet.get_payment_request(addr, self.app.electrum_config) ci.status = _('Used') if is_used else _('Funded') if balance > 0 else _('Unused')
if is_used:
ci.status = _('Used')
else:
ci.status = _('Funded') if balance > 0 else _('Unused')
return ci return ci
def update(self): def update(self):
self.menu_actions = [(_('Use'), self.do_show), (_('Details'), self.do_view)] self.menu_actions = [(_('Use'), self.do_use), (_('Details'), self.do_view)]
wallet = self.app.wallet wallet = self.app.wallet
if self.show_change == 0: if self.show_change == 0:
_list = wallet.get_receiving_addresses() _list = wallet.get_receiving_addresses()
@ -161,46 +155,19 @@ class AddressesDialog(Factory.Popup):
msg = _('No address matching your search') msg = _('No address matching your search')
container.add_widget(EmptyLabel(text=msg)) container.add_widget(EmptyLabel(text=msg))
def do_show(self, obj): def do_use(self, obj):
self.hide_menu() self.hide_menu()
self.dismiss() self.dismiss()
self.app.show_request(obj.address) self.app.show_request(obj.address)
def do_view(self, obj): def do_view(self, obj):
req = self.app.wallet.get_payment_request(obj.address, self.app.electrum_config) req = { 'address': obj.address, 'status' : obj.status }
if req: status = obj.status
c, u, x = self.app.wallet.get_addr_balance(obj.address) c, u, x = self.app.wallet.get_addr_balance(obj.address)
balance = c + u + x balance = c + u + x
if balance > 0: if balance > 0:
req['fund'] = balance req['fund'] = balance
status = req.get('status') self.app.show_addr_details(req, status)
amount = req.get('amount')
address = req['address']
if amount:
status = req.get('status')
status = request_text[status]
else:
received_amount = self.app.wallet.get_addr_received(address)
status = self.app.format_amount_and_units(received_amount)
self.app.show_pr_details(req, status, False)
else:
req = { 'address': obj.address, 'status' : obj.status }
status = obj.status
c, u, x = self.app.wallet.get_addr_balance(obj.address)
balance = c + u + x
if balance > 0:
req['fund'] = balance
self.app.show_addr_details(req, status)
def do_delete(self, obj):
from .dialogs.question import Question
def cb(result):
if result:
self.app.wallet.remove_payment_request(obj.address, self.app.electrum_config)
self.update()
d = Question(_('Delete request?'), cb)
d.open()
def ext_search(self, card, search): def ext_search(self, card, search):
return card.memo.find(search) >= 0 or card.amount.find(search) >= 0 return card.memo.find(search) >= 0 or card.amount.find(search) >= 0