change remove tabs for verify/sign
[electrum-nvc.git] / gui / qt / main_window.py
index 1536b98..bba7e8f 100644 (file)
@@ -20,6 +20,7 @@ import sys, time, datetime, re, threading
 from electrum.i18n import _, set_language
 from electrum.util import print_error, print_msg
 import os.path, json, ast, traceback
+import webbrowser
 import shutil
 import StringIO
 
@@ -68,7 +69,7 @@ import re
 from util import *
 
 
-        
+
 
 
 
@@ -98,37 +99,22 @@ class StatusBarButton(QPushButton):
 default_column_widths = { "history":[40,140,350,140], "contacts":[350,330], "receive": [370,200,130] }
 
 class ElectrumWindow(QMainWindow):
-    def changeEvent(self, event):
-        flags = self.windowFlags();
-        if event and event.type() == QtCore.QEvent.WindowStateChange:
-            if self.windowState() & QtCore.Qt.WindowMinimized:
-                self.build_menu(True)
-                # The only way to toggle the icon in the window managers taskbar is to use the Qt.Tooltip flag
-                # The problem is that it somehow creates an (in)visible window that will stay active and prevent
-                # Electrum from closing.
-                # As for now I have no clue how to implement a proper 'hide to tray' functionality.
-                # self.setWindowFlags(flags & ~Qt.ToolTip)
-            elif event.oldState() & QtCore.Qt.WindowMinimized:
-                self.build_menu(False)
-                #self.setWindowFlags(flags | Qt.ToolTip)
-
-    def build_menu(self, is_hidden = False):
+    def build_menu(self):
         m = QMenu()
-        if self.isMinimized():
-            m.addAction(_("Show"), self.showNormal)
-        else:
-            m.addAction(_("Hide"), self.showMinimized)
-
+        m.addAction(_("Show/Hide"), self.show_or_hide)
         m.addSeparator()
         m.addAction(_("Exit Electrum"), self.close)
         self.tray.setContextMenu(m)
 
+    def show_or_hide(self):
+        self.tray_activated(QSystemTrayIcon.DoubleClick)
+
     def tray_activated(self, reason):
         if reason == QSystemTrayIcon.DoubleClick:
-            self.showNormal()
-
-    def showNormal(self):
-        self.setWindowState(self.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
+            if self.isMinimized() or self.isHidden():
+                self.show()
+            else:
+                self.hide()
 
     def __init__(self, config, network):
         QMainWindow.__init__(self)
@@ -181,11 +167,14 @@ class ElectrumWindow(QMainWindow):
         self.init_menubar()
 
         QShortcut(QKeySequence("Ctrl+W"), self, self.close)
-        QShortcut(QKeySequence("Ctrl+R"), self, self.update_wallet)
         QShortcut(QKeySequence("Ctrl+Q"), self, self.close)
+        QShortcut(QKeySequence("Ctrl+R"), self, self.update_wallet)
         QShortcut(QKeySequence("Ctrl+PgUp"), self, lambda: tabs.setCurrentIndex( (tabs.currentIndex() - 1 )%tabs.count() ))
         QShortcut(QKeySequence("Ctrl+PgDown"), self, lambda: tabs.setCurrentIndex( (tabs.currentIndex() + 1 )%tabs.count() ))
-        
+
+        for i in range(tabs.count()):
+            QShortcut(QKeySequence("Alt+" + str(i + 1)), self, lambda i=i: tabs.setCurrentIndex(i))
+
         self.connect(self, QtCore.SIGNAL('update_status'), self.update_status)
         self.connect(self, QtCore.SIGNAL('banner_signal'), lambda: self.console.showMessage(self.network.banner) )
         self.connect(self, QtCore.SIGNAL('transaction_signal'), lambda: self.notify_transactions() )
@@ -254,7 +243,7 @@ class ElectrumWindow(QMainWindow):
     def check_qt_version(self):
         qtVersion = qVersion()
         return int(qtVersion[0]) >= 4 and int(qtVersion[2]) >= 7
-    
+
 
     def update_account_selector(self):
         # account selector
@@ -301,8 +290,8 @@ class ElectrumWindow(QMainWindow):
             return
 
         self.wallet.stop_threads()
-        
-        # create new wallet 
+
+        # create new wallet
         wallet = Wallet(storage)
         wallet.start_threads(self.network)
 
@@ -343,7 +332,7 @@ class ElectrumWindow(QMainWindow):
 
         wizard = installwizard.InstallWizard(self.config, self.network, storage)
         wallet = wizard.run()
-        if wallet: 
+        if wallet:
             self.load_wallet(wallet)
 
 
@@ -353,15 +342,19 @@ class ElectrumWindow(QMainWindow):
 
         file_menu = menubar.addMenu(_("&File"))
         open_wallet_action = file_menu.addAction(_("&Open"))
+        open_wallet_action.setShortcut(QKeySequence.Open)
         open_wallet_action.triggered.connect(self.open_wallet)
 
-        new_wallet_action = file_menu.addAction(_("&Create/Restore"))
+        new_wallet_action = file_menu.addAction(_("&New/Restore"))
+        new_wallet_action.setShortcut(QKeySequence.New)
         new_wallet_action.triggered.connect(self.new_wallet)
 
-        wallet_backup = file_menu.addAction(_("&Copy"))
+        wallet_backup = file_menu.addAction(_("&Save Copy"))
+        wallet_backup.setShortcut(QKeySequence.SaveAs)
         wallet_backup.triggered.connect(self.backup_wallet)
 
-        quit_item = file_menu.addAction(_("&Close"))
+        quit_item = file_menu.addAction(_("&Quit"))
+        #quit_item.setShortcut(QKeySequence.Quit)
         quit_item.triggered.connect(self.close)
 
         wallet_menu = menubar.addMenu(_("&Wallet"))
@@ -407,6 +400,7 @@ class ElectrumWindow(QMainWindow):
         # Settings / Preferences are all reserved keywords in OSX using this as work around
         preferences_name = _("Electrum preferences") if sys.platform == 'darwin' else _("Preferences")
         preferences_menu = tools_menu.addAction(preferences_name)
+        #preferences_menu.setShortcut(QKeySequence.Preferences)
         preferences_menu.triggered.connect(self.settings_dialog)
 
         network = tools_menu.addAction(_("&Network"))
@@ -415,6 +409,9 @@ class ElectrumWindow(QMainWindow):
         plugins_labels = tools_menu.addAction(_("&Plugins"))
         plugins_labels.triggered.connect(self.plugins_dialog)
 
+        verifymessage = tools_menu.addAction(_("&Verify message"))
+        verifymessage.triggered.connect(self.verify_message)
+
         tools_menu.addSeparator()
 
         csv_transaction_menu = tools_menu.addMenu(_("&Create transaction"))
@@ -433,15 +430,19 @@ class ElectrumWindow(QMainWindow):
         raw_transaction_text = raw_transaction_menu.addAction(_("&From text"))
         raw_transaction_text.triggered.connect(self.do_process_from_text)
 
+        raw_transaction_text = raw_transaction_menu.addAction(_("&From the blockchain"))
+        raw_transaction_text.triggered.connect(self.do_process_from_txid)
+
 
         help_menu = menubar.addMenu(_("&Help"))
         show_about = help_menu.addAction(_("&About"))
         show_about.triggered.connect(self.show_about)
-        web_open = help_menu.addAction(_("&Official website")) 
+        web_open = help_menu.addAction(_("&Official website"))
         web_open.triggered.connect(lambda: webbrowser.open("http://electrum.org"))
 
         help_menu.addSeparator()
         doc_open = help_menu.addAction(_("&Documentation"))
+        doc_open.setShortcut(QKeySequence.HelpContents)
         doc_open.triggered.connect(lambda: webbrowser.open("http://electrum.org/documentation.html"))
         report_bug = help_menu.addAction(_("&Report Bug"))
         report_bug.triggered.connect(self.show_report_bug)
@@ -458,7 +459,7 @@ class ElectrumWindow(QMainWindow):
 
 
     def notify_transactions(self):
-        if not self.network or not self.network.is_connected(): 
+        if not self.network or not self.network.is_connected():
             return
 
         print_error("Notifying GUI")
@@ -518,7 +519,7 @@ class ElectrumWindow(QMainWindow):
             self.update_wallet()
             self.need_update.clear()
         run_hook('timer_actions')
-    
+
     def format_amount(self, x, is_diff=False, whitespaces=False):
         return format_satoshis(x, is_diff, self.num_zeros, self.decimal_point, whitespaces)
 
@@ -533,7 +534,7 @@ class ElectrumWindow(QMainWindow):
 
 
     def update_status(self):
-        if self.network is None:
+        if self.network is None or not self.network.is_running():
             text = _("Offline")
             icon = QIcon(":icons/status_disconnected.png")
 
@@ -573,7 +574,7 @@ class ElectrumWindow(QMainWindow):
             self.update_contacts_tab()
             self.update_completions()
 
-        
+
     def create_history_tab(self):
         self.history_list = l = MyTreeWidget(self)
         l.setColumnCount(5)
@@ -588,7 +589,7 @@ class ElectrumWindow(QMainWindow):
 
 
     def create_history_menu(self, position):
-        self.history_list.selectedIndexes() 
+        self.history_list.selectedIndexes()
         item = self.history_list.currentItem()
         if not item: return
         tx_hash = str(item.data(0, Qt.UserRole).toString())
@@ -597,6 +598,7 @@ class ElectrumWindow(QMainWindow):
         menu.addAction(_("Copy ID to Clipboard"), lambda: self.app.clipboard().setText(tx_hash))
         menu.addAction(_("Details"), lambda: self.show_transaction(self.wallet.transactions.get(tx_hash)))
         menu.addAction(_("Edit description"), lambda: self.tx_label_clicked(item,2))
+        menu.addAction(_("View on Blockchain.info"), lambda: webbrowser.open("https://blockchain.info/tx/" + tx_hash))
         menu.exec_(self.contacts_list.viewport().mapToGlobal(position))
 
 
@@ -614,14 +616,14 @@ class ElectrumWindow(QMainWindow):
             self.is_edit=False
 
     def tx_label_changed(self, item, column):
-        if self.is_edit: 
+        if self.is_edit:
             return
         self.is_edit=True
         tx_hash = str(item.data(0, Qt.UserRole).toString())
         tx = self.wallet.transactions.get(tx_hash)
         text = unicode( item.text(2) )
-        self.wallet.set_label(tx_hash, text) 
-        if text: 
+        self.wallet.set_label(tx_hash, text)
+        if text:
             item.setForeground(2, QBrush(QColor('black')))
         else:
             text = self.wallet.get_default_label(tx_hash)
@@ -663,7 +665,7 @@ class ElectrumWindow(QMainWindow):
             if changed:
                 self.update_history_tab()
                 self.update_completions()
-                
+
             self.current_item_changed(item)
 
         run_hook('item_changed', item, column)
@@ -672,9 +674,6 @@ class ElectrumWindow(QMainWindow):
     def current_item_changed(self, a):
         run_hook('current_item_changed', a)
 
-        self.pay_from = []
-        self.tabs.emit(SIGNAL('currentChanged(int)'), 1)
-
 
 
     def update_history_tab(self):
@@ -706,7 +705,7 @@ class ElectrumWindow(QMainWindow):
                 v_str = '--'
 
             balance_str = self.format_amount(balance, whitespaces=True)
-            
+
             if tx_hash:
                 label, is_default_label = self.wallet.get_label(tx_hash)
             else:
@@ -727,7 +726,7 @@ class ElectrumWindow(QMainWindow):
 
             item.setIcon(0, icon)
             self.history_list.insertTopLevelItem(0,item)
-            
+
 
         self.history_list.setCurrentItem(self.history_list.topLevelItem(0))
 
@@ -744,7 +743,7 @@ class ElectrumWindow(QMainWindow):
         self.payto_e = QLineEdit()
         grid.addWidget(QLabel(_('Pay to')), 1, 0)
         grid.addWidget(self.payto_e, 1, 1, 1, 3)
-            
+
         grid.addWidget(HelpButton(_('Recipient of the funds.') + '\n\n' + _('You may enter a Bitcoin address, a label from your list of contacts (a list of completions will be proposed), or an alias (email-like address that forwards to a Bitcoin address)')), 1, 4)
 
         completer = QCompleter()
@@ -757,8 +756,8 @@ class ElectrumWindow(QMainWindow):
         grid.addWidget(self.message_e, 2, 1, 1, 3)
         grid.addWidget(HelpButton(_('Description of the transaction (not mandatory).') + '\n\n' + _('The description is not sent to the recipient of the funds. It is stored in your wallet file, and displayed in the \'History\' tab.')), 2, 4)
 
-        self.pay_from = []
-        grid.addWidget(QLabel(_('Selected\nInputs')), 3, 0)
+        self.from_label = QLabel(_('From'))
+        grid.addWidget(self.from_label, 3, 0)
         self.from_list = QTreeWidget(self)
         self.from_list.setColumnCount(2)
         self.from_list.setColumnWidth(0, 350)
@@ -766,20 +765,19 @@ class ElectrumWindow(QMainWindow):
         self.from_list.setHeaderHidden (True)
         self.from_list.setMaximumHeight(80)
         grid.addWidget(self.from_list, 3, 1, 1, 3)
-        self.connect(self.tabs, SIGNAL('currentChanged(int)'),
-                lambda: self.update_pay_from_list(grid))
+        self.set_pay_from([])
 
         self.amount_e = AmountEdit(self.base_unit)
         grid.addWidget(QLabel(_('Amount')), 4, 0)
-        grid.addWidget(self.amount_e, 4, 1)
+        grid.addWidget(self.amount_e, 4, 1, 1, 2)
         grid.addWidget(HelpButton(
                 _('Amount to be sent.') + '\n\n' \
                     + _('The amount will be displayed in red if you do not have enough funds in your wallet. Note that if you have frozen some of your addresses, the available funds will be lower than your total balance.') \
                     + '\n\n' + _('Keyboard shortcut: type "!" to send all your coins.')), 4, 3)
-        
+
         self.fee_e = AmountEdit(self.base_unit)
         grid.addWidget(QLabel(_('Fee')), 5, 0)
-        grid.addWidget(self.fee_e, 5, 1)
+        grid.addWidget(self.fee_e, 5, 1, 1, 2)
         grid.addWidget(HelpButton(
                 _('Bitcoin transactions are in general not free. A transaction fee is paid by the sender of the funds.') + '\n\n'\
                     + _('The amount of fee can be decided freely by the sender. However, transactions with low fees take more time to be processed.') + '\n\n'\
@@ -797,7 +795,7 @@ class ElectrumWindow(QMainWindow):
 
         QShortcut(QKeySequence("Up"), w, w.focusPreviousChild)
         QShortcut(QKeySequence("Down"), w, w.focusNextChild)
-        w.setLayout(grid) 
+        w.setLayout(grid)
 
         w2 = QWidget()
         vbox = QVBoxLayout()
@@ -817,14 +815,14 @@ class ElectrumWindow(QMainWindow):
                 self.amount_e.setText( self.format_amount(amount) )
                 self.fee_e.setText( self.format_amount( fee ) )
                 return
-                
+
             amount = self.read_amount(str(self.amount_e.text()))
             fee = self.read_amount(str(self.fee_e.text()))
 
             if not is_fee: fee = None
             if amount is None:
                 return
-            inputs, total, fee = self.wallet.choose_tx_inputs(amount, 0, self.get_payment_sources())
+            inputs, total, fee = self.wallet.choose_tx_inputs(amount, fee, self.get_payment_sources())
             if not is_fee:
                 self.fee_e.setText( self.format_amount( fee ) )
             if inputs:
@@ -850,10 +848,11 @@ class ElectrumWindow(QMainWindow):
         return w2
 
 
-    def update_pay_from_list(self, grid):
+    def set_pay_from(self, l):
+        self.pay_from = l
         self.from_list.clear()
-        grid.itemAtPosition(3,0).widget().setHidden(len(self.pay_from) == 0)
-        grid.itemAtPosition(3,1).widget().setHidden(len(self.pay_from) == 0)
+        self.from_label.setHidden(len(self.pay_from) == 0)
+        self.from_list.setHidden(len(self.pay_from) == 0)
         for addr in self.pay_from:
             c, u = self.wallet.get_addr_balance(addr)
             balance = self.format_amount(c + u)
@@ -903,6 +902,11 @@ class ElectrumWindow(QMainWindow):
         if amount >= confirm_amount:
             if not self.question(_("send %(amount)s to %(address)s?")%{ 'amount' : self.format_amount(amount) + ' '+ self.base_unit(), 'address' : to_address}):
                 return
+            
+        confirm_fee = self.config.get('confirm_fee', 100000)
+        if fee >= confirm_fee:
+            if not self.question(_("The fee for this transaction seems unusually high.\nAre you really sure you want to pay %(fee)s in fees?")%{ 'fee' : self.format_amount(fee) + ' '+ self.base_unit()}):
+                return
 
         self.send_tx(to_address, amount, fee, label)
 
@@ -921,13 +925,13 @@ class ElectrumWindow(QMainWindow):
             QMessageBox.warning(self, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK'))
             return
 
-        if label: 
+        if label:
             self.wallet.set_label(tx.hash(), label)
 
         if tx.is_complete:
             h = self.wallet.send_tx(tx)
             waiting_dialog(lambda: False if self.wallet.tx_event.isSet() else _("Please wait..."))
-            status, msg = self.wallet.receive_tx( h )
+            status, msg = self.wallet.receive_tx( h, tx )
             if status:
                 QMessageBox.information(self, '', _('Payment sent.')+'\n'+msg, _('OK'))
                 self.do_clear()
@@ -989,9 +993,7 @@ class ElectrumWindow(QMainWindow):
             e.setText('')
             self.set_frozen(e,False)
 
-        self.pay_from = []
-        self.tabs.emit(SIGNAL('currentChanged(int)'), 1)
-
+        self.set_pay_from([])
         self.update_status()
 
     def set_frozen(self,entry,frozen):
@@ -1018,14 +1020,6 @@ class ElectrumWindow(QMainWindow):
                 self.wallet.freeze(addr)
         self.update_receive_tab()
 
-    def set_addrs_prioritized(self,addrs,prioritize):
-        for addr in addrs:
-            if not addr: continue
-            if addr in self.wallet.prioritized_addresses and not prioritize:
-                self.wallet.unprioritize(addr)
-            elif addr not in self.wallet.prioritized_addresses and prioritize:
-                self.wallet.prioritize(addr)
-        self.update_receive_tab()
 
 
     def create_list_tab(self, headers):
@@ -1072,7 +1066,7 @@ class ElectrumWindow(QMainWindow):
         self.column_widths["receive"] = []
         for i in range(self.receive_list.columnCount() -1):
             self.column_widths["receive"].append(self.receive_list.columnWidth(i))
-        
+
         self.column_widths["history"] = []
         for i in range(self.history_list.columnCount() - 1):
             self.column_widths["history"].append(self.history_list.columnWidth(i))
@@ -1135,7 +1129,7 @@ class ElectrumWindow(QMainWindow):
     def create_receive_menu(self, position):
         # fixme: this function apparently has a side effect.
         # if it is not called the menu pops up several times
-        #self.receive_list.selectedIndexes() 
+        #self.receive_list.selectedIndexes()
 
         selected = self.receive_list.selectedItems()
         multi_select = len(selected) > 1
@@ -1160,7 +1154,7 @@ class ElectrumWindow(QMainWindow):
             menu.addAction(_("Edit label"), lambda: self.edit_label(True))
             if self.wallet.seed:
                 menu.addAction(_("Private key"), lambda: self.show_private_key(addr))
-                menu.addAction(_("Sign message"), lambda: self.sign_message(addr))
+                menu.addAction(_("Sign message"), lambda: self.sign_message(True,addr))
             if addr in self.wallet.imported_keys:
                 menu.addAction(_("Remove from wallet"), lambda: self.delete_imported_key(addr))
 
@@ -1168,18 +1162,11 @@ class ElectrumWindow(QMainWindow):
             menu.addAction(_("Freeze"), lambda: self.set_addrs_frozen(addrs, True))
         if any(addr in self.wallet.frozen_addresses for addr in addrs):
             menu.addAction(_("Unfreeze"), lambda: self.set_addrs_frozen(addrs, False))
-        if any(addr not in self.wallet.prioritized_addresses for addr in addrs):
-            menu.addAction(_("Prioritize"),
-                    lambda: self.set_addrs_prioritized(addrs, True))
-        if any(addr in self.wallet.prioritized_addresses for addr in addrs):
-            menu.addAction(_("Unprioritize"),
-                    lambda: self.set_addrs_prioritized(addrs, False))
-
-        balance = "  [%s]" % self.format_amount(self.get_sendable_balance())
-        menu.addAction(_("Send From")+balance,
-                lambda: self.send_from_addresses(addrs))
-            
-        run_hook('receive_menu', menu)
+
+        if any(addr not in self.wallet.frozen_addresses for addr in addrs):
+            menu.addAction(_("Send From"), lambda: self.send_from_addresses(addrs))
+
+        run_hook('receive_menu', menu, addrs)
         menu.exec_(self.receive_list.viewport().mapToGlobal(position))
 
 
@@ -1195,7 +1182,7 @@ class ElectrumWindow(QMainWindow):
 
 
     def send_from_addresses(self, addrs):
-        self.pay_from = addrs[:]
+        self.set_pay_from( addrs )
         self.tabs.setCurrentIndex(1)
 
 
@@ -1219,24 +1206,26 @@ class ElectrumWindow(QMainWindow):
 
     def create_contact_menu(self, position):
         item = self.contacts_list.itemAt(position)
-        if not item: return
-        addr = unicode(item.text(0))
-        label = unicode(item.text(1))
-        is_editable = item.data(0,32).toBool()
-        payto_addr = item.data(0,33).toString()
         menu = QMenu()
-        menu.addAction(_("Copy to Clipboard"), lambda: self.app.clipboard().setText(addr))
-        menu.addAction(_("Pay to"), lambda: self.payto(payto_addr))
-        menu.addAction(_("QR code"), lambda: self.show_qrcode("bitcoin:" + addr, _("Address")))
-        if is_editable:
-            menu.addAction(_("Edit label"), lambda: self.edit_label(False))
-            menu.addAction(_("Delete"), lambda: self.delete_contact(addr))
+        if not item:
+            menu.addAction(_("New contact"), lambda: self.new_contact_dialog())
+        else:
+            addr = unicode(item.text(0))
+            label = unicode(item.text(1))
+            is_editable = item.data(0,32).toBool()
+            payto_addr = item.data(0,33).toString()
+            menu.addAction(_("Copy to Clipboard"), lambda: self.app.clipboard().setText(addr))
+            menu.addAction(_("Pay to"), lambda: self.payto(payto_addr))
+            menu.addAction(_("QR code"), lambda: self.show_qrcode("bitcoin:" + addr, _("Address")))
+            if is_editable:
+                menu.addAction(_("Edit label"), lambda: self.edit_label(False))
+                menu.addAction(_("Delete"), lambda: self.delete_contact(addr))
 
         run_hook('create_contact_menu', menu, item)
         menu.exec_(self.contacts_list.viewport().mapToGlobal(position))
 
 
-    def update_receive_item(self, item, num_tx = 0):
+    def update_receive_item(self, item):
         item.setFont(0, QFont(MONOSPACE_FONT))
         address = str(item.data(0,0).toString())
         label = self.wallet.labels.get(address,'')
@@ -1251,20 +1240,13 @@ class ElectrumWindow(QMainWindow):
         balance = self.format_amount(c + u)
         item.setData(2,0,balance)
 
-        if (num_tx > 1) and (c == -u):
-            item.setForeground(0,QColor('lightgray'))
-            item.setForeground(1,QColor('gray'))
-            item.setForeground(2,QColor('gray'))
-            item.setForeground(3,QColor('gray'))
-        elif address in self.wallet.frozen_addresses: 
+        if address in self.wallet.frozen_addresses:
             item.setBackgroundColor(0, QColor('lightblue'))
-        elif address in self.wallet.prioritized_addresses: 
-            item.setBackgroundColor(0, QColor('lightgreen'))
 
 
     def update_receive_tab(self):
         l = self.receive_list
-        
+
         l.clear()
         l.setColumnHidden(2, False)
         l.setColumnHidden(3, False)
@@ -1289,11 +1271,13 @@ class ElectrumWindow(QMainWindow):
             if not self.wallet.is_seeded(k):
                 icon = QIcon(":icons/key.png")
                 account_item.setIcon(0, icon)
-            
+
             for is_change in ([0,1]):
                 name = _("Receiving") if not is_change else _("Change")
                 seq_item = QTreeWidgetItem( [ name, '', '', '', ''] )
                 account_item.addChild(seq_item)
+                used_item = QTreeWidgetItem( [ _("Used"), '', '', '', ''] )
+                used_flag = False
                 if not is_change: seq_item.setExpanded(True)
 
                 is_red = False
@@ -1301,7 +1285,7 @@ class ElectrumWindow(QMainWindow):
 
                 for address in account.get_addresses(is_change):
                     h = self.wallet.history.get(address,[])
-            
+
                     if h == []:
                         gap += 1
                         if gap > self.wallet.gap_limit:
@@ -1309,12 +1293,19 @@ class ElectrumWindow(QMainWindow):
                     else:
                         gap = 0
 
+                    c, u = self.wallet.get_addr_balance(address)
                     num_tx = '*' if h == ['*'] else "%d"%len(h)
                     item = QTreeWidgetItem( [ address, '', '', num_tx] )
-                    self.update_receive_item(item, len(h))
+                    self.update_receive_item(item)
                     if is_red:
                         item.setBackgroundColor(1, QColor('red'))
-                    seq_item.addChild(item)
+                    if len(h) > 0 and c == -u:
+                        if not used_flag:
+                            seq_item.insertChild(0,used_item)
+                            used_flag = True
+                        used_item.addChild(item)
+                    else:
+                        seq_item.addChild(item)
 
 
         for k, addr in self.wallet.get_pending_accounts():
@@ -1338,7 +1329,7 @@ class ElectrumWindow(QMainWindow):
                 item = QTreeWidgetItem( [ address, '', '', ''] )
                 self.update_receive_item(item)
                 account_item.addChild(item)
-                
+
 
         # we use column 1 because column 0 may be hidden
         l.setCurrentItem(l.topLevelItem(0),1)
@@ -1385,7 +1376,7 @@ class ElectrumWindow(QMainWindow):
         for m in dir(c):
             if m[0]=='_' or m in ['network','wallet']: continue
             methods[m] = mkfunc(c._run, m)
-            
+
         console.updateNamespace(methods)
 
 
@@ -1414,7 +1405,7 @@ class ElectrumWindow(QMainWindow):
         self.updatelabel = UpdateLabel(self.config, sb)
 
         self.account_selector = QComboBox()
-        self.connect(self.account_selector,SIGNAL("activated(QString)"),self.change_account) 
+        self.connect(self.account_selector,SIGNAL("activated(QString)"),self.change_account)
         sb.addPermanentWidget(self.account_selector)
 
         if (int(qtVersion[0]) >= 4 and int(qtVersion[2]) >= 7):
@@ -1423,11 +1414,11 @@ class ElectrumWindow(QMainWindow):
         self.lock_icon = QIcon()
         self.password_button = StatusBarButton( self.lock_icon, _("Password"), self.change_password_dialog )
         sb.addPermanentWidget( self.password_button )
-            
+
         sb.addPermanentWidget( StatusBarButton( QIcon(":icons/preferences.png"), _("Preferences"), self.settings_dialog ) )
-        self.seed_button = StatusBarButton( QIcon(":icons/seed.png"), _("Seed"), self.show_seed_dialog ) 
+        self.seed_button = StatusBarButton( QIcon(":icons/seed.png"), _("Seed"), self.show_seed_dialog )
         sb.addPermanentWidget( self.seed_button )
-        self.status_button = StatusBarButton( QIcon(":icons/status_disconnected.png"), _("Network"), self.run_network_dialog ) 
+        self.status_button = StatusBarButton( QIcon(":icons/status_disconnected.png"), _("Network"), self.run_network_dialog )
         sb.addPermanentWidget( self.status_button )
 
         run_hook('create_status_bar', (sb,))
@@ -1463,7 +1454,7 @@ class ElectrumWindow(QMainWindow):
         d = QDialog(self)
         vbox = QVBoxLayout(d)
         vbox.addWidget(QLabel(_('New Contact')+':'))
-        
+
         grid = QGridLayout()
         line1 = QLineEdit()
         line2 = QLineEdit()
@@ -1474,17 +1465,17 @@ class ElectrumWindow(QMainWindow):
 
         vbox.addLayout(grid)
         vbox.addLayout(ok_cancel_buttons(d))
-    
+
         if not d.exec_():
             return
-        
+
         address = str(line1.text())
         label = unicode(line2.text())
-        
+
         if not is_valid(address):
             QMessageBox.warning(self, _('Error'), _('Invalid Address'), _('OK'))
             return
-        
+
         self.wallet.add_contact(address)
         if label:
             self.wallet.set_label(address, label)
@@ -1522,8 +1513,8 @@ class ElectrumWindow(QMainWindow):
         self.wallet.create_pending_account('1', name)
         self.update_receive_tab()
         self.tabs.setCurrentIndex(2)
-        
-            
+
+
 
     def show_master_public_key_old(self):
         dialog = QDialog(self)
@@ -1551,7 +1542,7 @@ class ElectrumWindow(QMainWindow):
         vbox.addLayout(close_button(dialog))
         dialog.setLayout(vbox)
         dialog.exec_()
-        
+
 
     def show_master_public_key(self):
 
@@ -1591,14 +1582,14 @@ class ElectrumWindow(QMainWindow):
             mpk_text.setText(K)
             mpk_qrw.set_addr(K)
             mpk_qrw.update_qr()
-            
+
         key_selector = QComboBox()
         keys = sorted(self.wallet.master_public_keys.keys())
         key_selector.addItems(keys)
 
         main_layout.addWidget(QLabel(_('Derivation:')), 0, 0)
         main_layout.addWidget(key_selector, 0, 1)
-        dialog.connect(key_selector,SIGNAL("activated(QString)"),update) 
+        dialog.connect(key_selector,SIGNAL("activated(QString)"),update)
 
         update(keys[0])
 
@@ -1608,7 +1599,7 @@ class ElectrumWindow(QMainWindow):
 
         dialog.setLayout(vbox)
         dialog.exec_()
-        
+
 
     @protected
     def show_seed_dialog(self, password):
@@ -1687,7 +1678,7 @@ class ElectrumWindow(QMainWindow):
                 return
         else:
             password = None
-            
+
         if args != (False,):
             args = (self,) + args + (password,)
         else:
@@ -1703,7 +1694,21 @@ class ElectrumWindow(QMainWindow):
         except Exception as e:
             self.show_message(str(e))
             return
-        QMessageBox.information(self, _('Private key'), _('Address')+ ': ' + address + '\n\n' + _('Private key') + ': ' + '\n'.join(pk_list), _('OK'))
+
+        d = QDialog(self)
+        d.setMinimumSize(600, 200)
+        d.setModal(1)
+        vbox = QVBoxLayout()
+        vbox.addWidget( QLabel(_("Address") + ': ' + address))
+        vbox.addWidget( QLabel(_("Private key") + ':'))
+        keys = QTextEdit()
+        keys.setReadOnly(True)
+        keys.setText('\n'.join(pk_list))
+        vbox.addWidget(keys)
+        vbox.addWidget( QRCodeWidget('\n'.join(pk_list)) )
+        vbox.addLayout(close_button(d))
+        d.setLayout(vbox)
+        d.exec_()
 
 
     @protected
@@ -1716,16 +1721,26 @@ class ElectrumWindow(QMainWindow):
         except Exception as e:
             self.show_message(str(e))
 
-    def sign_message(self, address):
-        if not address: return
+    def do_verify(self, address, message, signature):
+        message = unicode(message.toPlainText())
+        message = message.encode('utf-8')
+        if bitcoin.verify_message(address.text(), str(signature.toPlainText()), message):
+            self.show_message(_("Signature verified"))
+        else:
+            self.show_message(_("Error: wrong signature"))
+
+
+    def sign_message(self, sign, address):
+        if sign and not address: return
         d = QDialog(self)
         d.setModal(1)
-        d.setWindowTitle(_('Sign Message'))
+        if sign:
+            d.setWindowTitle(_('Sign Message'))
+        elif not sign:
+            d.setWindowTitle(_('Verify Message'))
         d.setMinimumSize(410, 290)
 
-        tab_widget = QTabWidget()
-        tab = QWidget()
-        layout = QGridLayout(tab)
+        layout = QGridLayout(d)
 
         sign_address = QLineEdit()
 
@@ -1743,60 +1758,22 @@ class ElectrumWindow(QMainWindow):
         layout.addWidget(sign_signature, 3, 1)
         layout.setRowStretch(3,1)
 
-
         hbox = QHBoxLayout()
-        b = QPushButton(_("Sign"))
+        if sign:
+            b = QPushButton(_("Sign"))
+        elif not sign:
+            b = QPushButton(_("Verify"))
         hbox.addWidget(b)
-        b.clicked.connect(lambda: self.do_sign(sign_address, sign_message, sign_signature))
+        if sign:
+            b.clicked.connect(lambda: self.do_sign(sign_address, sign_message, sign_signature))
+        elif not sign:
+            b.clicked.connect(lambda: self.do_verify(sign_address, sign_message, sign_signature))
         b = QPushButton(_("Close"))
         b.clicked.connect(d.accept)
         hbox.addWidget(b)
         layout.addLayout(hbox, 4, 1)
-        tab_widget.addTab(tab, _("Sign"))
-
-
-        tab = QWidget()
-        layout = QGridLayout(tab)
-
-        verify_address = QLineEdit()
-        layout.addWidget(QLabel(_('Address')), 1, 0)
-        layout.addWidget(verify_address, 1, 1)
-
-        verify_message = QTextEdit()
-        layout.addWidget(QLabel(_('Message')), 2, 0)
-        layout.addWidget(verify_message, 2, 1)
-        layout.setRowStretch(2,3)
-
-        verify_signature = QTextEdit()
-        layout.addWidget(QLabel(_('Signature')), 3, 0)
-        layout.addWidget(verify_signature, 3, 1)
-        layout.setRowStretch(3,1)
-
-        def do_verify():
-            message = unicode(verify_message.toPlainText())
-            message = message.encode('utf-8')
-            if bitcoin.verify_message(verify_address.text(), str(verify_signature.toPlainText()), message):
-                self.show_message(_("Signature verified"))
-            else:
-                self.show_message(_("Error: wrong signature"))
-
-        hbox = QHBoxLayout()
-        b = QPushButton(_("Verify"))
-        b.clicked.connect(do_verify)
-        hbox.addWidget(b)
-        b = QPushButton(_("Close"))
-        b.clicked.connect(d.accept)
-        hbox.addWidget(b)
-        layout.addLayout(hbox, 4, 1)
-        tab_widget.addTab(tab, _("Verify"))
-
-        vbox = QVBoxLayout()
-        vbox.addWidget(tab_widget)
-        d.setLayout(vbox)
         d.exec_()
 
-        
-
 
     def question(self, msg):
         return QMessageBox.question(self, _('Message'), msg, QMessageBox.Yes | QMessageBox.No, QMessageBox.No) == QMessageBox.Yes
@@ -1856,7 +1833,7 @@ class ElectrumWindow(QMainWindow):
             return tx
         except Exception:
             pass
-        
+
         QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum was unable to parse your transaction"))
 
 
@@ -1891,17 +1868,39 @@ class ElectrumWindow(QMainWindow):
         if tx:
             self.show_transaction(tx)
 
+    def do_process_from_txid(self):
+        from electrum import transaction
+        txid, ok = QInputDialog.getText(self, _('Lookup transaction'), _('Transaction ID') + ':')
+        if ok and txid:
+            r = self.network.synchronous_get([ ('blockchain.transaction.get',[str(txid)]) ])[0]
+            if r:
+                tx = transaction.Transaction(r)
+                if tx:
+                    self.show_transaction(tx)
+                else:
+                    self.show_message("unknown transaction")
+
     def do_process_from_csvReader(self, csvReader):
         outputs = []
+        errors = []
+        errtext = ""
         try:
-            for row in csvReader:
+            for position, row in enumerate(csvReader):
                 address = row[0]
-                amount = float(row[1])
+                if not is_valid(address):
+                    errors.append((position, address))
+                    continue
+                amount = Decimal(row[1])
                 amount = int(100000000*amount)
                 outputs.append((address, amount))
         except (ValueError, IOError, os.error), reason:
             QMessageBox.critical(None, _("Unable to read file or no transaction found"), _("Electrum was unable to open your transaction file") + "\n" + str(reason))
             return
+        if errors != []:
+            for x in errors:
+                errtext += "CSV Row " + str(x[0]+1) + ": " + x[1] + "\n"
+            QMessageBox.critical(None, _("Invalid Addresses"), _("ABORTING! Invalid Addresses found:") + "\n\n" + errtext)
+            return
 
         try:
             tx = self.wallet.make_unsigned_transaction(outputs, None, None)
@@ -1936,6 +1935,10 @@ class ElectrumWindow(QMainWindow):
 
     @protected
     def do_export_privkeys(self, password):
+        if not self.wallet.seed:
+            self.show_message(_("This wallet has no seed"))
+            return
+
         self.show_message("%s\n%s\n%s" % (_("WARNING: ALL your private keys are secret."),  _("Exposing a single private key can compromise your entire wallet!"), _("In particular, DO NOT use 'redeem private key' services proposed by third parties.")))
 
         try:
@@ -1947,7 +1950,7 @@ class ElectrumWindow(QMainWindow):
                     transaction.writerow(["address", "private_key"])
 
                     addresses = self.wallet.addresses(True)
-                    
+
                     for addr in addresses:
                         pk = "".join(self.wallet.get_private_key(addr, password))
                         transaction.writerow(["%34s"%addr,pk])
@@ -1975,7 +1978,7 @@ class ElectrumWindow(QMainWindow):
             QMessageBox.information(None, _("Labels imported"), _("Your labels were imported from")+" '%s'" % str(labelsFile))
         except (IOError, os.error), reason:
             QMessageBox.critical(None, _("Unable to import labels"), _("Electrum was unable to import your labels.")+"\n" + str(reason))
-            
+
 
     def do_export_labels(self):
         labels = self.wallet.labels
@@ -2014,7 +2017,7 @@ class ElectrumWindow(QMainWindow):
             except Exception as e:
                 badkeys.append(key)
                 continue
-            if not addr: 
+            if not addr:
                 badkeys.append(key)
             else:
                 addrlist.append(addr)
@@ -2043,7 +2046,7 @@ class ElectrumWindow(QMainWindow):
         grid.addWidget(HelpButton(msg), 0, 2)
         if not self.config.is_modifiable('num_zeros'):
             for w in [nz_e, nz_label]: w.setEnabled(False)
-        
+
         lang_label=QLabel(_('Language') + ':')
         grid.addWidget(lang_label, 1, 0)
         lang_combo = QComboBox()
@@ -2059,7 +2062,7 @@ class ElectrumWindow(QMainWindow):
         if not self.config.is_modifiable('language'):
             for w in [lang_combo, lang_label]: w.setEnabled(False)
 
-        
+
         fee_label = QLabel(_('Transaction fee') + ':')
         grid.addWidget(fee_label, 2, 0)
         fee_e = AmountEdit(self.base_unit)
@@ -2080,7 +2083,7 @@ class ElectrumWindow(QMainWindow):
         grid.addWidget(unit_combo, 3, 1)
         grid.addWidget(HelpButton(_('Base unit of your wallet.')\
                                              + '\n1BTC=1000mBTC.\n' \
-                                             + _(' This settings affects the fields in the Send tab')+' '), 3, 2)
+                                             + _(' These settings affects the fields in the Send tab')+' '), 3, 2)
 
         usechange_cb = QCheckBox(_('Use change addresses'))
         usechange_cb.setChecked(self.wallet.use_change)
@@ -2092,7 +2095,7 @@ class ElectrumWindow(QMainWindow):
 
         vbox.addLayout(grid)
         vbox.addLayout(ok_cancel_buttons(d))
-        d.setLayout(vbox) 
+        d.setLayout(vbox)
 
         # run the dialog
         if not d.exec_(): return
@@ -2105,7 +2108,7 @@ class ElectrumWindow(QMainWindow):
             return
 
         self.wallet.set_fee(fee)
-        
+
         nz = unicode(nz_e.text())
         try:
             nz = int( nz )
@@ -2124,21 +2127,21 @@ class ElectrumWindow(QMainWindow):
         if self.wallet.use_change != usechange_result:
             self.wallet.use_change = usechange_result
             self.wallet.storage.put('use_change', self.wallet.use_change)
-        
+
         unit_result = units[unit_combo.currentIndex()]
         if self.base_unit() != unit_result:
             self.decimal_point = 8 if unit_result == 'BTC' else 5
             self.config.set_key('decimal_point', self.decimal_point, True)
             self.update_history_tab()
             self.update_status()
-        
+
         need_restart = False
 
         lang_request = languages.keys()[lang_combo.currentIndex()]
         if lang_request != self.config.get('language'):
             self.config.set_key("language", lang_request, True)
             need_restart = True
-            
+
         run_hook('close_settings_dialog')
 
         if need_restart:
@@ -2151,6 +2154,7 @@ class ElectrumWindow(QMainWindow):
         NetworkDialog(self.wallet.network, self.config, self).do_exec()
 
     def closeEvent(self, event):
+        self.tray.hide()
         g = self.geometry()
         self.config.set_key("winpos-qt", [g.left(),g.top(),g.width(),g.height()], True)
         self.save_column_widths()
@@ -2159,6 +2163,8 @@ class ElectrumWindow(QMainWindow):
         event.accept()
 
 
+    def verify_message(self):
+        self.sign_message(False, "")
 
     def plugins_dialog(self):
         from electrum.plugins import plugins
@@ -2202,7 +2208,7 @@ class ElectrumWindow(QMainWindow):
                     w = p.settings_widget(self)
                     w.setEnabled( p.is_enabled() )
                     grid.addWidget(w, i, 1)
-                else: 
+                else:
                     w = None
                 cb.clicked.connect(mk_toggle(cb,p,w))
                 grid.addWidget(HelpButton(p.description()), i, 2)