AaronFiore/electrum
1
0
Fork 0
Code Activity

kivy: minor fixes

Browse Source
This commit is contained in:
ThomasV
2016-02-13 11:16:45 +01:00
parent 25f6533e5c
commit ca5eb15abd
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/kivy/uix/dialogs/tx_dialog.py
View File

@@ -86,6 +86,7 @@ class TxDialog(Factory.Popup):
self.status_str += '\n' + _("Date") + ': ' + datetime.fromtimestamp(timestamp).isoformat(' ')[:-3] self.status_str += '\n' + _("Date") + ': ' + datetime.fromtimestamp(timestamp).isoformat(' ')[:-3]
else: else:
self.can_broadcast = self.app.network is not None self.can_broadcast = self.app.network is not None
self.status_str = _('Signed')
else: else:
s, r = self.tx.signature_count() s, r = self.tx.signature_count()
self.status_str = _("Unsigned") if s == 0 else _('Partially signed') + ' (%d/%d)'%(s,r) self.status_str = _("Unsigned") if s == 0 else _('Partially signed') + ' (%d/%d)'%(s,r)
@@ -111,7 +112,7 @@ class TxDialog(Factory.Popup):
self.app.protected(_("Enter your PIN code in order to sign this transaction"), self._do_sign, ()) self.app.protected(_("Enter your PIN code in order to sign this transaction"), self._do_sign, ())
def _do_sign(self, password): def _do_sign(self, password):
self.txid_str = _('Signing') + '...' self.status_str = _('Signing') + '...'
Clock.schedule_once(lambda dt: self.__do_sign(password), 0.1) Clock.schedule_once(lambda dt: self.__do_sign(password), 0.1)
def __do_sign(self, password): def __do_sign(self, password):

5
gui/kivy/uix/screens.py
View File

@@ -429,11 +429,12 @@ class InvoicesScreen(CScreen):
pr = self.app.invoices.get(obj.key) pr = self.app.invoices.get(obj.key)
pr.verify({}) pr.verify({})
exp = pr.get_expiration_date() exp = pr.get_expiration_date()
memo = pr.get_memo()
popup = Builder.load_file('gui/kivy/uix/ui_screens/invoice.kv') popup = Builder.load_file('gui/kivy/uix/ui_screens/invoice.kv')
popup.ids.requestor_label.text = _("Requestor") + ': ' + pr.get_requestor() popup.ids.requestor_label.text = _("Requestor") + ': ' + pr.get_requestor()
popup.ids.expiration_label.text = _('Expires') + ': ' + (format_time(exp) if exp else _('Never')) popup.ids.expiration_label.text = _('Expires') + ': ' + (format_time(exp) if exp else _('Never'))
popup.ids.memo_label.text = _("Description") + ': ' + pr.get_memo() popup.ids.memo_label.text = _("Description") + ': ' + memo if memo else _("No Description")
popup.ids.signature_label.text = _("Signature") + ': ' + pr.get_verify_status() popup.ids.signature_label.text = pr.get_verify_status()
if pr.tx: if pr.tx:
popup.ids.txid_label.text = _("Transaction ID") + ':\n' + ' '.join(map(''.join, zip(*[iter(pr.tx)]*4))) popup.ids.txid_label.text = _("Transaction ID") + ':\n' + ' '.join(map(''.join, zip(*[iter(pr.tx)]*4)))