extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-02-20 12:22:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This makes it extra clear when a connection is for "all routes" vs. custom
vs. auto.
This commit is contained in:
Avery Pennarun 2011-02-01 03:40:40 -08:00
parent 62e1ac4b46
commit a238f7636c
3 changed files with 77 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
ui-macos/MainMenu.xib
View File

@ -12,7 +12,7 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="237"/> <integer value="227"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@ -681,19 +681,19 @@
<reference key="NSCornerView" ref="188199142"/> <reference key="NSCornerView" ref="188199142"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object> </object>
<object class="NSButton" id="177719449"> <object class="NSButton" id="160987209">
<reference key="NSNextResponder" ref="60314308"/> <reference key="NSNextResponder" ref="60314308"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{296, 329}, {285, 18}}</string> <string key="NSFrame">{{296, 329}, {285, 18}}</string>
<reference key="NSSuperview" ref="60314308"/> <reference key="NSSuperview" ref="60314308"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="7643217"> <object class="NSButtonCell" key="NSCell" id="565787077">
<int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int> <int key="NSCellFlags2">0</int>
<string key="NSContents">Send all DNS requests through this server</string> <string key="NSContents">Send all DNS requests through this server</string>
<reference key="NSSupport" ref="696441443"/> <reference key="NSSupport" ref="696441443"/>
<reference key="NSControlView" ref="177719449"/> <reference key="NSControlView" ref="160987209"/>
<int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int> <int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="581816235"/> <reference key="NSNormalImage" ref="581816235"/>
@ -789,19 +789,19 @@
<int key="NSPeriodicInterval">25</int> <int key="NSPeriodicInterval">25</int>
</object> </object>
</object> </object>
<object class="NSButton" id="887086095"> <object class="NSButton" id="221951564">
<reference key="NSNextResponder" ref="187214803"/> <reference key="NSNextResponder" ref="187214803"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{139, 287}, {347, 18}}</string> <string key="NSFrame">{{139, 287}, {347, 18}}</string>
<reference key="NSSuperview" ref="187214803"/> <reference key="NSSuperview" ref="187214803"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="148323250"> <object class="NSButtonCell" key="NSCell" id="13263275">
<int key="NSCellFlags">67239424</int> <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int> <int key="NSCellFlags2">0</int>
<string key="NSContents">Sacrifice interactive latency to maximize bandwidth</string> <string key="NSContents">Sacrifice interactive latency to maximize bandwidth</string>
<reference key="NSSupport" ref="696441443"/> <reference key="NSSupport" ref="696441443"/>
<reference key="NSControlView" ref="887086095"/> <reference key="NSControlView" ref="221951564"/>
<int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int> <int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="581816235"/> <reference key="NSNormalImage" ref="581816235"/>
@ -1050,6 +1050,7 @@
<string>status</string> <string>status</string>
<string>isValid</string> <string>isValid</string>
<string>useDns</string> <string>useDns</string>
<string>title</string>
</object> </object>
<string key="NSObjectClassName">SshuttleServer</string> <string key="NSObjectClassName">SshuttleServer</string>
<bool key="NSEditable">YES</bool> <bool key="NSEditable">YES</bool>
@ -1159,35 +1160,6 @@
</object> </object>
<int key="connectionID">480</int> <int key="connectionID">480</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: arrangedObjects.host</string>
<reference key="source" ref="807059746"/>
<reference key="destination" ref="59237012"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="807059746"/>
<reference key="NSDestination" ref="59237012"/>
<string key="NSLabel">value: arrangedObjects.host</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">arrangedObjects.host</string>
<object class="NSDictionary" key="NSOptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSConditionallySetsEditable</string>
<string>NSNullPlaceholder</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<boolean value="YES"/>
<string>Untitled</string>
</object>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">495</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection"> <object class="IBBindingConnection" key="connection">
<string key="label">selectedIndex: selection.autoNets</string> <string key="label">selectedIndex: selection.autoNets</string>
@ -1507,10 +1479,10 @@
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection"> <object class="IBBindingConnection" key="connection">
<string key="label">value: values.noLatencyControl</string> <string key="label">value: values.noLatencyControl</string>
<reference key="source" ref="887086095"/> <reference key="source" ref="221951564"/>
<reference key="destination" ref="582889489"/> <reference key="destination" ref="582889489"/>
<object class="NSNibBindingConnector" key="connector"> <object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="887086095"/> <reference key="NSSource" ref="221951564"/>
<reference key="NSDestination" ref="582889489"/> <reference key="NSDestination" ref="582889489"/>
<string key="NSLabel">value: values.noLatencyControl</string> <string key="NSLabel">value: values.noLatencyControl</string>
<string key="NSBinding">value</string> <string key="NSBinding">value</string>
@ -1528,17 +1500,17 @@
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">noLatencyControlField</string> <string key="label">noLatencyControlField</string>
<reference key="source" ref="307402018"/> <reference key="source" ref="307402018"/>
<reference key="destination" ref="887086095"/> <reference key="destination" ref="221951564"/>
</object> </object>
<int key="connectionID">571</int> <int key="connectionID">571</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection"> <object class="IBBindingConnection" key="connection">
<string key="label">value: selection.useDns</string> <string key="label">value: selection.useDns</string>
<reference key="source" ref="177719449"/> <reference key="source" ref="160987209"/>
<reference key="destination" ref="59237012"/> <reference key="destination" ref="59237012"/>
<object class="NSNibBindingConnector" key="connector"> <object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="177719449"/> <reference key="NSSource" ref="160987209"/>
<reference key="NSDestination" ref="59237012"/> <reference key="NSDestination" ref="59237012"/>
<string key="NSLabel">value: selection.useDns</string> <string key="NSLabel">value: selection.useDns</string>
<string key="NSBinding">value</string> <string key="NSBinding">value</string>
@ -1552,6 +1524,35 @@
</object> </object>
<int key="connectionID">572</int> <int key="connectionID">572</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: arrangedObjects.title</string>
<reference key="source" ref="807059746"/>
<reference key="destination" ref="59237012"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="807059746"/>
<reference key="NSDestination" ref="59237012"/>
<string key="NSLabel">value: arrangedObjects.title</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">arrangedObjects.title</string>
<object class="NSDictionary" key="NSOptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSConditionallySetsEditable</string>
<string>NSNullPlaceholder</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<boolean value="YES"/>
<string>Untitled</string>
</object>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">573</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
@ -1642,7 +1643,7 @@
<reference ref="625816566"/> <reference ref="625816566"/>
<reference ref="633518934"/> <reference ref="633518934"/>
<reference ref="625121428"/> <reference ref="625121428"/>
<reference ref="887086095"/> <reference ref="221951564"/>
</object> </object>
<reference key="parent" ref="740075218"/> <reference key="parent" ref="740075218"/>
</object> </object>
@ -1662,7 +1663,7 @@
<reference ref="962924480"/> <reference ref="962924480"/>
<reference ref="705215911"/> <reference ref="705215911"/>
<reference ref="610703353"/> <reference ref="610703353"/>
<reference ref="177719449"/> <reference ref="160987209"/>
</object> </object>
<reference key="parent" ref="762265164"/> <reference key="parent" ref="762265164"/>
</object> </object>
@ -2064,31 +2065,31 @@
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">561</int> <int key="objectID">561</int>
<reference key="object" ref="177719449"/> <reference key="object" ref="160987209"/>
<object class="NSMutableArray" key="children"> <object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="7643217"/> <reference ref="565787077"/>
</object> </object>
<reference key="parent" ref="60314308"/> <reference key="parent" ref="60314308"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">562</int> <int key="objectID">562</int>
<reference key="object" ref="7643217"/> <reference key="object" ref="565787077"/>
<reference key="parent" ref="177719449"/> <reference key="parent" ref="160987209"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">564</int> <int key="objectID">564</int>
<reference key="object" ref="887086095"/> <reference key="object" ref="221951564"/>
<object class="NSMutableArray" key="children"> <object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="148323250"/> <reference ref="13263275"/>
</object> </object>
<reference key="parent" ref="187214803"/> <reference key="parent" ref="187214803"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">565</int> <int key="objectID">565</int>
<reference key="object" ref="148323250"/> <reference key="object" ref="13263275"/>
<reference key="parent" ref="887086095"/> <reference key="parent" ref="221951564"/>
</object> </object>
</object> </object>
</object> </object>
@ -2370,7 +2371,7 @@
<string key="NS.key.0">ToolTip</string> <string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0"> <object class="IBToolTipAttribute" key="NS.object.0">
<string key="name">ToolTip</string> <string key="name">ToolTip</string>
<reference key="object" ref="177719449"/> <reference key="object" ref="160987209"/>
<string key="toolTip">Search for server names on the remote end and add them to your computer's /etc/hosts file.</string> <string key="toolTip">Search for server names on the remote end and add them to your computer's /etc/hosts file.</string>
</object> </object>
</object> </object>
@ -2380,7 +2381,7 @@
<string key="NS.key.0">ToolTip</string> <string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0"> <object class="IBToolTipAttribute" key="NS.object.0">
<string key="name">ToolTip</string> <string key="name">ToolTip</string>
<reference key="object" ref="887086095"/> <reference key="object" ref="221951564"/>
<string key="toolTip">Search for server names on the remote end and add them to your computer's /etc/hosts file.</string> <string key="toolTip">Search for server names on the remote end and add them to your computer's /etc/hosts file.</string>
</object> </object>
</object> </object>
@ -2404,7 +2405,7 @@
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">572</int> <int key="maxID">573</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">

11
ui-macos/main.py
View File

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

19
ui-macos/models.py
View File

@ -93,10 +93,27 @@ class SshuttleServer(NSObject):
return False return False
return True 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): def host(self):
return getattr(self, '_k_host', None) return getattr(self, '_k_host', None)
def setHost_(self, v): def setHost_(self, v):
self._k_host = v self._k_host = v
self.setTitle_(None)
config_changed() config_changed()
@objc.accessor @objc.accessor
def validateHost_error_(self, value, error): def validateHost_error_(self, value, error):
@ -109,6 +126,7 @@ class SshuttleServer(NSObject):
return getattr(self, '_k_nets', []) return getattr(self, '_k_nets', [])
def setNets_(self, v): def setNets_(self, v):
self._k_nets = v self._k_nets = v
self.setTitle_(None)
config_changed() config_changed()
def netsHidden(self): def netsHidden(self):
#print 'checking netsHidden' #print 'checking netsHidden'
@ -123,6 +141,7 @@ class SshuttleServer(NSObject):
self._k_autoNets = v self._k_autoNets = v
self.setNetsHidden_(-1) self.setNetsHidden_(-1)
self.setUseDns_(v == NET_ALL) self.setUseDns_(v == NET_ALL)
self.setTitle_(None)
config_changed() config_changed()
def autoHosts(self): def autoHosts(self):