AaronFiore/electrum
1
0
Fork 0
Code Activity

kivy: use scrollview for invoice dialog

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

76
gui/kivy/uix/ui_screens/invoice.kv
View File

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

3
lib/paymentrequest.py
View File

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