move master_private_keys and master_public_keys to NewWallet

[electrum-nvc.git] / gui / text.py

diff --git a/gui/text.py b/gui/text.py
index 8c07148..0c6a148 100644 (file)
--- a/gui/text.py
+++ b/gui/text.py
@@ -22,8 +22,7 @@ class ElectrumGui:
             exit()
 
         self.wallet = Wallet(storage)
-        if self.network:
-            self.wallet.start_threads(network)
+        self.wallet.start_threads(self.network)
 
         locale.setlocale(locale.LC_ALL, '')
         self.encoding = locale.getpreferredencoding()
@@ -65,7 +64,7 @@ class ElectrumGui:
     def set_cursor(self, x):
         try:
             curses.curs_set(x)
-        except:
+        except Exception:
             pass
 
     def restore_or_create(self):
@@ -113,7 +112,7 @@ class ElectrumGui:
             if conf:
                 try:
                     time_str = datetime.datetime.fromtimestamp( timestamp).isoformat(' ')[:-3]
-                except:
+                except Exception:
                     time_str = "------"
             else:
                 time_str = 'pending'
@@ -123,15 +122,17 @@ class ElectrumGui:
 
 
     def print_balance(self):
-        if self.network and self.network.interface and self.network.interface.is_connected:
+        if not self.network:
+            msg = _("Offline")
+        elif self.network.interface and self.network.interface.is_connected:
             if not self.wallet.up_to_date:
-                msg = _( "Synchronizing..." )
+                msg = _("Synchronizing...")
             else: 
                 c, u =  self.wallet.get_balance()
                 msg = _("Balance")+": %f  "%(Decimal( c ) / 100000000)
                 if u: msg += "  [%f unconfirmed]"%(Decimal( u ) / 100000000)
         else:
-                msg = _( "Not connected" )
+            msg = _("Not connected")
             
         self.stdscr.addstr( self.maxy -1, 3, msg)
 
@@ -290,12 +291,12 @@ class ElectrumGui:
             return
         try:
             amount = int( Decimal( self.str_amount) * 100000000 )
-        except:
+        except Exception:
             self.show_message(_('Invalid Amount'))
             return
         try:
             fee = int( Decimal( self.str_fee) * 100000000 )
-        except:
+        except Exception:
             self.show_message(_('Invalid Fee'))
             return
 
@@ -308,7 +309,7 @@ class ElectrumGui:
 
         try:
             tx = self.wallet.mktx( [(self.str_recipient, amount)], password, fee)
-        except BaseException, e:
+        except Exception as e:
             self.show_message(str(e))
             return
             
@@ -318,7 +319,7 @@ class ElectrumGui:
         h = self.wallet.send_tx(tx)
         self.show_message(_("Please wait..."), getchar=False)
         self.wallet.tx_event.wait()
-        status, msg = self.wallet.receive_tx( h )
+        status, msg = self.wallet.receive_tx( h, tx )
 
         if status:
             self.show_message(_('Payment sent.'))
@@ -359,7 +360,7 @@ class ElectrumGui:
                 if not auto_connect:
                     try:
                         host, port, protocol = server.split(':')
-                    except:
+                    except Exception:
                         self.show_message("Error:" + server + "\nIn doubt, type \"auto-connect\"")
                         return False
 
@@ -467,7 +468,7 @@ class ElectrumGui:
                     choices = item.get('choices')
                     try:
                         j = choices.index(item.get('value'))
-                    except:
+                    except Exception:
                         j = 0
                     new_choice = choices[(j + 1)% len(choices)]
                     item['value'] = new_choice