electrum

commit b9143b38007760a7af63d669ec6abd521379c64e
parent 6665a70a494913d15966a0e7b952ddb1eeab06c7
Author: ThomasV <thomasv@gitorious>
Date:   Sat, 10 May 2014 22:43:53 +0200

show request memo

Diffstat:
M
gui/qt/main_window.py
 | 
8
++++----
M
lib/paymentrequest.py
 | 
2
++

2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -883,16 +883,16 @@ class ElectrumWindow(QMainWindow):
     def prepare_for_payment_request(self):
         style = "QWidget { background-color:none;border:none;}"
         self.tabs.setCurrentIndex(1)
-        self.payto_e.setReadOnly(True)
-        self.payto_e.setStyleSheet(style)
-        self.amount_e.setReadOnly(True)
+        for e in [self.payto_e, self.amount_e, self.message_e]:
+            e.setReadOnly(True)
+            e.setStyleSheet(style)
         self.payto_e.setText(_("please wait..."))
-        self.amount_e.setStyleSheet(style)
         return True
 
     def payment_request_ok(self):
         self.payto_e.setText(self.gui_object.payment_request.domain)
         self.amount_e.setText(self.format_amount(self.gui_object.payment_request.get_amount()))
+        self.message_e.setText(self.gui_object.payment_request.memo)
 
     def payment_request_error(self):
         self.payto_e.setText(self.gui_object.payment_request.error)
diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
@@ -181,6 +181,8 @@ class PaymentRequest:
             addr = transaction.get_address_from_output_script(o.script)[1]
             self.outputs.append( (addr, o.amount) )
 
+        self.memo = pay_det.memo
+
         if CA_match:
             print 'Signed By Trusted CA: ', CA_OU