Initial novacoin support

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

diff --git a/gui/qt/network_dialog.py b/gui/qt/network_dialog.py
index cf468db..c664993 100644 (file)
--- a/gui/qt/network_dialog.py
+++ b/gui/qt/network_dialog.py
@@ -17,13 +17,13 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import sys, time, datetime, re, threading
-from electrum.i18n import _
-from electrum.util import print_error, print_msg
+from electrum_nvc.i18n import _
+from electrum_nvc.util import print_error, print_msg
 import os.path, json, ast, traceback
 
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
-from electrum import DEFAULT_SERVERS, DEFAULT_PORTS
+from electrum_nvc import DEFAULT_SERVERS, DEFAULT_PORTS
 
 from util import *
 
@@ -39,21 +39,20 @@ class NetworkDialog(QDialog):
         self.setMinimumSize(375, 20)
 
         self.network = network
-        self.interface = interface = network.interface
         self.config = config
         self.protocol = None
 
         if parent:
             n = len(network.interfaces)
             if n:
-                status = _("Blockchain") + ": " + "%d "%(network.blockchain.height) + _("blocks") +  ".\n" + _("Getting block headers from %d nodes.")%n
+                status = _("Blockchain") + ": " + "%d "%(network.blockchain.height()) + _("blocks") +  ".\n" + _("Getting block headers from %d nodes.")%n
             else:
                 status = _("Not connected")
 
             if network.is_connected():
-                status += "\n" + _("Electrum server:") + " %s"%(interface.host) 
+                status += "\n" + _("Server") + ": %s"%(network.interface.host) 
             else:
-                status += "\n" + _("Disconnected from history server")
+                status += "\n" + _("Disconnected from server")
                 
         else:
             import random
@@ -73,7 +72,10 @@ class NetworkDialog(QDialog):
         hbox.addWidget(l)
         hbox.addWidget(QLabel(status))
         hbox.addStretch(50)
-        hbox.addWidget(HelpButton(_("Electrum connects to several servers in order to download block headers and find out the longest blockchain. However, your wallet addresses are sent to a single server, in order to receive your transaction history.")))
+        msg = _("Electrum sends your wallet addresses to a single server, in order to receive your transaction history.") + "\n\n" \
+            + _("In addition, Electrum connects to several nodes in order to download block headers and find out the longest blockchain.") + " " \
+            + _("This blockchain is used to verify the transactions sent by the address server.")
+        hbox.addWidget(HelpButton(msg))
         vbox.addLayout(hbox)
 
         # grid layout
@@ -90,23 +92,24 @@ class NetworkDialog(QDialog):
         self.server_protocol.addItems(protocol_names)
         self.server_protocol.connect(self.server_protocol, SIGNAL('currentIndexChanged(int)'), self.change_protocol)
 
-        grid.addWidget(QLabel(_('Protocol') + ':'), 0, 0)
-        grid.addWidget(self.server_protocol, 0, 1)
+        grid.addWidget(QLabel(_('Protocol') + ':'), 3, 0)
+        grid.addWidget(self.server_protocol, 3, 1)
 
 
         # server
-        grid.addWidget(QLabel(_('Server') + ':'), 1, 0)
+        grid.addWidget(QLabel(_('Server') + ':'), 0, 0)
 
         # auto connect
         self.autocycle_cb = QCheckBox(_('Auto-connect'))
         self.autocycle_cb.setChecked(self.config.get('auto_cycle', True))
-        grid.addWidget(self.autocycle_cb, 1, 1, 1, 2)
+        grid.addWidget(self.autocycle_cb, 0, 1)
         if not self.config.is_modifiable('auto_cycle'): self.autocycle_cb.setEnabled(False)
-        grid.addWidget(HelpButton(_("If this is enabled, Electrum will always use a server that is on the the longest blockchain.")), 1, 3)
+        msg = _("If auto-connect is enabled, Electrum will always use a server that is on the longest blockchain.") + " " \
+            + _("If it is disabled, Electrum will warn you if your server is lagging.")
+        grid.addWidget(HelpButton(msg), 0, 4)
 
-
-        grid.addWidget(self.server_host, 2, 1, 1, 2)
-        grid.addWidget(self.server_port, 2, 3)
+        grid.addWidget(self.server_host, 0, 2, 1, 2)
+        grid.addWidget(self.server_port, 0, 3)
 
 
         label = _('Active Servers') if network.irc_servers else _('Default Servers')
@@ -117,15 +120,14 @@ class NetworkDialog(QDialog):
 
         if server:
             host, port, protocol = server.split(':')
-            self.set_protocol(protocol)
             self.change_server(host, protocol)
-        else:
-            self.set_protocol('s')
+
+        self.set_protocol(self.network.protocol)
 
         self.servers_list_widget.connect(self.servers_list_widget, 
                                          SIGNAL('currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)'), 
                                          lambda x,y: self.server_changed(x))
-        grid.addWidget(self.servers_list_widget, 3, 1, 1, 3)
+        grid.addWidget(self.servers_list_widget, 1, 1, 1, 3)
 
         if not config.is_modifiable('server'):
             for w in [self.server_host, self.server_port, self.server_protocol, self.servers_list_widget]: w.setEnabled(False)