Skip to content

Commit

Permalink
Snippet & Commands not appearing bug corrected
Browse files Browse the repository at this point in the history
  • Loading branch information
Jean-Francois Moy committed Mar 22, 2010
1 parent baa0527 commit c47a34e
Show file tree
Hide file tree
Showing 140 changed files with 16,692 additions and 22,615 deletions.
4 changes: 2 additions & 2 deletions Classes/FRAOpenSavePerformer.m
View file
Expand Up @@ -59,9 +59,9 @@ - (void)openAllTheseFiles:(NSArray *)arrayOfFiles
NSString *filename; NSString *filename;
NSMutableArray *projectsArray = [NSMutableArray array]; NSMutableArray *projectsArray = [NSMutableArray array];
for (filename in arrayOfFiles) { for (filename in arrayOfFiles) {
if ([[filename pathExtension] isEqualToString:@"smlc"] || [[filename pathExtension] isEqualToString:@"fraiseSnippets"]) { // If the file are code snippets do an import if ([[filename pathExtension] isEqualToString:@"smlc"] || [[filename pathExtension] isEqualToString:@"frac"] || [[filename pathExtension] isEqualToString:@"fraiseSnippets"]) { // If the file are code snippets do an import
[[FRASnippetsController sharedInstance] performSnippetsImportWithPath:filename]; [[FRASnippetsController sharedInstance] performSnippetsImportWithPath:filename];
} else if ([[filename pathExtension] isEqualToString:@"smlp"] || [[filename pathExtension] isEqualToString:@"fraiseProject"]) { // If the file is a project open all its files } else if ([[filename pathExtension] isEqualToString:@"smlp"] || [[filename pathExtension] isEqualToString:@"frap"] || [[filename pathExtension] isEqualToString:@"fraiseProject"]) { // If the file is a project open all its files
[projectsArray addObject:filename]; [projectsArray addObject:filename];
} else { } else {
[self shouldOpen:[FRABasic resolveAliasInPath:filename] withEncoding:0]; [self shouldOpen:[FRABasic resolveAliasInPath:filename] withEncoding:0];
Expand Down
2 changes: 1 addition & 1 deletion Classes/FRASnippetsController.m
View file
Expand Up @@ -191,7 +191,7 @@ - (void)importSnippets
[openPanel setResolvesAliases:YES]; [openPanel setResolvesAliases:YES];
[openPanel beginSheetForDirectory:[FRAInterface whichDirectoryForOpen] [openPanel beginSheetForDirectory:[FRAInterface whichDirectoryForOpen]
file:nil file:nil
types:[NSArray arrayWithObjects:@"smlc", @"fraiseSnippets", nil] types:[NSArray arrayWithObjects:@"frac", @"smlc", @"fraiseSnippets", nil]
modalForWindow:snippetsWindow modalForWindow:snippetsWindow
modalDelegate:self modalDelegate:self
didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:)
Expand Down
72 changes: 29 additions & 43 deletions English.lproj/FRAAdvancedFind.xib
View file
Expand Up @@ -41,7 +41,7 @@
<object class="NSWindowTemplate" id="1061535680"> <object class="NSWindowTemplate" id="1061535680">
<int key="NSWindowStyleMask">15</int> <int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int> <int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{377, 146}, {567, 557}}</string> <string key="NSWindowRect">{{81, 63}, {567, 557}}</string>
<int key="NSWTFlags">1886912512</int> <int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">Advanced Find - Fraise</string> <string key="NSWindowTitle">Advanced Find - Fraise</string>
<string key="NSWindowClass">FRAAdvancedFindPanel</string> <string key="NSWindowClass">FRAAdvancedFindPanel</string>
Expand Down Expand Up @@ -1625,9 +1625,9 @@
<integer value="1"/> <integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/> <integer value="1"/>
<string>{{429, 109}, {567, 557}}</string> <string>{{397, 117}, {567, 557}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{429, 109}, {567, 557}}</string> <string>{{397, 117}, {567, 557}}</string>
<integer value="1"/> <integer value="1"/>
<boolean value="NO"/> <boolean value="NO"/>
<integer value="1"/> <integer value="1"/>
Expand Down Expand Up @@ -1662,6 +1662,32 @@
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">:</string>
<string key="NS.object.0">id</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">PSMTabBar/PSMTabBarControl.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">FRAAdvancedFindController</string> <string key="className">FRAAdvancedFindController</string>
<string key="superclassName">NSObject</string> <string key="superclassName">NSObject</string>
Expand Down Expand Up @@ -1794,32 +1820,6 @@
<string key="minorKey"/> <string key="minorKey"/>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">:</string>
<string key="NS.object.0">id</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">PSMTabBar/PSMTabBarControl.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
</object> </object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
Expand Down Expand Up @@ -2226,20 +2226,6 @@
<string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string> <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Sparkle.framework/Headers/SUUpdater.h</string>
</object>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">NSObject</string> <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
Expand Down

0 comments on commit c47a34e

Please sign in to comment.