ui-macos: include routing type in each connection title.

This makes it extra clear when a connection is for "all routes" vs. custom
vs. auto.

ui-macos/main.py

@@ -222,6 +222,7 @@ class SshuttleController(NSObject):
         if len(self.servers):
             for i in self.servers:
                 host = i.host()
+                title = i.title()
                 want = i.wantConnect()
                 connected = i.connected()
                 numnets = len(list(i.nets()))
@@ -231,9 +232,9 @@ class SshuttleController(NSObject):
                     additem('Connect %s (no routes)' % host, None, i)
                 elif want:
                     any_conn = i
-                    additem('Disconnect %s' % host, self.cmd_disconnect, i)
+                    additem('Disconnect %s' % title, self.cmd_disconnect, i)
                 else:
-                    additem('Connect %s' % host, self.cmd_connect, i)
+                    additem('Connect %s' % title, self.cmd_connect, i)
                 if not want:
                     msg = 'Off'
                 elif i.error():
@@ -245,12 +246,6 @@ class SshuttleController(NSObject):
                     msg = 'Connecting...'
                     any_inprogress = i
                 addnote('   State: %s' % msg)
-                if i.autoNets() == 0:
-                    addnote('   Routes: All')
-                elif i.autoNets() == 2:
-                    addnote('   Routes: Auto')
-                else:
-                    addnote('   Routes: Custom')
         else:
             addnote('No servers defined yet')
 

ui-macos/models.py

@@ -92,11 +92,28 @@ class SshuttleServer(NSObject):
         if self.autoNets() == NET_MANUAL and not len(list(self.nets())):
             return False
         return True
+
+    def title(self):
+        host = self.host()
+        if not host:
+            return host
+        an = self.autoNets()
+        suffix = ""
+        if an == NET_ALL:
+            suffix = " (all traffic)"
+        elif an == NET_MANUAL:
+            n = self.nets()
+            suffix = ' (%d subnet%s)' % (len(n), len(n)!=1 and 's' or '')
+        return self.host() + suffix
+    def setTitle_(self, v):
+        # title is always auto-generated
+        config_changed()
     
     def host(self):
         return getattr(self, '_k_host', None)
     def setHost_(self, v):
         self._k_host = v
+        self.setTitle_(None)
         config_changed()
     @objc.accessor
     def validateHost_error_(self, value, error):
@@ -109,6 +126,7 @@ class SshuttleServer(NSObject):
         return getattr(self, '_k_nets', [])
     def setNets_(self, v):
         self._k_nets = v
+        self.setTitle_(None)
         config_changed()
     def netsHidden(self):
         #print 'checking netsHidden'
@@ -123,6 +141,7 @@ class SshuttleServer(NSObject):
         self._k_autoNets = v
         self.setNetsHidden_(-1)
         self.setUseDns_(v == NET_ALL)
+        self.setTitle_(None)
         config_changed()
 
     def autoHosts(self):