show pruning level in network dialog (expert mode)

diff --git a/gui/gui_classic.py b/gui/gui_classic.py
index 5a32256..4566504 100644 (file)
--- a/gui/gui_classic.py
+++ b/gui/gui_classic.py
@@ -2182,12 +2182,13 @@ class ElectrumWindow(QMainWindow):
         
         label = _('Active Servers') if wallet.interface.servers else _('Default Servers')
         servers_list_widget = QTreeWidget(parent)
-        servers_list_widget.setHeaderLabels( [ label, _('Type') ] )
+        servers_list_widget.setHeaderLabels( [ label, _('Pruning') ] )
         servers_list_widget.setMaximumHeight(150)
         servers_list_widget.setColumnWidth(0, 240)
         for _host in servers_list.keys():
-            _type = 'P' if servers_list[_host].get('pruning') else 'F'
-            servers_list_widget.addTopLevelItem(QTreeWidgetItem( [ _host, _type ] ))
+            pruning_level = servers_list[_host].get('pruning')
+            servers_list_widget.addTopLevelItem(QTreeWidgetItem( [ _host, pruning_level ] ))
+        servers_list_widget.setColumnHidden(1, not parent.expert_mode if parent else True)
 
         def change_server(host, protocol=None):
             pp = plist.get(host,DEFAULT_PORTS)

diff --git a/lib/interface.py b/lib/interface.py
index cd78cad..7386b1b 100644 (file)
--- a/lib/interface.py
+++ b/lib/interface.py
@@ -123,7 +123,7 @@ class Interface(threading.Thread):
                     host = item[1]
                     ports = []
                     version = None
-                    pruning = False
+                    pruning_level = '-'
                     if len(item) > 2:
                         for v in item[2]:
                             if re.match("[stgh]\d*", v):
@@ -132,14 +132,15 @@ class Interface(threading.Thread):
                                 ports.append((protocol, port))
                             elif re.match("v(.?)+", v):
                                 version = v[1:]
-                            elif v == 'p':
-                                pruning = True
+                            elif re.match("p\d*", v):
+                                pruning_level = v[1:]
+                                if pruning_level == '': pruning_level = '0'
                     try: 
                         is_recent = float(version)>=float(PROTOCOL_VERSION)
                     except:
                         is_recent = False
                     if ports and is_recent:
-                        servers[host] = {'ports':ports, 'pruning':pruning}
+                        servers[host] = {'ports':ports, 'pruning':pruning_level}
                 self.servers = servers
                 self.trigger_callback('peers')