electrum

commit 1cd3776e8ff2ef7641d8d3848157074ec5abfe3f
parent de46bcd515345009c36ef01708dd5be1e847c385
Author: ThomasV <thomasv@gitorious>
Date:   Thu,  5 Jun 2014 12:55:02 +0200

fix

Diffstat:
M
gui/qt/amountedit.py
 | 
2
--
M
gui/qt/main_window.py
 | 
20
++------------------

2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/gui/qt/amountedit.py b/gui/qt/amountedit.py
@@ -60,5 +60,3 @@ class AmountEdit(QLineEdit):
         self.setCursorPosition(pos)
 
 
-    def setAmount(self, amount):
-        self.setText(self.format_amount(self.wallet.fee).strip())
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -781,25 +781,9 @@ class ElectrumWindow(QMainWindow):
         if self.gui_object.payment_request:
             outputs = self.gui_object.payment_request.outputs
             amount = self.gui_object.payment_request.get_amount()
-
         else:
-            r = unicode( self.payto_e.text() )
-            r = r.strip()
-
-            # label or alias, with address in brackets
-            m = re.match('(.*?)\s*\<([1-9A-HJ-NP-Za-km-z]{26,})\>', r)
-            to_address = m.group(2) if m else r
-            if not is_valid(to_address):
-                QMessageBox.warning(self, _('Error'), _('Invalid Bitcoin Address') + ':\n' + to_address, _('OK'))
-                return
-            
-            try:
-                amount = self.amount_e.get_amount()
-            except Exception:
-                QMessageBox.warning(self, _('Error'), _('Invalid Amount'), _('OK'))
-                return
-
-            outputs = [(to_address, amount)]
+            outputs = self.payto_e.get_outputs()
+            amount = sum(map(lambda x:x[1], outputs))
 
         try:
             fee = self.fee_e.get_amount()