kivy: use scrollview for invoice dialog

This commit is contained in:
ThomasV 2016-02-17 17:42:54 +01:00
parent f67162c79d
commit fbfb75eaa1
2 changed files with 45 additions and 34 deletions

View file

@ -14,40 +14,50 @@ Popup:
title: _('Invoice') if popup.is_invoice else _('Request')
BoxLayout:
orientation: 'vertical'
GridLayout:
spacing: '10dp'
padding: '10dp'
height: self.minimum_height
cols: 2
TopLabel:
text: _('Requestor') if popup.is_invoice else _('Address')
TopLabel:
text: root.requestor
TopLabel:
text: _('Amount') if root.amount else ''
TopLabel:
text: app.format_amount_and_units(root.amount) if root.amount else ''
TopLabel:
text: _('Signature') if root.signature else ''
TopLabel:
text: root.signature
TopLabel:
text: _('Expiration') if root.exp else ''
TopLabel:
text: root.exp
TopLabel:
text: _('Description') if root.description else ''
TopLabel:
text: root.description
TopLabel:
text: (_('Status') if popup.amount or popup.is_invoice else _('Amount received')) if root.status else ''
TopLabel:
text: root.status
padding: '10dp'
ScrollView:
GridLayout:
cols: 1
height: self.minimum_height
size_hint_y: None
GridLayout:
cols: 2
size_hint_y: None
height: self.minimum_height
spacing: '10dp'
padding: '10dp'
TopLabel:
text: _('Requestor') if popup.is_invoice else _('Address')
TopLabel:
text: root.requestor
TopLabel:
text: _('Amount') if root.amount else ''
TopLabel:
text: app.format_amount_and_units(root.amount) if root.amount else ''
TopLabel:
text: _('Signature') if root.signature else ''
TopLabel:
text: root.signature
TopLabel:
text: _('Expiration') if root.exp else ''
TopLabel:
text: root.exp
TopLabel:
text: _('Description') if root.description else ''
TopLabel:
text: root.description
TopLabel:
text: (_('Status') if popup.amount or popup.is_invoice else _('Amount received')) if root.status else ''
TopLabel:
text: root.status
TopLabel:
text: _('Outputs') if popup.is_invoice else ''
OutputList:
id: output_list
TopLabel:
id: txid_label
OutputList:
id: output_list
TopLabel:
id: txid_label
Widget:
size_hint: 1, 0.1

View file

@ -207,7 +207,8 @@ class PaymentRequest:
'exp': self.get_expiration_date(),
'amount': self.get_amount(),
'signature': self.get_verify_status(),
'txid': self.tx
'txid': self.tx,
'outputs': self.get_outputs()
}
def get_id(self):