From ca5eb15abd93f4f88232e4e33c2a057f7f6006c5 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sat, 13 Feb 2016 11:16:45 +0100 Subject: [PATCH] kivy: minor fixes --- gui/kivy/uix/dialogs/tx_dialog.py | 3 ++- gui/kivy/uix/screens.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gui/kivy/uix/dialogs/tx_dialog.py b/gui/kivy/uix/dialogs/tx_dialog.py index 0599e967d..74aa7ca0f 100644 --- a/gui/kivy/uix/dialogs/tx_dialog.py +++ b/gui/kivy/uix/dialogs/tx_dialog.py @@ -86,6 +86,7 @@ class TxDialog(Factory.Popup): self.status_str += '\n' + _("Date") + ': ' + datetime.fromtimestamp(timestamp).isoformat(' ')[:-3] else: self.can_broadcast = self.app.network is not None + self.status_str = _('Signed') else: s, r = self.tx.signature_count() 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, ()) def _do_sign(self, password): - self.txid_str = _('Signing') + '...' + self.status_str = _('Signing') + '...' Clock.schedule_once(lambda dt: self.__do_sign(password), 0.1) def __do_sign(self, password): diff --git a/gui/kivy/uix/screens.py b/gui/kivy/uix/screens.py index bb6c49941..627b2d2af 100644 --- a/gui/kivy/uix/screens.py +++ b/gui/kivy/uix/screens.py @@ -429,11 +429,12 @@ class InvoicesScreen(CScreen): pr = self.app.invoices.get(obj.key) pr.verify({}) exp = pr.get_expiration_date() + memo = pr.get_memo() popup = Builder.load_file('gui/kivy/uix/ui_screens/invoice.kv') popup.ids.requestor_label.text = _("Requestor") + ': ' + pr.get_requestor() popup.ids.expiration_label.text = _('Expires') + ': ' + (format_time(exp) if exp else _('Never')) - popup.ids.memo_label.text = _("Description") + ': ' + pr.get_memo() - popup.ids.signature_label.text = _("Signature") + ': ' + pr.get_verify_status() + popup.ids.memo_label.text = _("Description") + ': ' + memo if memo else _("No Description") + popup.ids.signature_label.text = pr.get_verify_status() if pr.tx: popup.ids.txid_label.text = _("Transaction ID") + ':\n' + ' '.join(map(''.join, zip(*[iter(pr.tx)]*4)))