display locktime for transaction

[electrum-nvc.git] / gui / qt / transaction_dialog.py

diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py
index dbfda70..6a7a1eb 100644 (file)
--- a/gui/qt/transaction_dialog.py
+++ b/gui/qt/transaction_dialog.py
@@ -26,7 +26,7 @@ import StringIO
 
 try:
     import PyQt4
-except:
+except Exception:
     sys.exit("Error: Could not import PyQt4 on Linux systems, you may try 'sudo apt-get install python-qt4'")
 
 from PyQt4.QtGui import *
@@ -106,7 +106,8 @@ class TxDialog(QDialog):
 
 
     def save(self):
-        fileName = self.parent.getSaveFileName(_("Select where to save your signed transaction"), 'signed_%s.txn' % (self.tx.hash()[0:8]), "*.txn")
+        name = 'signed_%s.txn' % (self.tx.hash()[0:8]) if self.tx.is_complete else 'unsigned.txn'
+        fileName = self.parent.getSaveFileName(_("Select where to save your signed transaction"), name, "*.txn")
         if fileName:
             with open(fileName, "w+") as f:
                 f.write(json.dumps(self.tx.as_dict(),indent=4) + '\n')
@@ -115,13 +116,13 @@ class TxDialog(QDialog):
 
 
     def update(self):
-        tx_hash = self.tx.hash()
 
         is_relevant, is_mine, v, fee = self.wallet.get_tx_value(self.tx)
 
         if self.tx.is_complete:
             status = _("Status: Signed")
             self.sign_button.hide()
+            tx_hash = self.tx.hash()
 
             if tx_hash in self.wallet.transactions.keys():
                 conf, timestamp = self.wallet.verifier.get_confirmations(tx_hash)
@@ -138,8 +139,12 @@ class TxDialog(QDialog):
         else:
             status = _("Status: Unsigned")
             time_str = None
-            self.sign_button.show()
+            if not self.wallet.is_watching_only():
+                self.sign_button.show()
+            else:
+                self.sign_button.hide()
             self.broadcast_button.hide()
+            tx_hash = 'unknown'
 
         self.tx_hash_e.setText(tx_hash)
         self.status_label.setText(status)
@@ -175,17 +180,19 @@ class TxDialog(QDialog):
 
     def add_io(self, vbox):
 
-        vbox.addWidget(QLabel(_("Inputs")))
-        lines = map(lambda x: x.get('address') , self.tx.inputs )
+        if self.tx.locktime > 0:
+            vbox.addWidget(QLabel("LockTime: %d\n" % self.tx.locktime))
 
-        i_text = QTextEdit('\n'.join(lines))
+        vbox.addWidget(QLabel(_("Inputs")))
+        lines = map(lambda x: x.get('prevout_hash') + ":%d"%x.get('prevout_n') + u'\t' + "%s"%x.get('address') , self.tx.inputs )
+        i_text = QTextEdit()
+        i_text.setText('\n'.join(lines))
         i_text.setReadOnly(True)
         i_text.setMaximumHeight(100)
         vbox.addWidget(i_text)
 
         vbox.addWidget(QLabel(_("Outputs")))
         lines = map(lambda x: x[0] + u'\t\t' + self.parent.format_amount(x[1]), self.tx.outputs)
-
         o_text = QTextEdit()
         o_text.setText('\n'.join(lines))
         o_text.setReadOnly(True)
@@ -199,8 +206,6 @@ class TxDialog(QDialog):
         result, result_message = self.wallet.sendtx( self.tx )
         if result:
             self.show_message(_("Transaction successfully sent")+': %s' % (result_message))
-            if dialog:
-                dialog.done(0)
         else:
             self.show_message(_("There was a problem sending your transaction:") + '\n %s' % (result_message))