Skip to content

Commit 2b05ada

Browse files
samizdatcosamizdatco
committed
make sure to initialize the userdefault for the port number
1 parent aeaadab commit 2b05ada

4 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎Resources/English.lproj/NodeBoxPreferences.xib‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
33
<dependencies>
44
<deployment version="1060" defaultVersion="1070" identifier="macosx"/>
55
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
@@ -263,7 +263,7 @@
263263
</connections>
264264
</button>
265265
<button verticalHuggingPriority="750" id="U4T-Iz-3Du">
266-
<rect key="frame" x="105" y="16" width="67" height="17"/>
266+
<rect key="frame" x="105" y="15" width="67" height="17"/>
267267
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
268268
<buttonCell key="cell" type="inline" title="Install" bezelStyle="inline" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="97t-ZD-fnC">
269269
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

‎nodebox/console.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
[--args [a [b ...]]]
1111
file
1212
13-
Run python scripts in NodeBox.app
14-
1513
Options:
1614
-h, --help show this help message and exit
1715
-f run full-screen
@@ -53,7 +51,7 @@
5351

5452

5553
def connect(retry=12, delay=0):
56-
port = NSUserDefaults.standardUserDefaults().persistentDomainForName_('net.nodebox.NodeBox').objectForKey_('nodebox:remote-port') or "9000"
54+
port = NSUserDefaults.standardUserDefaults().persistentDomainForName_('net.nodebox.NodeBox').objectForKey_('nodebox:remote-port') or 9001
5755
if delay:
5856
sleep(delay)
5957
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -121,7 +119,7 @@ def exec_console(opts):
121119
# print "\rCancelled."
122120
pass
123121

124-
def exec_application(opts):
122+
def exec_application(opts):
125123
sock = connect(0)
126124
if not sock:
127125
os.system('open -a "%s" "%s"'%(app_name(), opts.file))
@@ -157,9 +155,9 @@ def main():
157155
o.add_argument('--args', nargs='*', default=[], metavar=('a','b'), help='remainder of command line will be passed to the script as sys.argv')
158156
i = parser.add_argument_group("NodeBox Script File", None)
159157
i.add_argument('file', help='the python script to be rendered')
160-
158+
161159
opts = parser.parse_args()
162-
160+
163161
if opts.virtualenv:
164162
libdir = '%s/lib/python2.7/site-packages'%opts.virtualenv
165163
if os.path.exists(libdir):

‎nodebox/gui/preferences.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -191,15 +191,17 @@ def checkTool(self):
191191
self.toolFound = broken[0] if broken else None
192192
self.toolValid = False
193193

194-
self.toolInstall.setHidden_(self.toolFound is not None)
195-
self.toolPath.setSelectable_(self.toolFound is not None)
196-
# self.toolPath.setStringValue_(self.toolFound.replace(os.environ['HOME'],'~') if self.toolFound else '')
197-
self.toolPath.setStringValue_(self.toolFound if self.toolFound else '')
198-
self.toolPath.setTextColor_(ERR_COL if not self.toolValid else NSColor.blackColor())
199-
self.toolRepair.setHidden_(not (self.toolFound and not self.toolValid) )
200-
self.toolPort.setHidden_(not self.toolValid)
201-
self.toolPortLabel.setHidden_(not self.toolValid)
202-
self.toolPortStepper.setHidden_(not self.toolValid)
194+
found, valid = self.toolFound, self.toolValid
195+
self.toolInstall.setHidden_(found is not None)
196+
self.toolPath.setSelectable_(found is not None)
197+
# self.toolPath.setStringValue_(found.replace(os.environ['HOME'],'~') if found else '')
198+
self.toolPath.setStringValue_(found if found else '')
199+
self.toolPath.setTextColor_(ERR_COL if not valid else NSColor.blackColor())
200+
self.toolRepair.setHidden_(not (found and not valid) )
201+
self.toolPort.setHidden_(not valid)
202+
self.toolPortLabel.setHidden_(not valid)
203+
self.toolPortStepper.setHidden_(not valid)
204+
if valid: set_default('remote-port', get_default('remote-port'))
203205

204206
@objc.IBAction
205207
def modifyPort_(self, sender):

‎nodebox/run/remote.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
class CommandListener(Thread):
1313
active = False
14-
def __init__(self, port=9000):
14+
def __init__(self, port=9001):
1515
super(CommandListener, self).__init__()
1616
try:
1717
self.server = self.SocketListener(('localhost', port), self.CommandHandler)

0 commit comments

Comments
 (0)