kivy: improve status dialog

This commit is contained in:
ThomasV 2016-02-18 12:13:19 +01:00
parent b9776201ce
commit caccae222c
2 changed files with 57 additions and 69 deletions

View File

@ -125,14 +125,14 @@
size: self.size size: self.size
pos: self.pos pos: self.pos
<TxHashLabel@TopLabel> <RefLabel@TopLabel>
font_size: '6pt' font_size: '6pt'
tx_hash: '' ref_text: ''
text: '[ref=x]%s[/ref]' %' '.join(map(''.join, zip(*[iter(self.tx_hash)]*4))) if self.tx_hash else '' text: '[ref=x]%s[/ref]' % self.ref_text
padding: '10dp', '10dp' padding: '10dp', '10dp'
on_ref_press: on_ref_press:
app._clipboard.copy(self.text) app._clipboard.copy(self.ref_text)
app.show_info(_('Transaction ID copied to clipboard')) app.show_info(_('Text copied to clipboard'))
canvas.before: canvas.before:
Color: Color:
rgb: .3, .3, .3 rgb: .3, .3, .3
@ -140,6 +140,11 @@
size: self.size size: self.size
pos: self.pos pos: self.pos
<TxHashLabel@RefLabel>
tx_hash: ''
ref_text: self.tx_hash
text: '[ref=x]%s[/ref]' %' '.join(map(''.join, zip(*[iter(self.tx_hash)]*4))) if self.tx_hash else ''
<InfoBubble> <InfoBubble>
size_hint: None, None size_hint: None, None
width: '270dp' if root.fs else min(self.width, dp(270)) width: '270dp' if root.fs else min(self.width, dp(270))

View File

@ -7,73 +7,56 @@ Popup:
unmatured: 0 unmatured: 0
on_parent: on_parent:
self.confirmed, self.unconfirmed, self.unmatured = app.wallet.get_balance() self.confirmed, self.unconfirmed, self.unmatured = app.wallet.get_balance()
BoxLayout: BoxLayout:
orientation: 'vertical' orientation: 'vertical'
spacing: '1dp' ScrollView:
GridLayout: GridLayout:
cols:2 cols: 1
Label: height: self.minimum_height
text: _("Wallet Name:") size_hint_y: None
text_size: self.size padding: '10dp'
halign: 'left' spacing: '10dp'
Label: padding: '10dp'
text: os.path.basename(app.wallet.storage.path) spacing: '10dp'
text_size: self.size GridLayout:
halign: 'left' cols: 1
Label: size_hint_y: None
text: _("Wallet type:") height: self.minimum_height
text_size: self.size spacing: '10dp'
halign: 'left' BoxLabel:
Label: text: _('Wallet Name')
text: app.wallet.wallet_type value: os.path.basename(app.wallet.storage.path)
text_size: self.size BoxLabel:
halign: 'left' text: _("Wallet type:")
Label: value: app.wallet.wallet_type
text: _("Balance") + ':' BoxLabel:
text_size: self.size text: _("Balance") + ':'
halign: 'left' value: app.format_amount_and_units(root.confirmed + root.unconfirmed + root.unmatured)
Label: BoxLabel:
text: app.format_amount_and_units(root.confirmed + root.unconfirmed + root.unmatured) text: _("Confirmed") + ':'
text_size: self.size opacity: 1 if root.confirmed else 0
halign: 'left' value: app.format_amount_and_units(root.confirmed)
opacity: 1 if root.confirmed else 0
BoxLabel:
text: _("Unconfirmed") + ':'
opacity: 1 if root.unconfirmed else 0
value: app.format_amount_and_units(root.unconfirmed)
BoxLabel:
text: _("Unmatured") + ':'
opacity: 1 if root.unmatured else 0
value: app.format_amount_and_units(root.unmatured)
opacity: 1 if root.unmatured else 0
TopLabel:
text: _('Master Public Key')
RefLabel:
ref_text: app.wallet.get_master_public_key()
TopLabel:
text: ''
id: seed_label
Label:
text: _("Confirmed") + ':'
opacity: 1 if root.confirmed else 0
text_size: self.size
halign: 'left'
Label:
text: app.format_amount_and_units(root.confirmed)
opacity: 1 if root.confirmed else 0
text_size: self.size
halign: 'left'
Label:
text: _("Unconfirmed") + ':'
text_size: self.size
halign: 'left'
opacity: 1 if root.unconfirmed else 0
Label:
text: app.format_amount_and_units(root.unconfirmed)
opacity: 1 if root.unconfirmed else 0
text_size: self.size
halign: 'left'
Label:
text: _("Unmatured") + ':'
text_size: self.size
halign: 'left'
opacity: 1 if root.unmatured else 0
Label:
text: app.format_amount_and_units(root.unmatured)
opacity: 1 if root.unmatured else 0
text_size: self.size
halign: 'left'
Label:
text: ''
id: seed_label
text_size: self.width, None
size: self.texture_size
Widget:
size_hint: None, 1
BoxLayout: BoxLayout:
size_hint: 1, None size_hint: 1, None
height: '48dp' height: '48dp'