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

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

@@ -14,11 +14,18 @@ Popup:
title: _('Invoice') if popup.is_invoice else _('Request') title: _('Invoice') if popup.is_invoice else _('Request')
BoxLayout: BoxLayout:
orientation: 'vertical' orientation: 'vertical'
padding: '10dp'
ScrollView:
GridLayout: GridLayout:
cols: 1
height: self.minimum_height
size_hint_y: None
GridLayout:
cols: 2
size_hint_y: None
height: self.minimum_height
spacing: '10dp' spacing: '10dp'
padding: '10dp' padding: '10dp'
height: self.minimum_height
cols: 2
TopLabel: TopLabel:
text: _('Requestor') if popup.is_invoice else _('Address') text: _('Requestor') if popup.is_invoice else _('Address')
TopLabel: TopLabel:
@@ -44,10 +51,13 @@ Popup:
TopLabel: TopLabel:
text: root.status text: root.status
TopLabel:
text: _('Outputs') if popup.is_invoice else ''
OutputList: OutputList:
id: output_list id: output_list
TopLabel: TopLabel:
id: txid_label 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):