tuse BoxLabel for invoice dialog too - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit fa17a2b869897c368411d3605a75557a83a738c2
DIR parent 70fbebe8a1e6f79e87e05cb49586dfea379528f7
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 18 Feb 2016 05:35:01 +0100
use BoxLabel for invoice dialog too
Diffstat:
M gui/kivy/main.kv | 11 +++++++++++
M gui/kivy/uix/dialogs/tx_dialog.py | 11 -----------
M gui/kivy/uix/ui_screens/invoice.kv | 39 ++++++++++++++-----------------
3 files changed, 28 insertions(+), 33 deletions(-)
---
DIR diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv
t@@ -77,6 +77,17 @@
#########################
# Dialogs
#########################
+<BoxLabel@BoxLayout>
+ text: ''
+ value: ''
+ size_hint_y: None
+ height: max(lbl1.height, lbl2.height)
+ TopLabel
+ id: lbl1
+ text: root.text
+ TopLabel
+ id: lbl2
+ text: root.value
<OutputList>
height: self.minimum_height
DIR diff --git a/gui/kivy/uix/dialogs/tx_dialog.py b/gui/kivy/uix/dialogs/tx_dialog.py
t@@ -9,17 +9,6 @@ from electrum_gui.kivy.i18n import _
from datetime import datetime
Builder.load_string('''
-<BoxLabel@BoxLayout>
- text: ''
- value: ''
- size_hint_y: None
- height: max(lbl1.height, lbl2.height)
- TopLabel
- id: lbl1
- text: root.text
- TopLabel
- id: lbl2
- text: root.value
<TxDialog>
id: popup
DIR diff --git a/gui/kivy/uix/ui_screens/invoice.kv b/gui/kivy/uix/ui_screens/invoice.kv
t@@ -20,36 +20,31 @@ Popup:
cols: 1
height: self.minimum_height
size_hint_y: None
+ padding: '10dp'
+ spacing: '10dp'
GridLayout:
- cols: 2
+ cols: 1
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:
+ BoxLabel:
+ text: (_('Status') if popup.amount or popup.is_invoice else _('Amount received')) if root.status else ''
+ value: root.status
+ BoxLabel:
text: _('Amount') if root.amount else ''
- TopLabel:
- text: app.format_amount_and_units(root.amount) if root.amount else ''
- TopLabel:
+ value: app.format_amount_and_units(root.amount) if root.amount else ''
+ BoxLabel:
+ text: _('Requestor') if popup.is_invoice else _('Address')
+ value: root.requestor
+ BoxLabel:
text: _('Signature') if root.signature else ''
- TopLabel:
- text: root.signature
- TopLabel:
+ value: root.signature
+ BoxLabel:
text: _('Expiration') if root.exp else ''
- TopLabel:
- text: root.exp
- TopLabel:
+ value: root.exp
+ BoxLabel:
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
+ value: root.description
TopLabel:
text: _('Outputs') if popup.is_invoice else ''