use named callbacks with the interface

[electrum-nvc.git] / lib / gui_qt.py

diff --git a/lib/gui_qt.py b/lib/gui_qt.py
index 829170d..31542bd 100644 (file)
--- a/lib/gui_qt.py
+++ b/lib/gui_qt.py
@@ -207,7 +207,7 @@ class ElectrumWindow(QMainWindow):
         QMainWindow.__init__(self)
         self.wallet = wallet
         self.config = config
-        self.wallet.register_callback(self.update_callback)
+        self.wallet.interface.register_callback('updated', self.update_callback)
 
         self.detailed_view = config.get('qt_detailed_view', False)
 
@@ -1299,8 +1299,8 @@ class ElectrumWindow(QMainWindow):
         gui_label=QLabel(_('Default GUI') + ':')
         grid.addWidget(gui_label , 7, 0)
         gui_combo = QComboBox()
-        gui_combo.addItems(['Lite', 'Qt', 'Gtk'])
-        gui_combo.setCurrentIndex(gui_combo.findText(self.config.get("gui","lite").capitalize()))
+        gui_combo.addItems(['Lite', 'Classic', 'Gtk', 'Text'])
+        gui_combo.setCurrentIndex(gui_combo.findText(self.config.get("gui","classic").capitalize()))
         grid.addWidget(gui_combo, 7, 1)
         grid.addWidget(HelpButton(_('Select which GUI mode to use at start up. ')), 7, 2)
         if not self.config.is_modifiable('gui'):
@@ -1383,12 +1383,12 @@ class ElectrumWindow(QMainWindow):
             
         plist = {}
         for item in servers_list:
-            host, pp = item
+            _host, pp = item
             z = {}
             for item2 in pp:
-                protocol, port = item2
-                z[protocol] = port
-            plist[host] = z
+                _protocol, _port = item2
+                z[_protocol] = _port
+            plist[_host] = z
 
         d = QDialog(parent)
         d.setModal(1)
@@ -1424,16 +1424,13 @@ class ElectrumWindow(QMainWindow):
         protocol_letters = 'thsg'
         server_protocol.addItems(protocol_names)
 
-        host, port, protocol = server.split(':')
-        server_host.setText(host)
-        server_port.setText(port)
-        server_protocol.setCurrentIndex(protocol_letters.index(protocol))
-
         grid.addWidget(QLabel(_('Server') + ':'), 0, 0)
         grid.addWidget(server_protocol, 0, 1)
         grid.addWidget(server_host, 0, 2)
         grid.addWidget(server_port, 0, 3)
 
+        host, port, protocol = server.split(':')
+
         def change_protocol(p):
             protocol = protocol_letters[p]
             host = unicode(server_host.text())
@@ -1445,27 +1442,33 @@ class ElectrumWindow(QMainWindow):
             server_port.setText( port )
 
         server_protocol.connect(server_protocol, SIGNAL('currentIndexChanged(int)'), change_protocol)
-
-        
-        if wallet.interface.servers:
-            label = _('Active Servers')
-        else:
-            label = _('Default Servers')
         
+        label = _('Active Servers') if wallet.interface.servers else _('Default Servers')
         servers_list_widget = QTreeWidget(parent)
         servers_list_widget.setHeaderLabels( [ label ] )
         servers_list_widget.setMaximumHeight(150)
-        for host in plist.keys():
-            servers_list_widget.addTopLevelItem(QTreeWidgetItem( [ host ] ))
+        for _host in plist.keys():
+            servers_list_widget.addTopLevelItem(QTreeWidgetItem( [ _host ] ))
 
-        def change_server(x):
-            host = unicode(x.text(0))
-            pp = plist[host]
-            if 't' in pp.keys():
-                protocol = 't'
-            else:
-                protocol = pp.keys()[0]
-            port = pp[protocol]
+
+        def change_server(host, protocol=None):
+            pp = plist.get(host,{})
+            if protocol:
+                port = pp.get(protocol)
+                if not port: protocol = None
+                    
+            if not protocol:
+                if not pp:
+                    protocol = 't'
+                    port = '50001'
+                elif 't' in pp.keys():
+                    protocol = 't'
+                    port = pp.get(protocol)
+                else:
+                    protocol = pp.keys()[0]
+                    port = pp.get(protocol)
+
+            
             server_host.setText( host )
             server_port.setText( port )
             server_protocol.setCurrentIndex(protocol_letters.index(protocol))
@@ -1478,8 +1481,10 @@ class ElectrumWindow(QMainWindow):
                 else:
                     server_protocol.model().setData(j, QtCore.QVariant(0,False), QtCore.Qt.UserRole-1)
 
+        change_server(host,protocol)
+
 
-        servers_list_widget.connect(servers_list_widget, SIGNAL('itemClicked(QTreeWidgetItem*, int)'), change_server)
+        servers_list_widget.connect(servers_list_widget, SIGNAL('itemClicked(QTreeWidgetItem*, int)'), lambda x: change_server(unicode(x.text(0))))
         grid.addWidget(servers_list_widget, 1, 1, 1, 3)
 
         if not wallet.config.is_modifiable('server'):
@@ -1572,7 +1577,7 @@ class ElectrumGui:
             wallet.init_mpk( wallet.seed )
             wallet.up_to_date_event.clear()
             wallet.up_to_date = False
-            wallet.interface.poke()
+            wallet.interface.poke('synchronizer')
             waiting_dialog(waiting)
             # run a dialog indicating the seed, ask the user to remember it
             ElectrumWindow.show_seed_dialog(wallet)
@@ -1584,7 +1589,7 @@ class ElectrumGui:
             wallet.init_mpk( wallet.seed )
             wallet.up_to_date_event.clear()
             wallet.up_to_date = False
-            wallet.interface.poke()
+            wallet.interface.poke('synchronizer')
             waiting_dialog(waiting)
             if wallet.is_found():
                 # history and addressbook