Skip to content

Commit

Permalink
Added improvements from 0xced and made minor modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmougin
pmougin committed Oct 6, 2009
1 parent 8a3ea5d commit 39ae834
Show file tree
Hide file tree
Showing 14 changed files with 18,294 additions and 389 deletions.
2,463 changes: 2,127 additions & 336 deletions F-Script/DemoAssistant.xib
View file

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions F-Script/FSDemoAssistant.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
NSTextView *hueAdjust;
NSTextView *bump;
NSTextView *bumpAnimate;

NSTextView *horloge;

NSTextView *connectToITunes;
NSTextView *volumeRamp;
}

@property (retain) IBOutlet NSTextView *loadImage;
Expand All @@ -25,6 +30,11 @@
@property (retain) IBOutlet NSTextView *bump;
@property (retain) IBOutlet NSTextView *bumpAnimate;

@property (retain) IBOutlet NSTextView *horloge;

@property (retain) IBOutlet NSTextView *connectToITunes;
@property (retain) IBOutlet NSTextView *volumeRamp;

- (void)activate;
- (id)initWithInterpreterView:(FSInterpreterView *)theInterpreterView;
- (IBAction)loadCode:sender;
Expand Down
7 changes: 5 additions & 2 deletions F-Script/FSDemoAssistant.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ @implementation FSDemoAssistant
@synthesize bump;
@synthesize bumpAnimate;

@synthesize horloge;

@synthesize connectToITunes;
@synthesize volumeRamp;

- (void)activate
{
if (![NSBundle loadNibNamed:@"DemoAssistant" owner:self])
Expand All @@ -41,8 +46,6 @@ - (id)initWithInterpreterView:(FSInterpreterView *)theInterpreterView
return self;
}



- (IBAction)loadCode:sender
{
[self putCommand:[[self performSelector:NSSelectorFromString([sender title])] string]];
Expand Down
70 changes: 56 additions & 14 deletions F-Script/FScriptAppController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,37 @@ + (void)initialize
[registrationDict setObject:@"YES" forKey:@"FScriptDisplayObjectBrowserAtLaunchTime"];
[registrationDict setObject:@"YES" forKey:@"FScriptRunWithObjCAutomaticGarbageCollection"];
[registrationDict setObject:@"YES" forKey:@"FScriptAutomaticallyIntrospectDeclaredProperties"];

[registrationDict setObject:@"NO" forKey:@"FScriptShowDemoAssistant"];

[registrationDict setObject:@"NO" forKey:@"FScriptLoadPrivateSystemFrameworks"];
[registrationDict setObject:@"NO" forKey:@"FScriptLoadSystemFrameworks"];

[[NSUserDefaults standardUserDefaults] registerDefaults:registrationDict];
}

- (void)loadSystemFrameworks // Contributed by Cedric Luthi
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

NSMutableArray *systemFrameworksPaths = [NSMutableArray arrayWithObject:@"/System/Library/Frameworks"];

if ([[NSUserDefaults standardUserDefaults] boolForKey:@"FScriptLoadPrivateSystemFrameworks"])
[systemFrameworksPaths addObject:@"/System/Library/PrivateFrameworks"];

for (NSString *systemFrameworksPath in systemFrameworksPaths)
{
for (NSString *framework in [[NSFileManager defaultManager] directoryContentsAtPath:systemFrameworksPath])
{
NSBundle *frameworkBundle = [NSBundle bundleWithPath:[systemFrameworksPath stringByAppendingPathComponent:framework]];
if ([frameworkBundle preflightAndReturnError:nil])
[frameworkBundle load];
}
}

[pool drain];
}

- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
NSFileManager *fileManager = [NSFileManager defaultManager];
Expand All @@ -171,6 +198,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
NSString *repositoryPath = [[NSUserDefaults standardUserDefaults] stringForKey:@"FScriptRepositoryPath"];
FSServicesProvider *servicesProvider;

[self loadSystemFrameworks];

if (!repositoryPath || ![fileManager fileExistsAtPath:repositoryPath isDirectory:&b])
{
NSString *applicationSupportDirectoryPath = findPathToFileInLibraryWithinUserDomain(@"Application Support");
Expand Down Expand Up @@ -258,31 +287,44 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
// Latent block processing
latentPath = [[[NSUserDefaults standardUserDefaults] stringForKey:@"FScriptRepositoryPath"] stringByAppendingPathComponent:@"fs_latent"];

if (latentPath && [[NSFileManager defaultManager] fileExistsAtPath:latentPath] && (latent = [NSString stringWithContentsOfFile:latentPath]))
if (latentPath && [[NSFileManager defaultManager] fileExistsAtPath:latentPath])
{
BOOL found;
FSInterpreter *interpreter = [interpreterView interpreter];
FSSystem *sys = [interpreter objectForIdentifier:@"sys" found:&found];
FSBlock *bl;

NSAssert(found,@"F-Script internal error: symbol \"sys\" not defined");

@try
NSStringEncoding usedEncoding;
NSError *error;
latent = [NSString stringWithContentsOfFile:latentPath usedEncoding:&usedEncoding error:&error];
if (!latent)
{
bl = [sys blockFromString:latent];
[bl value];
NSLog(@"Unable to read the latent block: %@", [error localizedDescription]);
}
@catch (id exception)
else
{
[interpreterView notifyUser:[NSString stringWithFormat:@"Error in the latent block (file %@): %@",latentPath, FSErrorMessageFromException(exception)]];
}
BOOL found;
FSInterpreter *interpreter = [interpreterView interpreter];
FSSystem *sys = [interpreter objectForIdentifier:@"sys" found:&found];
FSBlock *bl;

NSAssert(found,@"F-Script internal error: symbol \"sys\" not defined");

@try
{
bl = [sys blockFromString:latent];
[bl value];
}
@catch (id exception)
{
[interpreterView notifyUser:[NSString stringWithFormat:@"Error in the latent block (file %@): %@",latentPath, FSErrorMessageFromException(exception)]];
}
}
}
//----------

[[interpreterView window] makeKeyAndOrderFront:nil];

if ([[NSUserDefaults standardUserDefaults] boolForKey:@"FScriptDisplayObjectBrowserAtLaunchTime"])
[[interpreterView interpreter] browse];

if ([[NSUserDefaults standardUserDefaults] boolForKey:@"FScriptShowDemoAssistant"])
[[[FSDemoAssistant alloc] initWithInterpreterView:interpreterView] activate];
}

- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
Expand Down
69 changes: 35 additions & 34 deletions FScript.xcodeproj/pmougin.perspectivev3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@
<array/>
<key>PerspectiveWidths</key>
<array>
<integer>1681</integer>
<integer>1681</integer>
<integer>1680</integer>
<integer>1680</integer>
</array>
<key>Perspectives</key>
<array>
Expand Down Expand Up @@ -351,13 +351,13 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>128</integer>
<integer>11</integer>
<integer>6</integer>
<integer>1</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 2223}, {298, 851}}</string>
<string>{{0, 0}, {298, 851}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
Expand Down Expand Up @@ -392,40 +392,41 @@
<key>PBXProjectModuleGUID</key>
<string>8FCC56F30CA52AC90041E302</string>
<key>PBXProjectModuleLabel</key>
<string>FSCompiler.m</string>
<string>FScriptAppController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>8FCC56F40CA52AC90041E302</string>
<key>PBXProjectModuleLabel</key>
<string>FSCompiler.m</string>
<string>FScriptAppController.m</string>
<key>_historyCapacity</key>
<integer>20</integer>
<key>bookmark</key>
<string>8F4DBDFC10611BB00023FC82</string>
<string>8F0A809D107B943C00486CE3</string>
<key>history</key>
<array>
<string>8FE55407105E8EAB006F6239</string>
<string>8FE55408105E8EAB006F6239</string>
<string>8FE55409105E8EAB006F6239</string>
<string>8FE5540A105E8EAB006F6239</string>
<string>8FE20636105F856500F943F2</string>
<string>8FE20638105F856500F943F2</string>
<string>8FE20639105F856500F943F2</string>
<string>8FE2063A105F856500F943F2</string>
<string>8FE2063B105F856500F943F2</string>
<string>8FE206AD105FBC9600F943F2</string>
<string>8FE206AE105FBC9600F943F2</string>
<string>8FE206AF105FBC9600F943F2</string>
<string>8FE206B0105FBC9600F943F2</string>
<string>8FE206B1105FBC9600F943F2</string>
<string>8FE206B2105FBC9600F943F2</string>
<string>8FE206B3105FBC9600F943F2</string>
<string>8FE249FF106005F6003F2189</string>
<string>8F4DBDFB10611BB00023FC82</string>
<string>8FE206B4105FBC9600F943F2</string>
<string>8FE3784B106126AB009C083D</string>
<string>8F15432A106430B400C9CE87</string>
<string>8F15432B106430B400C9CE87</string>
<string>8F154340106431DA00C9CE87</string>
<string>8F5FD97F1066D91A005B35A3</string>
<string>8F70DD221069615C00CE610C</string>
<string>8FE40C2F106DEBA200B2DC8C</string>
<string>8FE75715107B8EB900FB45B6</string>
<string>8FE75717107B8EB900FB45B6</string>
<string>8FE7571C107B925F00FB45B6</string>
<string>8F0A809C107B943C00486CE3</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -439,18 +440,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {1360, 559}}</string>
<string>{{0, 0}, {1360, 630}}</string>
<key>RubberWindowFrame</key>
<string>0 118 1680 910 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>559pt</string>
<string>630pt</string>
</dict>
<dict>
<key>Proportion</key>
<string>305pt</string>
<string>234pt</string>
<key>Tabs</key>
<array>
<dict>
Expand All @@ -464,7 +465,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {1360, 278}}</string>
<string>{{10, 27}, {1360, 207}}</string>
<key>RubberWindowFrame</key>
<string>0 118 1680 910 0 0 1680 1028 </string>
</dict>
Expand All @@ -482,7 +483,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {1360, 250}}</string>
<string>{{10, 27}, {1360, 317}}</string>
</dict>
<key>Module</key>
<string>PBXProjectFindModule</string>
Expand Down Expand Up @@ -520,7 +521,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {1360, 374}}</string>
<string>{{10, 27}, {1360, 408}}</string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
Expand Down Expand Up @@ -548,11 +549,11 @@
</array>
<key>TableOfContents</key>
<array>
<string>8F4DBDFD10611BB00023FC82</string>
<string>8F0A809E107B943C00486CE3</string>
<string>1CA23ED40692098700951B8B</string>
<string>8F4DBDFE10611BB00023FC82</string>
<string>8F0A809F107B943C00486CE3</string>
<string>8FCC56F30CA52AC90041E302</string>
<string>8F4DBDFF10611BB00023FC82</string>
<string>8F0A80A0107B943C00486CE3</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
Expand Down Expand Up @@ -699,14 +700,14 @@
</array>
<key>TableOfContents</key>
<array>
<string>8F4DBE0010611BB00023FC82</string>
<string>8FE7571F107B925F00FB45B6</string>
<string>1CCC7628064C1048000F2A68</string>
<string>1CCC7629064C1048000F2A68</string>
<string>8F4DBE0110611BB00023FC82</string>
<string>8F4DBE0210611BB00023FC82</string>
<string>8F4DBE0310611BB00023FC82</string>
<string>8F4DBE0410611BB00023FC82</string>
<string>8F4DBE0510611BB00023FC82</string>
<string>8FE75720107B925F00FB45B6</string>
<string>8FE75721107B925F00FB45B6</string>
<string>8FE75722107B925F00FB45B6</string>
<string>8FE75723107B925F00FB45B6</string>
<string>8FE75724107B925F00FB45B6</string>
</array>
<key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string>
Expand All @@ -723,7 +724,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
<real>274799536.99632901</real>
<real>276534332.654006</real>
<key>ToolbarDisplayMode</key>
<integer>1</integer>
<key>ToolbarIsVisible</key>
Expand Down
Loading

0 comments on commit 39ae834

Please sign in to comment.