mirror of
https://github.com/nickshanks/ResKnife.git
synced 2024-06-06 04:29:31 +00:00
silence some warnings and stuff
This commit is contained in:
parent
aaa420472c
commit
27ca01e0b7
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -15,4 +15,4 @@ xcuserdata/
|
|||
movedaside/*
|
||||
|
||||
-1
|
||||
|
||||
*.log
|
||||
|
|
|
@ -102,7 +102,7 @@
|
|||
- (void)removeIndiciesInRange:(NSRange)range
|
||||
{ [self removeIndexesInRange:range]; }
|
||||
- (void)shiftIndiciesStartingAtIndex:(unsigned int)index by:(int)delta
|
||||
{ [self shiftIndexesStartingAtIndex:index by:delta]; }
|
||||
{ [self shiftIndexesStartingAtIndex:index by:delta]; }
|
||||
@end
|
||||
|
||||
#pragma mark -
|
||||
|
@ -278,4 +278,4 @@
|
|||
return _contextAuxiliary;
|
||||
else return (CGLContextObj) [self CGLContextObj];
|
||||
}
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
while (row = [enumerator nextObject])
|
||||
[items addObject:[self itemAtRow:[row intValue]]];
|
||||
#endif
|
||||
|
||||
|
||||
return items;
|
||||
}
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -13,4 +13,4 @@
|
|||
- (BOOL)boolValue;
|
||||
+ (NSString *)stringWithBool:(BOOL)boolean;
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -97,4 +97,4 @@
|
|||
|
||||
- (NSArray *)forksForFile:(FSRef *)fileRef;
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -39,11 +39,11 @@
|
|||
// Part of my EvilPlanª to find out how many people use ResKnife and how often!
|
||||
int launchCount = [[NSUserDefaults standardUserDefaults] integerForKey:@"LaunchCount"];
|
||||
[[NSUserDefaults standardUserDefaults] setInteger:launchCount + 1 forKey:@"LaunchCount"];
|
||||
|
||||
|
||||
// initalise an empty icon cache and create timer used to pre-cache a number of common icons
|
||||
_icons = [[NSMutableDictionary alloc] init];
|
||||
[NSTimer scheduledTimerWithTimeInterval:5.0 target:self selector:@selector(precacheIcons:) userInfo:nil repeats:NO];
|
||||
|
||||
|
||||
// set default preferences
|
||||
[self initUserDefaults];
|
||||
}
|
||||
|
@ -78,12 +78,12 @@
|
|||
- (NSArray *)forksForFile:(FSRef *)fileRef
|
||||
{
|
||||
if(!fileRef) return nil;
|
||||
|
||||
|
||||
FSCatalogInfo catalogInfo;
|
||||
FSCatalogInfoBitmap whichInfo = kFSCatInfoNodeFlags;
|
||||
CatPositionRec forkIterator = { 0 };
|
||||
NSMutableArray *forks = [NSMutableArray array];
|
||||
|
||||
|
||||
// check we have a file, not a folder
|
||||
OSErr error = FSGetCatalogInfo(fileRef, whichInfo, &catalogInfo, NULL, NULL, NULL);
|
||||
if(!error && !(catalogInfo.nodeFlags & kFSNodeIsDirectoryMask))
|
||||
|
@ -94,7 +94,7 @@
|
|||
HFSUniStr255 forkName;
|
||||
SInt64 forkSize;
|
||||
UInt64 forkPhysicalSize; // used if opening selected fork fails to find empty forks
|
||||
|
||||
|
||||
error = FSIterateForks(fileRef, &forkIterator, &forkName, &forkSize, &forkPhysicalSize);
|
||||
if(!error)
|
||||
{
|
||||
|
@ -192,20 +192,20 @@
|
|||
// since its universally useful. It loads a defaults.plist file
|
||||
// from the app wrapper, and then sets the defaults if they don't
|
||||
// already exist.
|
||||
|
||||
|
||||
NSUserDefaults *defaults;
|
||||
NSDictionary *defaultsPlist;
|
||||
NSEnumerator *overDefaults;
|
||||
id eachDefault;
|
||||
|
||||
|
||||
// this isn't required, but saves us a few method calls
|
||||
defaults = [NSUserDefaults standardUserDefaults];
|
||||
|
||||
|
||||
// load the defaults.plist from the app wrapper. This makes it
|
||||
// easy to add new defaults just using a text editor instead of
|
||||
// hard-coding them into the application
|
||||
defaultsPlist = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"defaults" ofType:@"plist"]];
|
||||
|
||||
|
||||
// enumerate over all the keys in the dictionary
|
||||
overDefaults = [[defaultsPlist allKeys] objectEnumerator];
|
||||
while(eachDefault = [overDefaults nextObject])
|
||||
|
@ -218,7 +218,7 @@
|
|||
[defaults setObject:[defaultsPlist objectForKey:eachDefault] forKey:eachDefault];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// force the defaults to save to the disk
|
||||
[defaults synchronize];
|
||||
}
|
||||
|
@ -242,16 +242,16 @@
|
|||
NSImage *icon = nil;
|
||||
if([resourceType isEqualToString:@""])
|
||||
resourceType = nil;
|
||||
|
||||
|
||||
if(resourceType)
|
||||
{
|
||||
// check if we have image in cache already
|
||||
icon = [[self _icons] objectForKey:resourceType]; // valueForKey: raises when the resourceType begins with '@' (e.g. the @GN4 owner resource from Gene!)
|
||||
|
||||
|
||||
if(!icon)
|
||||
{
|
||||
NSString *iconPath = nil;
|
||||
|
||||
|
||||
// try to load icon from the default editor for that type
|
||||
Class editor = [[RKEditorRegistry defaultRegistry] editorForType:resourceType];
|
||||
if(editor)
|
||||
|
@ -259,7 +259,7 @@
|
|||
// ask politly for icon
|
||||
if([editor respondsToSelector:@selector(iconForResourceType:)])
|
||||
icon = [editor iconForResourceType:resourceType];
|
||||
|
||||
|
||||
// try getting it myself
|
||||
if(!icon)
|
||||
{
|
||||
|
@ -268,7 +268,7 @@
|
|||
icon = [[[NSImage alloc] initWithContentsOfFile:iconPath] autorelease];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// try to load icon from the ResKnife app bundle itself
|
||||
if(!icon)
|
||||
{
|
||||
|
@ -276,7 +276,7 @@
|
|||
if(iconPath)
|
||||
icon = [[[NSImage alloc] initWithContentsOfFile:iconPath] autorelease];
|
||||
}
|
||||
|
||||
|
||||
// try to retrieve from file system using our resource type to file name extension/bundle identifier code
|
||||
if(!icon)
|
||||
{
|
||||
|
@ -291,13 +291,13 @@
|
|||
icon = [[NSWorkspace sharedWorkspace] iconForFile:bundlePath];
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: convert to a UTI and try that
|
||||
|
||||
|
||||
// TODO: convert to a UTI and try that
|
||||
|
||||
// try to retrieve from file system as an OSType code
|
||||
if(!icon)
|
||||
icon = [[NSWorkspace sharedWorkspace] iconForFileType:[NSString stringWithFormat:@"'%@'", resourceType]];
|
||||
|
||||
|
||||
// save the newly retrieved icon in the cache
|
||||
if(icon)
|
||||
[[self _icons] setObject:icon forKey:resourceType];
|
||||
|
@ -310,7 +310,7 @@
|
|||
// if(!icon) icon = [[NSWorkspace sharedWorkspace] iconForFileType:@"' '"];
|
||||
if(!icon) icon = [[NSWorkspace sharedWorkspace] iconForFileType:[NSString stringWithFormat:@"'%@'", @"????"]];
|
||||
}
|
||||
|
||||
|
||||
// return the cached icon, or nil if none was found
|
||||
return icon;
|
||||
}
|
||||
|
@ -325,4 +325,4 @@
|
|||
return [NSDictionary dictionaryWithDictionary:[self _icons]];
|
||||
}
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
IBOutlet NSTextField *resIDView;
|
||||
IBOutlet NSTextField *typeView;
|
||||
IBOutlet NSPopUpButton *typePopup;
|
||||
|
||||
|
||||
ResourceDocument *document;
|
||||
}
|
||||
|
||||
|
@ -22,4 +22,4 @@
|
|||
- (IBAction)hideCreateResourceSheet:(id)sender;
|
||||
- (IBAction)typePopupSelection:(id)sender;
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -19,14 +19,14 @@ enum Attributes
|
|||
{
|
||||
IBOutlet NSImageView *iconView;
|
||||
IBOutlet NSTextField *nameView;
|
||||
|
||||
|
||||
IBOutlet NSBox *placeholderView;
|
||||
IBOutlet NSBox *resourceView;
|
||||
IBOutlet NSBox *documentView;
|
||||
|
||||
|
||||
IBOutlet NSMatrix *attributesMatrix;
|
||||
IBOutlet NSForm *filePropertyForm;
|
||||
|
||||
|
||||
@private
|
||||
ResourceDocument *currentDocument;
|
||||
Resource *selectedResource;
|
||||
|
@ -50,4 +50,4 @@ enum Attributes
|
|||
*/
|
||||
- (Resource *)resource;
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -17,17 +17,17 @@
|
|||
- (void)windowDidLoad
|
||||
{
|
||||
[super windowDidLoad];
|
||||
|
||||
|
||||
// set window to only accept key when editing text boxes
|
||||
[(NSPanel *)[self window] setBecomesKeyOnlyIfNeeded:YES];
|
||||
|
||||
|
||||
// retain views for swapping in and out
|
||||
[[documentView retain] removeFromSuperview];
|
||||
[[resourceView retain] removeFromSuperview];
|
||||
|
||||
|
||||
[self setMainWindow:[NSApp mainWindow]];
|
||||
[self updateInfoWindow];
|
||||
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mainWindowChanged:) name:NSWindowDidBecomeMainNotification object:nil];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(selectedResourceChanged:) name:NSOutlineViewSelectionDidChangeNotification object:nil];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resourceAttributesDidChange:) name:ResourceAttributesDidChangeNotification object:nil];
|
||||
|
@ -45,7 +45,7 @@
|
|||
{
|
||||
[nameView setEditable:(selectedResource != nil)];
|
||||
[nameView setDrawsBackground:(selectedResource != nil)];
|
||||
|
||||
|
||||
if(selectedResource)
|
||||
{
|
||||
// set UI values
|
||||
|
@ -58,7 +58,7 @@
|
|||
[[attributesMatrix cellAtRow:lockedBox column:0] setState:[[selectedResource attributes] shortValue] & resLocked];
|
||||
[[attributesMatrix cellAtRow:purgableBox column:0] setState:[[selectedResource attributes] shortValue] & resPurgeable];
|
||||
[[attributesMatrix cellAtRow:systemHeapBox column:0] setState:[[selectedResource attributes] shortValue] & resSysHeap];
|
||||
|
||||
|
||||
// swap box
|
||||
[placeholderView setContentView:resourceView];
|
||||
}
|
||||
|
@ -73,7 +73,7 @@
|
|||
if(!error) FSGetForkSizes(fileRef, &dataLogicalSize, &rsrcLogicalSize);
|
||||
}
|
||||
if(fileRef) DisposePtr((Ptr) fileRef);
|
||||
|
||||
|
||||
// set info window elements to correct values
|
||||
[[self window] setTitle:NSLocalizedString(@"Document Info",nil)];
|
||||
if([currentDocument fileName]) // document has been saved
|
||||
|
@ -86,7 +86,7 @@
|
|||
[iconView setImage:[NSImage imageNamed:@"Resource file"]];
|
||||
[nameView setStringValue:[currentDocument displayName]];
|
||||
}
|
||||
|
||||
|
||||
#warning FIXME: the creator and type codes need to be swapped on intel
|
||||
[[filePropertyForm cellAtIndex:0] setStringValue:[[[NSString alloc] initWithData:[currentDocument creator] encoding:NSMacOSRomanStringEncoding] autorelease]];
|
||||
[[filePropertyForm cellAtIndex:1] setStringValue:[[[NSString alloc] initWithData:[currentDocument type] encoding:NSMacOSRomanStringEncoding] autorelease]];
|
||||
|
@ -94,7 +94,7 @@
|
|||
// [[filePropertyForm cellAtIndex:3] setObjectValue:[NSNumber numberWithUnsignedLongLong:rsrcLogicalSize]];
|
||||
[[filePropertyForm cellAtIndex:2] setStringValue:[[NSNumber numberWithUnsignedLongLong:dataLogicalSize] description]];
|
||||
[[filePropertyForm cellAtIndex:3] setStringValue:[[NSNumber numberWithUnsignedLongLong:rsrcLogicalSize] description]];
|
||||
|
||||
|
||||
// swap box
|
||||
[placeholderView setContentView:documentView];
|
||||
}
|
||||
|
@ -109,11 +109,11 @@
|
|||
- (void)setMainWindow:(NSWindow *)mainWindow
|
||||
{
|
||||
NSWindowController *controller = [mainWindow windowController];
|
||||
|
||||
|
||||
if([[controller document] isKindOfClass:[ResourceDocument class]])
|
||||
currentDocument = [controller document];
|
||||
else currentDocument = nil;
|
||||
|
||||
|
||||
if(currentDocument)
|
||||
selectedResource = [[currentDocument outlineView] selectedItem];
|
||||
else selectedResource = [controller resource];
|
||||
|
@ -173,4 +173,4 @@
|
|||
return nil;
|
||||
}
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
IBOutlet NSButton *addForkButton;
|
||||
/*! @var removeForkButton Button for removing forks from a file. */
|
||||
IBOutlet NSButton *removeForkButton;
|
||||
|
||||
|
||||
/*! @var forks Array of forks representing the currently selected file. */
|
||||
NSMutableArray *forks;
|
||||
/*! @var readOpenPanelForFork Flag indicating whether ResKnife should ask for a fork to parse in a secondary dialog (false) or obtain it from the selected item in the open dialog (true). */
|
||||
|
@ -40,4 +40,4 @@
|
|||
- (void)setReadOpenPanelForFork:(BOOL)flag;
|
||||
- (BOOL)readOpenPanelForFork;
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -63,17 +63,17 @@
|
|||
HFSUniStr255 *resourceForkName = (HFSUniStr255 *) NewPtrClear(sizeof(HFSUniStr255));
|
||||
OSErr error = FSGetResourceForkName(resourceForkName);
|
||||
forkName = [(NSDictionary *)[forks objectAtIndex:row] objectForKey:[tableColumn identifier]];
|
||||
|
||||
|
||||
// return custom names for data and resource forks
|
||||
if([forkName isEqualToString:@""])
|
||||
forkName = NSLocalizedString(@"Data Fork", nil);
|
||||
else if(!error && [forkName isEqualToString:[NSString stringWithCharacters:resourceForkName->unicode length:resourceForkName->length]])
|
||||
forkName = NSLocalizedString(@"Resource Fork", nil);
|
||||
|
||||
|
||||
DisposePtr((Ptr) resourceForkName);
|
||||
return forkName;
|
||||
}
|
||||
|
||||
|
||||
// return default value otherwise
|
||||
return [(NSDictionary *)[forks objectAtIndex:row] objectForKey:[tableColumn identifier]];
|
||||
}
|
||||
|
@ -95,7 +95,7 @@
|
|||
[forks addObject:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"UNTITLED_FORK", nil), @"forkname", [NSNumber numberWithInt:0], @"forksize", [NSNumber numberWithInt:0], @"forkallocation", nil]];
|
||||
[forkTableView noteNumberOfRowsChanged];
|
||||
[forkTableView reloadData];
|
||||
|
||||
|
||||
// start editing placeholder
|
||||
[forkTableView selectRow:[forks count]-1 byExtendingSelection:NO];
|
||||
[forkTableView editColumn:0 row:[forks count]-1 withEvent:nil select:YES];
|
||||
|
@ -105,7 +105,7 @@
|
|||
{
|
||||
// display warning
|
||||
// delete fork
|
||||
|
||||
|
||||
// update table view
|
||||
[forks removeObjectAtIndex:[forkTableView selectedRow]+1];
|
||||
[forkTableView noteNumberOfRowsChanged];
|
||||
|
@ -128,4 +128,4 @@
|
|||
return forkTableView;
|
||||
}
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -18,4 +18,4 @@ int compareResourcesDescending(Resource *r1, Resource *r2, void *context);
|
|||
@end
|
||||
|
||||
@interface RKOutlineView : NSOutlineView
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -41,14 +41,14 @@
|
|||
{
|
||||
NSArray *newResources;
|
||||
NSArray *oldResources = [(ResourceDataSource *)[tableView dataSource] resources];
|
||||
|
||||
|
||||
// sort the array
|
||||
NSImage *indicator = [tableView indicatorImageInTableColumn:tableColumn];
|
||||
NSImage *upArrow = [NSTableView _defaultTableHeaderSortImage];
|
||||
if(indicator == upArrow)
|
||||
newResources = [oldResources sortedArrayUsingFunction:compareResourcesAscending context:[tableColumn identifier]];
|
||||
else newResources = [oldResources sortedArrayUsingFunction:compareResourcesDescending context:[tableColumn identifier]];
|
||||
|
||||
|
||||
// swap new array for old one
|
||||
[(ResourceDataSource *)[tableView dataSource] setResources:[NSMutableArray arrayWithArray:newResources]];
|
||||
[tableView reloadData];
|
||||
|
@ -103,18 +103,18 @@ int compareResourcesDescending(Resource *r1, Resource *r2, void *context)
|
|||
{
|
||||
Resource *resource = (Resource *)item;
|
||||
NSString *identifier = [tableColumn identifier];
|
||||
|
||||
|
||||
// set formatters for cells (remove when IB can set a formatter for an entire table column)
|
||||
if([identifier isEqualToString:@"size"]) [cell setFormatter:sizeFormatter];
|
||||
else if([identifier isEqualToString:@"attributes"]) [cell setFormatter:attributesFormatter];
|
||||
|
||||
|
||||
// set resource icon
|
||||
if([identifier isEqualToString:@"name"])
|
||||
{
|
||||
if(![resource representedFork])
|
||||
[(ResourceNameCell *)cell setImage:[(ApplicationDelegate *)[NSApp delegate] iconForResourceType:[resource type]]];
|
||||
else [(ResourceNameCell *)cell setImage:[(ApplicationDelegate *)[NSApp delegate] iconForResourceType:nil]];
|
||||
|
||||
|
||||
if([[resource name] isEqualToString:@""])
|
||||
{
|
||||
if([cell respondsToSelector:@selector(setPlaceholderString:)]) // 10.3+
|
||||
|
@ -150,14 +150,14 @@ int compareResourcesDescending(Resource *r1, Resource *r2, void *context)
|
|||
else if([[resource type] isEqualToString:@"vers"] && [[resource resID] shortValue] == 2)
|
||||
[cell setTitle:NSLocalizedString(@"Package Version", nil)];
|
||||
else [cell setTitle:NSLocalizedString(@"Untitled Resource", nil)];
|
||||
|
||||
|
||||
// if([[outlineView selectedItems] containsObject:resource])
|
||||
// [cell setTextColor:[NSColor whiteColor]];
|
||||
// else [cell setTextColor:[NSColor grayColor]];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// draw alternating blue/white backgrounds (if pre-10.3)
|
||||
if(NSAppKitVersionNumber < 700.0)
|
||||
{
|
||||
|
@ -200,7 +200,7 @@ int compareResourcesDescending(Resource *r1, Resource *r2, void *context)
|
|||
[self abortEditing];
|
||||
return YES;
|
||||
}
|
||||
|
||||
|
||||
// pressed tab, move to next editable field
|
||||
else if(selector == @selector(insertTab:))
|
||||
{
|
||||
|
@ -213,11 +213,11 @@ int compareResourcesDescending(Resource *r1, Resource *r2, void *context)
|
|||
if([newColIdentifier isEqualToString:@"size"] || [newColIdentifier isEqualToString:@"attributes"])
|
||||
newColumn = (newColumn +1) % [self numberOfColumns];
|
||||
}
|
||||
|
||||
|
||||
[self editColumn:newColumn row:[self selectedRow] withEvent:nil select:YES];
|
||||
return YES;
|
||||
}
|
||||
|
||||
|
||||
// pressed shift-tab, move to previous editable field
|
||||
else if(selector == @selector(insertBacktab:))
|
||||
{
|
||||
|
@ -230,11 +230,11 @@ int compareResourcesDescending(Resource *r1, Resource *r2, void *context)
|
|||
if([newColIdentifier isEqualToString:@"size"] || [newColIdentifier isEqualToString:@"attributes"])
|
||||
newColumn = (newColumn + [self numberOfColumns] -1) % [self numberOfColumns];
|
||||
}
|
||||
|
||||
|
||||
[self editColumn:newColumn row:[self selectedRow] withEvent:nil select:YES];
|
||||
return YES;
|
||||
}
|
||||
|
||||
|
||||
return NO;
|
||||
}
|
||||
|
||||
|
@ -264,7 +264,7 @@ int compareResourcesDescending(Resource *r1, Resource *r2, void *context)
|
|||
// if there is an existing selection, clear it's image
|
||||
if([self highlightedTableColumn] != nil)
|
||||
[self setIndicatorImage:nil inTableColumn:[self highlightedTableColumn]];
|
||||
|
||||
|
||||
// sort name and type columns ascending by default
|
||||
if([[tableColumn identifier] isEqualToString:@"name"] || [[tableColumn identifier] isEqualToString:@"type"])
|
||||
[self setIndicatorImage:upArrow inTableColumn:tableColumn];
|
||||
|
@ -277,4 +277,4 @@ int compareResourcesDescending(Resource *r1, Resource *r2, void *context)
|
|||
// else [super _sendDelegateDidClickColumn:columnIndex];
|
||||
}
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -6,4 +6,4 @@
|
|||
|
||||
+ (id)sharedPasteboardWindowController;
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -19,4 +19,4 @@
|
|||
return sharedPasteboardWindowController;
|
||||
}
|
||||
|
||||
@end
|
||||
@end
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#import "NGSCategories.h"
|
||||
#import <stdarg.h>
|
||||
|
||||
UInt32 TableChecksum(UInt32 *table, UInt32 length);
|
||||
UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
||||
{
|
||||
UInt32 sum = 0, nLongs = (length+3) >> 2;
|
||||
|
@ -15,11 +16,11 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
{
|
||||
self = [self initWithWindowNibName:@"FontDocument"];
|
||||
if(!self) return nil;
|
||||
|
||||
|
||||
resource = [(id)inResource retain];
|
||||
headerTable = [[NSMutableArray alloc] init];
|
||||
[self loadFontFromResource];
|
||||
|
||||
|
||||
// load the window from the nib
|
||||
[self window];
|
||||
return self;
|
||||
|
@ -81,10 +82,10 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
[[self window] setTitle:[resource name]];
|
||||
SetWindowAlternateTitle((WindowRef) [[self window] windowRef], (CFStringRef) [NSString stringWithFormat:NSLocalizedString(@"%@ %@: '%@'", nil), [resource type], [resource resID], [resource name]]);
|
||||
}
|
||||
|
||||
|
||||
// we don't want this notification until we have a window! (Only register for notifications on the resource we're editing)
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resourceDataDidChange:) name:ResourceDataDidChangeNotification object:resource];
|
||||
|
||||
|
||||
// finally, show the window
|
||||
[self showWindow:self];
|
||||
}
|
||||
|
@ -93,7 +94,7 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
{
|
||||
NSMenu *resourceMenu = [[[NSApp mainMenu] itemAtIndex:3] submenu];
|
||||
NSMenuItem *createItem = [resourceMenu itemAtIndex:[resourceMenu indexOfItemWithTarget:nil andAction:@selector(showCreateResourceSheet:)]];
|
||||
|
||||
|
||||
[createItem setTitle: NSLocalizedString(@"Add Font Table...", nil)];
|
||||
[createItem setAction:@selector(showAddFontTableSheet:)];
|
||||
}
|
||||
|
@ -102,7 +103,7 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
{
|
||||
NSMenu *resourceMenu = [[[NSApp mainMenu] itemAtIndex:3] submenu];
|
||||
NSMenuItem *createItem = [resourceMenu itemAtIndex:[resourceMenu indexOfItemWithTarget:nil andAction:@selector(showAddFontTableSheet:)]];
|
||||
|
||||
|
||||
[createItem setTitle: NSLocalizedString(@"Create New Resource...", nil)];
|
||||
[createItem setAction:@selector(showCreateResourceSheet:)];
|
||||
}
|
||||
|
@ -131,11 +132,11 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
[self saveResource:nil];
|
||||
[[self window] close];
|
||||
break;
|
||||
|
||||
|
||||
case NSAlertAlternateReturn: // don't keep
|
||||
[[self window] close];
|
||||
break;
|
||||
|
||||
|
||||
case NSAlertOtherReturn: // cancel
|
||||
break;
|
||||
}
|
||||
|
@ -151,7 +152,7 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
[data appendBytes:&entrySelector length:2];
|
||||
[data appendBytes:&rangeShift length:2];
|
||||
UInt32 offset = 12 + ([headerTable count] << 4);
|
||||
|
||||
|
||||
// add table index
|
||||
for(int i = 0; i < numTables; i++)
|
||||
{
|
||||
|
@ -170,7 +171,7 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
if(offset % 4)
|
||||
offset += 4-(offset%4);
|
||||
}
|
||||
|
||||
|
||||
// append tables
|
||||
long align = 0;
|
||||
for(int i = 0; i < numTables; i++)
|
||||
|
@ -180,7 +181,7 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
if([data length] % 4) // pads the last table too... oh well
|
||||
[data appendBytes:&align length:4-([data length]%4)];
|
||||
}
|
||||
|
||||
|
||||
// write checksum adjustment to head table
|
||||
NSDictionary *head = [headerTable firstObjectReturningValue:@"head" forKey:@"name"];
|
||||
if(head)
|
||||
|
@ -226,7 +227,7 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
[sender setDoubleAction:@selector(openTableInEditor:)];
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
[self openTable:[headerTable objectAtIndex:[sender clickedRow]] inEditor:YES];
|
||||
}
|
||||
|
||||
|
@ -260,7 +261,7 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
NSLog(@"Couldn't retrieve table with name '%@'.", [tableResource type]);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
id undoResource = [[tableResource copy] autorelease];
|
||||
[undoResource setData:[table valueForKey:@"data"]];
|
||||
[[[resource document] undoManager] registerUndoWithTarget:resource selector:@selector(setTableData:) object:undoResource];
|
||||
|
@ -316,7 +317,7 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
}
|
||||
break;
|
||||
default: // undefined
|
||||
stringEncoding = NSWindowsCP1250StringEncoding; // guess Win-Latin-2
|
||||
stringEncoding = NSWindowsCP1250StringEncoding; // guess Win-Latin-2
|
||||
break;
|
||||
}
|
||||
[name setValue:[NSNumber numberWithUnsignedShort:name_table->names[j].platform_id] forKey:@"platform"];
|
||||
|
@ -328,7 +329,7 @@ UInt32 TableChecksum(UInt32 *table, UInt32 length)
|
|||
}
|
||||
[tables setObject:nameArray forKey:@"name"];
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
// else just save the data of the table
|
||||
[tables setObject:[NSData dataWithBytes:(((char *)[[resource data] bytes]) + header->tableInfo[i].offset) length:header->tableInfo[i].length] forKey:[NSString stringWithCString:&(header->tableInfo[i].tagname) length:4]];
|
||||
|
|
|
@ -7,4 +7,4 @@
|
|||
int main(int argc, const char *argv[])
|
||||
{
|
||||
return NSApplicationMain(argc, argv);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2418,7 +2418,7 @@
|
|||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
|
||||
INFOPLIST_FILE = Cocoa/Info.plist;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.7;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.6;
|
||||
PRODUCT_NAME = "ResKnife Cocoa";
|
||||
WARNING_CFLAGS = (
|
||||
"-Wmost",
|
||||
|
@ -2548,14 +2548,15 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
COPY_PHASE_STRIP = NO;
|
||||
GCC_C_LANGUAGE_STANDARD = c99;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
|
||||
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
|
||||
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
|
||||
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
|
||||
GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = NO;
|
||||
GCC_WARN_SIGN_COMPARE = NO;
|
||||
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
|
||||
GCC_WARN_UNKNOWN_PRAGMAS = NO;
|
||||
|
@ -2572,7 +2573,6 @@
|
|||
SECTORDER_FLAGS = "";
|
||||
WARNING_CFLAGS = "-Wmost";
|
||||
WRAPPER_EXTENSION = plugin;
|
||||
ZERO_LINK = YES;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
|
@ -2703,28 +2703,29 @@
|
|||
E13F7F0608F0411100E2A5CB /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ENABLE_OPENMP_SUPPORT = YES;
|
||||
GCC_ALTIVEC_EXTENSIONS = YES;
|
||||
GCC_ENABLE_EXCEPTIONS = YES;
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||
GCC_GENERATE_TEST_COVERAGE_FILES = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO;
|
||||
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
|
||||
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
|
||||
GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = YES;
|
||||
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
|
||||
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
|
||||
GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
|
||||
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
|
||||
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
|
||||
GCC_WARN_MISSING_PARENTHESES = YES;
|
||||
GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES;
|
||||
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
|
||||
GCC_WARN_PEDANTIC = YES;
|
||||
GCC_WARN_PROTOTYPE_CONVERSION = YES;
|
||||
GCC_WARN_SHADOW = YES;
|
||||
GCC_WARN_SIGN_COMPARE = YES;
|
||||
GCC_WARN_STRICT_SELECTOR_MATCH = YES;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNKNOWN_PRAGMAS = YES;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
|
|
Loading…
Reference in New Issue
Block a user