cleanup dead code

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

diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py
index eb5d3c8..665db54 100644 (file)
--- a/gui/qt/transaction_dialog.py
+++ b/gui/qt/transaction_dialog.py
@@ -34,6 +34,8 @@ from PyQt4.QtCore import *
 import PyQt4.QtCore as QtCore
 
 from electrum import transaction
+from electrum.plugins import run_hook
+
 from util import MyTreeWidget
 
 class TxDialog(QDialog):
@@ -80,7 +82,8 @@ class TxDialog(QDialog):
         buttons.addWidget(b)
 
         self.broadcast_button = b = QPushButton(_("Broadcast"))
-        b.clicked.connect(self.broadcast)
+        b.clicked.connect(lambda: self.parent.broadcast_transaction(self.tx))
+
         b.hide()
         buttons.addWidget(b)
 
@@ -92,10 +95,19 @@ class TxDialog(QDialog):
         cancelButton.clicked.connect(lambda: self.done(0))
         buttons.addWidget(cancelButton)
         cancelButton.setDefault(True)
-        
+
+        b = QPushButton(_("Show QR code"))
+        b.clicked.connect(self.show_qr)
+        buttons.insertWidget(1,b)
         self.update()
 
 
+    def show_qr(self):
+        try:
+            json_text = json.dumps(self.tx.as_dict()).replace(' ', '')
+            self.parent.show_qrcode(json_text, 'Transaction')
+        except Exception as e:
+            self.show_message(str(e))
 
 
     def sign(self):
@@ -106,7 +118,7 @@ class TxDialog(QDialog):
 
 
     def save(self):
-        name = 'signed_%s.txn' % (self.tx.hash()[0:8]) if self.tx.is_complete else 'unsigned.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:
@@ -119,7 +131,7 @@ class TxDialog(QDialog):
 
         is_relevant, is_mine, v, fee = self.wallet.get_tx_value(self.tx)
 
-        if self.tx.is_complete:
+        if self.tx.is_complete():
             status = _("Status: Signed")
             self.sign_button.hide()
             tx_hash = self.tx.hash()
@@ -155,7 +167,6 @@ class TxDialog(QDialog):
         else:
             self.date_label.hide()
 
-
         # if we are not synchronized, we cannot tell
         if self.parent.network is None or not self.parent.network.is_running() or not self.parent.network.is_connected():
             return
@@ -176,14 +187,6 @@ class TxDialog(QDialog):
             self.amount_label.setText(_("Transaction unrelated to your wallet"))
 
 
-    def exec_menu(self, position,l):
-        item = l.itemAt(position)
-        if not item: return
-        addr = unicode(item.text(0))
-        menu = QMenu()
-        menu.addAction(_("Copy to clipboard"), lambda: self.parent.app.clipboard().setText(addr))
-        menu.exec_(l.viewport().mapToGlobal(position))
-
 
     def add_io(self, vbox):
 
@@ -214,14 +217,6 @@ class TxDialog(QDialog):
 
         
 
-
-    def broadcast(self):
-        result, result_message = self.wallet.sendtx( self.tx )
-        if result:
-            self.show_message(_("Transaction successfully sent")+': %s' % (result_message))
-        else:
-            self.show_message(_("There was a problem sending your transaction:") + '\n %s' % (result_message))
-
     def show_message(self, msg):
         QMessageBox.information(self, _('Message'), msg, _('OK'))