tMerge pull request #1681 from akshayaurora/grid_bug - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 70fbebe8a1e6f79e87e05cb49586dfea379528f7
DIR parent 9bb5b0a70b98eb54ef7f4f354fe03941d13a22ff
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 18 Feb 2016 04:49:37 +0100
Merge pull request #1681 from akshayaurora/grid_bug
use BoxLabel workaround Gridlayout bug with col: 2
Diffstat:
M gui/kivy/uix/dialogs/tx_dialog.py | 41 ++++++++++++++++++-------------
1 file changed, 24 insertions(+), 17 deletions(-)
---
DIR diff --git a/gui/kivy/uix/dialogs/tx_dialog.py b/gui/kivy/uix/dialogs/tx_dialog.py
t@@ -9,7 +9,19 @@ from electrum_gui.kivy.i18n import _
from datetime import datetime
Builder.load_string('''
-<TxDialog@Popup>
+<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
title: _('Transaction')
is_mine: True
t@@ -34,28 +46,23 @@ Builder.load_string('''
GridLayout:
height: self.minimum_height
size_hint_y: None
- cols: 2
+ cols: 1
spacing: '10dp'
- TopLabel:
+ BoxLabel:
text: _('Status')
- TopLabel:
- text: root.status_str
- TopLabel:
+ value: root.status_str
+ BoxLabel:
text: _('Description') if root.description else ''
- TopLabel:
- text: root.description
- TopLabel:
+ value: root.description
+ BoxLabel:
text: _('Date') if root.date_str else ''
- TopLabel:
- text: root.date_str
- TopLabel:
+ value: root.date_str
+ BoxLabel:
text: _('Amount sent') if root.is_mine else _('Amount received')
- TopLabel:
- text: root.amount_str
- TopLabel:
+ value: root.amount_str
+ BoxLabel:
text: _('Transaction fee') if root.fee_str else ''
- TopLabel:
- text: root.fee_str
+ value: root.fee_str
TopLabel:
text: _('Outputs') + ':'
OutputList: