From d7cccdd591346967d3c0c286b2e7e534435abc12 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 20 Jun 2003 22:21:03 +0000
Subject: [PATCH] Added a field that allows the user to set sys.argv-style
 arguments to the script. Fixes #757544.

---
 .../English.lproj/MyDocument.nib/classes.nib  |   1 +
 .../English.lproj/MyDocument.nib/info.nib     |   6 +++---
 .../English.lproj/MyDocument.nib/objects.nib  | Bin 4441 -> 4845 bytes
 Mac/OSX/PythonLauncher/FileSettings.h         |   2 ++
 Mac/OSX/PythonLauncher/FileSettings.m         |  10 +++++++++-
 Mac/OSX/PythonLauncher/MyDocument.h           |   1 +
 Mac/OSX/PythonLauncher/MyDocument.m           |   2 ++
 .../PreferencesWindowController.m             |   2 ++
 .../PythonLauncher.pbproj/project.pbxproj     |   2 +-
 9 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Mac/OSX/PythonLauncher/English.lproj/MyDocument.nib/classes.nib b/Mac/OSX/PythonLauncher/English.lproj/MyDocument.nib/classes.nib
index 7778ff045557..bcdc0cdf0888 100644
--- a/Mac/OSX/PythonLauncher/English.lproj/MyDocument.nib/classes.nib
+++ b/Mac/OSX/PythonLauncher/English.lproj/MyDocument.nib/classes.nib
@@ -14,6 +14,7 @@
                 nosite = NSButton; 
                 optimize = NSButton; 
                 others = NSTextField; 
+                scriptargs = NSTextField; 
                 tabs = NSButton; 
                 verbose = NSButton; 
                 "with_terminal" = NSButton; 
diff --git a/Mac/OSX/PythonLauncher/English.lproj/MyDocument.nib/info.nib b/Mac/OSX/PythonLauncher/English.lproj/MyDocument.nib/info.nib
index 0630cb935806..e258c7220a47 100644
--- a/Mac/OSX/PythonLauncher/English.lproj/MyDocument.nib/info.nib
+++ b/Mac/OSX/PythonLauncher/English.lproj/MyDocument.nib/info.nib
@@ -3,14 +3,14 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>551 90 356 240 0 0 1280 1002 </string>
+	<string>398 60 356 240 0 0 1024 746 </string>
 	<key>IBFramework Version</key>
-	<string>286.0</string>
+	<string>291.0</string>
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>6I32</string>
+	<string>6L60</string>
 </dict>
 </plist>
diff --git a/Mac/OSX/PythonLauncher/English.lproj/MyDocument.nib/objects.nib b/Mac/OSX/PythonLauncher/English.lproj/MyDocument.nib/objects.nib
index 97eb230a29c272ca83ab4fef213f30eb83a562dd..af6decbcda5e9b6ccee2f4e4135ea12818372823 100644
GIT binary patch
delta 1742
zc-n1LZA@EL7`~^{Lirpz=9r8*!0|C0-$R(&_?iqEAoL1mF~dTyP*>Wny};(5rb~PM
zwdi`%6B^C!ZWeSukQ7M>M#Ud5Cj1Z+#2=E7kjlTBnkFO|LSj6p9}6(r<lg5z?{nVw
zdEax|je_tSUszG@<9iQK#^b;9(UbX9)P#^c->Ldtg{(MV{W+5GtXe<laeeJke4O7+
zKiT*CvpKFm+oO2g?E92Moa@;)50lV;+(WL3<DR*urc#@2BjaO&S+qAwGj8{{9FuO&
za<lW2$NimKI+)O8!JVq2zQyOdty%Q_j|ttAsLu7&hdi#YJi+)LmCA`m5XZ5nCm1s#
zNi=ZM;6!)TEO1wiJ2d$NzfQf>V!6*uNZV-~7ndQe6JaM>VM6wfWuU=CEjgOZ$$d!^
zIk~8gy%S9@;@cWK3Sl|<Jnl`tg~IqZ%{knzZ9<VK`Z@U~+KHm#ly0<(C+Kqz|B}*&
z_VH<L1rBT4@MqebS7bj~R>*dctSclelU0Q%*sm>3<()_!bB6!WRy&e7rz$jq=I)q0
z?itk_$4O*OA^S4fP{^K478EkAkf1`A6cUn&Um;rx;k;y1Au9@r$YfV0JF@Q#@v)=n
z*0qd_qQzWWB@vktnr>acQJ9p-GF@mBQ5xJ%1o5@B;>K0FO7GV3!hP`_qhK;nfwD-}
zj<7Wn**_}8k<^opJ<6sXU?s9~)Xemejnxtf#w^eir12%XNJ(svNchlxD)v)C9TiJt
z>qss~twcDMY`|zXSZK4Gbdhne7%i}JZ~!!6<WL3L+U_BuP9mX$J7|fWLxNg*e_bwW
zqiY=hkd}u^@t<jxJ)D>IVGvBhh+Y&VswoV3quwTC-eL@!Y}&A8Y)o%9n2hFxkX1~c
z5NtyhdyK*Z=~bmgffbfjYp@L31iK(MvQR}}iIK^S95=@(JeQv1plR4mP#c7y@sW65
zHqB(C*=`kv#W=;9(U>iE<8zm6ASo8BXdE+sn&8;MYAoWYV6(>=Hl-v{Ka^Onvr$hP
z#nC}gu#Fkb4!tQBS$JU*6#-wO553iDdJyj;bQ~Ezj*J{f?i?obW9;sW(!#)=w+;W5
zp-a*Q)_L5Jd4U2SkB6fm#N$Vq<rIW@{8Q#-3L-rIH?xw09UfoIs-s|+$A+wW3f6e+
z&nlx}g~zK|XDL|X@jqFoC|Krk%85J*_IO-!qR>$hSU=A7#&Q0<>{pXHYB5{JZKHbo
z=#bu=I6-#hQ|-exqgB+~M&iTYIx=GVx9V$kshW)YZ-S{4Hg3U!;}q0gg1vH>&_Pup
zOy@w!Ign4oP8nFcA;^QR2g=XGje6*8gyq+uARD|0u2#eK8rZ!Ep<M943Lmw>>RH%)
z4<e<|e;o|%(0Uox@}c)CeDW@Qd=u7dfm4In2V1>RQv~gALEkm#Xn;Gd&Cv5Ul)Vnk
zb>J(8O9jwS3E>j>pb4&2!O|J1uYe0L!%7}}*aEkkq3a3^-2ihJY`+hq9iV7@{kSPR
F_kYbn1UUcz

delta 1438
zc-n1|OH3PA6o!3C{3c);3^WbYh9s1Pls7b_B<3|G2{92wO`E1^{g_ZIX2$WOB$X=5
zsy*8@zVcPP8EaIrOOc~UsOrLsbiD9}1!7To=gN{Lw{9&qY`W<kY$FJ07WY5jIp@xQ
z&i&_nw)1BXGQN274C!9{-GP?h=#T{=7IUg|Z}__PIy8nml+V#^ysos}5+acZ(uNQY
zq2~%k<%~uupAc6h!oS2(RFtcl?IH9yq{zrs@)?yXRblm`M;432;lN+2eJF>YXq)kZ
zMvtd-Gbq0w{i~iw1sa{kIdud6T{DM@`?*f76_sdYMP>X}yNGu1X<Z+_ud!f3XFRbc
z5xlPJsSlxhA@p^{A^uZ07*r}kC;obcUO#k4Bd_XSD-=SEWF#Uch_p+#B$Aa#N+R15
z*%3)mBx#8hL{b(>P9%AeY)Yggl7vJyq<9O7hhM(bS(l~)em~C*4+$hgfwl$)1+qos
zdh60%_Nkw7v2N#(5G18TO(OzHQJ|>-f$Y4~Ga!)Sp_XBRNWYQIqh)1^^aqeYHjWVU
z+B<#J<t|04doIq&uL>lKAL!dL(Ra<K4-P}G&mD}ZiToi~v>-u&k^=szKnjPFgZRJt
z3#c1+p6XxNjmh&mSvR|E^Rt2w4I7iOJqxQ93l$=-PVeAXR&1Qp?c!>MvI+I~tk=%_
zDhNxb27)cgjC`xs$$#TzeXM_6PMMP_8LDL%;HoGsBOOH!8|Pr%<JD{BS(HxJ9$2md
z*}vMw`8=${Uq$jOs5su|+IKC#zlQhtdtEE8A8Js31r_iAj`jMgM1Jv;ew)1#;~yK^
zg2v>=ku{i;`PvXRkH`J2>Ns~CEF1^p$HC%pu&s2I8k6PNDDG`sIysx%X7Epq7pTZH
z_}4v=WAGo1y;Kw!tTv2N5ohqEp`VH(g9C;UDoPAqH;hrS#o(ghA{7}1w>Gt3n@y$|
z`oD(70B53$G5H)`muGLSv&poaX`bP^ZokQUOuo!uZ&O#hIk{a~Sk-c6j%>`fx6-#w
ztwA9giBE*<EUsN8tQjG57PdOz;Vp>wKvx$m&Omk^X0E}5n^5=&?%#l`SHL<2bJrpF
zKHQy!?P0hx4Lg_N{5jZc2gd?PD!4oViB`Ds2^25F$S6#H3Z+ZX+ypl*kp2KnozOQ3
z<z5im;QCirVQ2)}-h<CSgXsy_Xo2pJp{EZn^+W0m<h#Lcg)ipdtO+K@;mn6HFa%>`
m5JNCO3E$p^4s-lYToI)s8g5KY^A6s|cx@}}D(`(P2>%20x^Jrh

diff --git a/Mac/OSX/PythonLauncher/FileSettings.h b/Mac/OSX/PythonLauncher/FileSettings.h
index f70b05f51831..d807bae59cc3 100755
--- a/Mac/OSX/PythonLauncher/FileSettings.h
+++ b/Mac/OSX/PythonLauncher/FileSettings.h
@@ -19,6 +19,7 @@
 - (BOOL) tabs;
 - (NSString *) others;
 - (BOOL) with_terminal;
+- (NSString *) scriptargs;
 @end
 
 @interface FileSettings : NSObject <FileSettingsSource>
@@ -33,6 +34,7 @@
     BOOL nosite;		// -S option: don't import site.py
     BOOL tabs;			// -t option: warn about inconsistent tabs
     NSString *others;		// other options
+    NSString *scriptargs;	// script arguments (not for preferences)
     BOOL with_terminal;		// Run in terminal window
 
     FileSettings *origsource;
diff --git a/Mac/OSX/PythonLauncher/FileSettings.m b/Mac/OSX/PythonLauncher/FileSettings.m
index 7b28daae0177..fc3937b3dcbd 100755
--- a/Mac/OSX/PythonLauncher/FileSettings.m
+++ b/Mac/OSX/PythonLauncher/FileSettings.m
@@ -77,6 +77,7 @@
     nosite = source->nosite;
     tabs = source->tabs;
     others = [source->others retain];
+    scriptargs = [source->scriptargs retain];
     with_terminal = source->with_terminal;
     prefskey = source->prefskey;
     if (prefskey) [prefskey retain];
@@ -164,6 +165,7 @@
     self = [self initWithFileSettings: fsdefaults];
     if (!self) return self;
     interpreters = [fsdefaults->interpreters retain];
+    scriptargs = [@"" retain];
     [self applyUserDefaults: filetype];
     prefskey = [filetype retain];
     return self;
@@ -191,6 +193,7 @@
     nosite = [source nosite];
     tabs = [source tabs];
     others = [[source others] retain];
+    scriptargs = [[source scriptargs] retain];
     with_terminal = [source with_terminal];
     // And if this is a user defaults object we also save the
     // values
@@ -206,6 +209,7 @@
             [NSNumber numberWithBool: nosite], @"nosite",
             [NSNumber numberWithBool: nosite], @"nosite",
             others, @"others",
+            scriptargs, @"scriptargs",
             [NSNumber numberWithBool: with_terminal], @"with_terminal",
             nil];
         defaults = [NSUserDefaults standardUserDefaults];
@@ -235,6 +239,8 @@
     if (value) tabs = [value boolValue];
     value = [dict objectForKey: @"others"];
     if (value) others = [value retain];
+    value = [dict objectForKey: @"scriptargs"];
+    if (value) scriptargs = [value retain];
     value = [dict objectForKey: @"with_terminal"];
     if (value) with_terminal = [value boolValue];
 }
@@ -260,7 +266,7 @@
         cur_interp = interpreter;
         
     return [NSString stringWithFormat:
-        @"\"%@\"%s%s%s%s%s%s %@ \"%@\" %s",
+        @"\"%@\"%s%s%s%s%s%s %@ \"%@\" %@ %s",
         cur_interp,
         debug?" -d":"",
         verbose?" -v":"",
@@ -270,6 +276,7 @@
         tabs?" -t":"",
         others,
         script,
+        scriptargs,
         with_terminal? "&& echo Exit status: $? && exit 1" : " &"];
 }
 
@@ -285,6 +292,7 @@
 - (BOOL) nosite { return nosite;};
 - (BOOL) tabs { return tabs;};
 - (NSString *) others { return others;};
+- (NSString *) scriptargs { return scriptargs;};
 - (BOOL) with_terminal { return with_terminal;};
 
 @end
diff --git a/Mac/OSX/PythonLauncher/MyDocument.h b/Mac/OSX/PythonLauncher/MyDocument.h
index dd2b4fe9bde2..00c1bae54e24 100755
--- a/Mac/OSX/PythonLauncher/MyDocument.h
+++ b/Mac/OSX/PythonLauncher/MyDocument.h
@@ -23,6 +23,7 @@
     IBOutlet NSButton *tabs;
     IBOutlet NSTextField *others;
     IBOutlet NSButton *with_terminal;
+    IBOutlet NSTextField *scriptargs;
     IBOutlet NSTextField *commandline;
 
     NSString *script;
diff --git a/Mac/OSX/PythonLauncher/MyDocument.m b/Mac/OSX/PythonLauncher/MyDocument.m
index 09a0024d5e77..5acc2dcc90c1 100755
--- a/Mac/OSX/PythonLauncher/MyDocument.m
+++ b/Mac/OSX/PythonLauncher/MyDocument.m
@@ -60,6 +60,7 @@
     [nosite setState: [settings nosite]];
     [tabs setState: [settings tabs]];
     [others setStringValue: [settings others]];
+    [scriptargs setStringValue: [settings scriptargs]];
     [with_terminal setState: [settings with_terminal]];
     
     [commandline setStringValue: [settings commandLineForScript: script]];
@@ -161,6 +162,7 @@
 - (BOOL) nosite { return [nosite state];};
 - (BOOL) tabs { return [tabs state];};
 - (NSString *) others { return [others stringValue];};
+- (NSString *) scriptargs { return [scriptargs stringValue];};
 - (BOOL) with_terminal { return [with_terminal state];};
 
 // Delegates
diff --git a/Mac/OSX/PythonLauncher/PreferencesWindowController.m b/Mac/OSX/PythonLauncher/PreferencesWindowController.m
index fd65194afce0..5dd08f36927c 100644
--- a/Mac/OSX/PythonLauncher/PreferencesWindowController.m
+++ b/Mac/OSX/PythonLauncher/PreferencesWindowController.m
@@ -39,6 +39,7 @@
     [tabs setState: [settings tabs]];
     [others setStringValue: [settings others]];
     [with_terminal setState: [settings with_terminal]];
+    // Not scriptargs, it isn't for preferences
     
     [commandline setStringValue: [settings commandLineForScript: @"<your script here>"]];
 }
@@ -84,6 +85,7 @@
 - (BOOL) tabs { return [tabs state];};
 - (NSString *) others { return [others stringValue];};
 - (BOOL) with_terminal { return [with_terminal state];};
+- (NSString *) scriptargs { return @"";};
 
 // Delegates
 - (void)controlTextDidChange:(NSNotification *)aNotification
diff --git a/Mac/OSX/PythonLauncher/PythonLauncher.pbproj/project.pbxproj b/Mac/OSX/PythonLauncher/PythonLauncher.pbproj/project.pbxproj
index 107ce3dd4f27..badee8785b5b 100755
--- a/Mac/OSX/PythonLauncher/PythonLauncher.pbproj/project.pbxproj
+++ b/Mac/OSX/PythonLauncher/PythonLauncher.pbproj/project.pbxproj
@@ -132,6 +132,7 @@
 				4A9504D0FFE6A4CB11CA0CBA,
 				4A9504D1FFE6A4CB11CA0CBA,
 			);
+			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			mainGroup = 2A37F4AAFDCFA73011CA2CEA;
 			projectDirPath = "";
@@ -385,7 +386,6 @@
 </dict>
 </plist>
 ";
-			shouldUseHeadermap = 0;
 		};
 		2A37F4C7FDCFA73011CA2CEA = {
 			buildActionMask = 2147483647;
-- 
2.47.3