diff --git a/.gitattributes b/.gitattributes old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/AlienNoteImporter.h b/AlienNoteImporter.h old mode 100644 new mode 100755 diff --git a/AlienNoteImporter.m b/AlienNoteImporter.m old mode 100644 new mode 100755 index 0f85ec53..1c841c33 --- a/AlienNoteImporter.m +++ b/AlienNoteImporter.m @@ -365,6 +365,7 @@ - (NoteObject*)noteWithFile:(NSString*)filename { if (noteObject) { //[noteObject setDateAdded:CFDateGetAbsoluteTime((CFDateRef)[attributes objectForKey:NSFileCreationDate])]; //[noteObject setDateModified:CFDateGetAbsoluteTime((CFDateRef)[attributes objectForKey:NSFileModificationDate])]; + //TODO: take date/created modified; why throw away information? [attributedStringFromData release]; @@ -454,6 +455,7 @@ - (NSArray*)_importStickies:(NSString*)filename { if (noteObject) { [noteObject setDateAdded:CFDateGetAbsoluteTime((CFDateRef)[doc creationDate])]; //[noteObject setDateModified:CFDateGetAbsoluteTime((CFDateRef)[doc modificationDate])]; + //TODO: use the sticky's mod date [notes addObject:noteObject]; } else { diff --git a/AppController.h b/AppController.h old mode 100644 new mode 100755 diff --git a/AppController.m b/AppController.m old mode 100644 new mode 100755 index 3e2d8c30..413618bb --- a/AppController.m +++ b/AppController.m @@ -29,12 +29,12 @@ @implementation AppController - (id)init { if ([super init]) { - + windowUndoManager = [[NSUndoManager alloc] init]; - + isCreatingANote = isFilteringFromTyping = typedStringIsCached = NO; typedString = @""; - + } return self; } @@ -86,11 +86,11 @@ - (void)setupViewsAfterAppAwakened { void outletObjectAwoke(id sender) { static NSMutableSet *awokenOutlets = nil; if (!awokenOutlets) awokenOutlets = [[NSMutableSet alloc] init]; - + [awokenOutlets addObject:sender]; AppController* appDelegate = (AppController*)[NSApp delegate]; - + if (appDelegate && [awokenOutlets containsObject:appDelegate] && [awokenOutlets containsObject:appDelegate->notesTableView] && [awokenOutlets containsObject:appDelegate->textView] && @@ -109,7 +109,7 @@ - (void)runDelayedIUActionsAfterLaunch { [notationController checkIfNotationIsTrashed]; //connect sparkle programmatically to avoid loading its framework at nib awake; - if (!NSClassFromString(@"SUUpdater")) { + if (RunningTigerAppKitOrHigher && !NSClassFromString(@"SUUpdater")) { NSString *frameworkPath = [[[NSBundle bundleForClass:[self class]] privateFrameworksPath] stringByAppendingPathComponent:@"Sparkle.framework"]; if ([[NSBundle bundleWithPath:frameworkPath] load]) { [sparkleUpdateItem setTarget:[[NSClassFromString(@"SUUpdater") alloc] init]]; @@ -122,7 +122,7 @@ - (void)runDelayedIUActionsAfterLaunch { extern int decodedCount(); - (void)applicationDidFinishLaunching:(NSNotification*)aNote { - + NSDate *before = [NSDate date]; prefsWindowController = [[PrefsWindowController alloc] init]; @@ -161,7 +161,7 @@ - (void)applicationDidFinishLaunching:(NSNotification*)aNote { subMessage, NSLocalizedString(@"Choose another folder",nil),NSLocalizedString(@"Quit",nil),NULL) == NSAlertDefaultReturn) { //show nsopenpanel, defaulting to current default notes dir FSRef notesDirectoryRef; - showOpenPanel: + showOpenPanel: if (![prefsWindowController getNewNotesRefFromOpenPanel:¬esDirectoryRef returnedPath:&location]) { //they cancelled the open panel, or it was unable to get the path/FSRef of the file goto terminateApp; @@ -179,7 +179,7 @@ - (void)applicationDidFinishLaunching:(NSNotification*)aNote { [newNotation release]; NSLog(@"load time: %g, ",[[NSDate date] timeIntervalSinceDate:before]); -// NSLog(@"version: %s", PRODUCT_NAME); + // NSLog(@"version: %s", PRODUCT_NAME); //import old database(s) here if necessary [AlienNoteImporter importBlorOrHelpFilesIfNecessaryIntoNotation:newNotation]; @@ -189,7 +189,7 @@ - (void)applicationDidFinishLaunching:(NSNotification*)aNote { [notesToOpenOnLaunch release]; notesToOpenOnLaunch = nil; } - + //tell us when someone wants to load a new database [prefsController registerForSettingChange:@selector(setAliasDataForDefaultDirectory:sender:) withTarget:self]; //tell us when sorting prefs changed @@ -202,10 +202,10 @@ - (void)applicationDidFinishLaunching:(NSNotification*)aNote { [self performSelector:@selector(runDelayedIUActionsAfterLaunch) withObject:nil afterDelay:0.1]; NSLog(@"decoded 7 bit count: %d", decodedCount()); - + return; terminateApp: - [NSApp terminate:self]; + [NSApp terminate:self]; } - (void)setNotationController:(NotationController*)newNotation { @@ -248,7 +248,7 @@ - (BOOL)applicationOpenUntitledFile:(NSApplication *)sender { return NO; } -- (BOOL)validateMenuItem:(id )menuItem { +- (BOOL)validateMenuItem:(NSMenuItem*)menuItem { SEL selector = [menuItem action]; int numberSelected = [notesTableView numberOfSelectedRows]; @@ -271,22 +271,22 @@ - (BOOL)validateMenuItem:(id )menuItem { } /* -- (void)menuNeedsUpdate:(NSMenu *)menu { - NSLog(@"mama needs update: %@", [menu title]); - - NSArray *selectedNotes = [notationController notesAtIndexes:[notesTableView selectedRowIndexes]]; - [selectedNotes setURLsInNotesForMenu:menu]; -}*/ + - (void)menuNeedsUpdate:(NSMenu *)menu { + NSLog(@"mama needs update: %@", [menu title]); + + NSArray *selectedNotes = [notationController notesAtIndexes:[notesTableView selectedRowIndexes]]; + [selectedNotes setURLsInNotesForMenu:menu]; + }*/ - (void)updateNoteMenus { NSMenu *notesMenu = [[[NSApp mainMenu] itemWithTag:89] submenu]; - + int menuIndex = [notesMenu indexOfItemWithTarget:self andAction:@selector(deleteNote:)]; NSMenuItem *deleteItem = nil; if (menuIndex > -1 && (deleteItem = [notesMenu itemAtIndex:menuIndex])) { NSString *trailingQualifier = [prefsController confirmNoteDeletion] ? NSLocalizedString(@"...", @"ellipsis character") : @""; [deleteItem setTitle:[NSString stringWithFormat:@"%@%@", - NSLocalizedString(@"Delete", nil), trailingQualifier]]; + NSLocalizedString(@"Delete", nil), trailingQualifier]]; } } @@ -313,13 +313,13 @@ - (BOOL)addNotesFromPasteboard:(NSPasteboard*)pasteboard { //webkit URL! if ([types containsObject:WebArchivePboardType]) { sourceIdentiferString = [[pasteboard dataForType:WebArchivePboardType] pathURLFromWebArchive]; - //gecko URL! + //gecko URL! } else if ([types containsObject:[NSString customPasteboardTypeOfCode:0x4D5A0003]]) { //lazilly use syntheticTitle to get first line, even though that's not how our API is documented sourceIdentiferString = [[pasteboard stringForType:[NSString customPasteboardTypeOfCode:0x4D5A0003]] syntheticTitle]; unichar nullChar = 0x0; sourceIdentiferString = [sourceIdentiferString stringByReplacingOccurrencesOfString: - [NSString stringWithCharacters:&nullChar length:1] withString:@""]; + [NSString stringWithCharacters:&nullChar length:1] withString:@""]; } if ([types containsObject:NSURLPboardType]) { @@ -447,7 +447,7 @@ - (IBAction)deleteNote:(id)sender { NSString *warningSingleFormatString = NSLocalizedString(@"Delete the note titled quotemark%@quotemark?", @"alert title when asked to delete a note"); NSString *warningMultipleFormatString = NSLocalizedString(@"Delete %d notes?", @"alert title when asked to delete multiple notes"); NSString *warnString = currentNote ? [NSString stringWithFormat:warningSingleFormatString, titleOfNote(currentNote)] : - [NSString stringWithFormat:warningMultipleFormatString, [indexes count]]; + [NSString stringWithFormat:warningMultipleFormatString, [indexes count]]; NSBeginAlertSheet(warnString, NSLocalizedString(@"Delete", @"name of delete button"), NSLocalizedString(@"Cancel", @"name of cancel button"), nil, window, self, @selector(deleteSheetDidEnd:returnCode:contextInfo:), NULL, (void*)deleteObj, NSLocalizedString(@"You can undo this action later.", @"informational delete-this-note? text")); @@ -460,7 +460,7 @@ - (IBAction)deleteNote:(id)sender { - (IBAction)exportNote:(id)sender { NSIndexSet *indexes = [notesTableView selectedRowIndexes]; - + NSArray *notes = [notationController notesAtIndexes:indexes]; [notationController synchronizeNoteChanges:nil]; @@ -469,7 +469,7 @@ - (IBAction)exportNote:(id)sender { - (IBAction)printNote:(id)sender { NSIndexSet *indexes = [notesTableView selectedRowIndexes]; - + [MultiplePageView printNotes:[notationController notesAtIndexes:indexes] forWindow:window]; } @@ -500,6 +500,7 @@ - (void)settingChangedForSelectorString:(NSString*)selectorString { if ([selectorString isEqualToString:SEL_STR(setAliasDataForDefaultDirectory:sender:)]) { //defaults changed for the database location -- load the new one! + //TODO: should remove all actions from windowUndoManager if initialization succeeds OSStatus err = noErr; NotationController *newNotation = nil; @@ -566,7 +567,7 @@ - (void)showHelp:(id)sender { } - (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames { - + //should check filenames here to see whether notationcontroller already owns these NSArray *notes = [[[[AlienNoteImporter alloc] initWithStoragePaths:filenames] autorelease] importedNotes]; @@ -676,18 +677,18 @@ - (BOOL)control:(NSControl *)control textView:(NSTextView *)aTextView doCommandB //[field updateButtonIfNecessaryForEditor:aTextView]; return YES; } - + //following actions should also redraw the button, if it is visible //except that this can be much more easily handled by -[DualField reflectScrolledClipView:] /*if (command == @selector(moveLeft:) || command == @selector(moveRight:) || - command == @selector(moveLeftAndModifySelection:) || command == @selector(moveRightAndModifySelection:) || - command == @selector(moveToEndOfParagraph:) || command == @selector(moveToBeginningOfParagraph:) || - command == @selector(moveParagraphForwardAndModifySelection:) || command == @selector(moveParagraphBackwardAndModifySelection:) || - !strncmp((char*)command, "moveWord", 8) || !strncmp((char*)command, "page", 4) || !strncmp((char*)command, "scroll", 6)) { - [field updateButtonIfNecessaryForEditor:aTextView]; - return NO; - }*/ - + command == @selector(moveLeftAndModifySelection:) || command == @selector(moveRightAndModifySelection:) || + command == @selector(moveToEndOfParagraph:) || command == @selector(moveToBeginningOfParagraph:) || + command == @selector(moveParagraphForwardAndModifySelection:) || command == @selector(moveParagraphBackwardAndModifySelection:) || + !strncmp((char*)command, "moveWord", 8) || !strncmp((char*)command, "page", 4) || !strncmp((char*)command, "scroll", 6)) { + [field updateButtonIfNecessaryForEditor:aTextView]; + return NO; + }*/ + if (command == @selector(moveToBeginningOfLineAndModifySelection:)) { if ([aTextView respondsToSelector:@selector(moveToBeginningOfDocumentAndModifySelection:)]) { @@ -720,7 +721,7 @@ - (BOOL)control:(NSControl *)control textView:(NSTextView *)aTextView doCommandB } } } - + } else if (control == (NSControl*)notesTableView) { if (command == @selector(insertNewline:)) { //hit return in cell @@ -791,10 +792,15 @@ - (void)controlTextDidChange:(NSNotification *)aNotification { if ([fieldString length] > 0) { [field setSnapbackString:nil]; - - unsigned int preferredNoteIndex = [notationController preferredSelectedNoteIndex]; + + NSUInteger preferredNoteIndex = [notationController preferredSelectedNoteIndex]; if ([prefsController autoCompleteSearches] && preferredNoteIndex != NSNotFound) { + //TODO: select nothing if search string is not equal to title of preferredNoteIndex + //e.g., modifying a note's title in the search field deselects it, + //whether a result of back-spacing either an auto-completed entry + //or the title of a manually-selected note + [notesTableView selectRowAndScroll:preferredNoteIndex]; if (didFilter) { @@ -830,14 +836,14 @@ - (void)controlTextDidChange:(NSNotification *)aNotification { } } else { //selecting nothing; nothing typed -selectNothing: + selectNothing: isFilteringFromTyping = NO; [notesTableView deselectAll:nil]; //reloadData could have already de-selected us, and hence this notification would not be sent from -deselectAll: [self processChangedSelectionForTable:notesTableView]; } - + isFilteringFromTyping = NO; } } @@ -855,11 +861,11 @@ - (void)tableViewSelectionIsChanging:(NSNotification *)aNotification { allowMultipleSelection = YES; } } - + if (allowMultipleSelection != [notesTableView allowsMultipleSelection]) { //we may need to hack some hidden NSTableView instance variables to improve mid-drag flags-changing //NSLog(@"set allows mult: %d", allowMultipleSelection); - + [notesTableView setAllowsMultipleSelection:allowMultipleSelection]; //we need this because dragging a selection back to the same note will nto trigger a selectionDidChange notification @@ -870,7 +876,7 @@ - (void)tableViewSelectionIsChanging:(NSNotification *)aNotification { //occasionally changing multiple selection ability in-between selecting multiple items causes total deselection [window makeFirstResponder:notesTableView]; } - + [self processChangedSelectionForTable:[aNotification object]]; } @@ -896,10 +902,10 @@ - (void)processChangedSelectionForTable:(NSTableView*)table { NSTextView *fieldEditor = (NSTextView*)[field currentEditor]; if (table == (NSTableView*)notesTableView) { - + if (selectedRow > -1 && numberSelected == 1) { //if it is uncached, cache the typed string only if we are selecting a note - + [self cacheTypedStringIfNecessary:[fieldEditor string]]; //add snapback-button here? @@ -938,7 +944,7 @@ - (void)processChangedSelectionForTable:(NSTableView*)table { if (!isFilteringFromTyping) { if (currentNote) { //selected nothing and something is currently selected - + [self _setCurrentNote:nil]; if (typedStringIsCached) { @@ -973,7 +979,7 @@ - (void)setEmptyViewState:(BOOL)state { BOOL enable = /*numberSelected != 1;*/ state; [textView setHidden:enable]; [editorStatusView setHidden:!enable]; - + if (enable) { [editorStatusView setLabelStatus:[notesTableView numberOfSelectedRows]]; } @@ -983,7 +989,7 @@ - (BOOL)displayContentsForNoteAtIndex:(int)noteIndex { NoteObject *note = [notationController noteObjectAtFilteredIndex:noteIndex]; if (note != currentNote) { [self setEmptyViewState:NO]; - + //actually load the new note [self _setCurrentNote:note]; @@ -1035,7 +1041,7 @@ - (BOOL)displayContentsForNoteAtIndex:(int)noteIndex { //from linkingeditor - (void)textDidChange:(NSNotification *)aNotification { id textObject = [aNotification object]; - + if (textObject == textView) { [currentNote setContentString:[textView textStorage]]; } @@ -1061,10 +1067,10 @@ - (void)textDidEndEditing:(NSNotification *)aNotification { } - (IBAction)fieldAction:(id)sender { - + [self createNoteIfNecessary]; [window makeFirstResponder:textView]; - + } - (NSUndoManager *)windowWillReturnUndoManager:(NSWindow *)sender { @@ -1093,7 +1099,7 @@ - (NoteObject*)createNoteIfNecessary { if (!currentNote) { //this assertion not yet valid until labels list changes notes list assert([notesTableView numberOfSelectedRows] != 1); - + [textView setTypingAttributes:[prefsController noteBodyAttributes]]; [textView setFont:[prefsController noteBodyFont]]; @@ -1108,7 +1114,7 @@ - (NoteObject*)createNoteIfNecessary { - (void)notation:(NotationController*)notation revealNote:(NoteObject*)note { if (note) { - unsigned selectedNoteIndex = [notation indexInFilteredListForNoteIdenticalTo:note]; + NSUInteger selectedNoteIndex = [notation indexInFilteredListForNoteIdenticalTo:note]; if (selectedNoteIndex == NSNotFound) { NSLog(@"Note was not visible--showing all notes and trying again"); @@ -1155,13 +1161,13 @@ - (void)notation:(NotationController*)notation wantsToSearchForString:(NSString* } } -- (void)splitView:(RBSplitView*)sender wasResizedFrom:(float)oldDimension to:(float)newDimension { +- (void)splitView:(RBSplitView*)sender wasResizedFrom:(CGFloat)oldDimension to:(CGFloat)newDimension { if (sender == splitView) { [sender adjustSubviewsExcepting:[splitView subviewAtPosition:0]]; } } -- (BOOL)splitView:(RBSplitView*)sender shouldHandleEvent:(NSEvent*)theEvent inDivider:(unsigned int)divider +- (BOOL)splitView:(RBSplitView*)sender shouldHandleEvent:(NSEvent*)theEvent inDivider:(NSUInteger)divider betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing { //if upon the first mousedown, the top selected index is visible, snap to it when resizing [notesTableView noteFirstVisibleRow]; @@ -1290,12 +1296,12 @@ - (IBAction)showPreferencesWindow:(id)sender { - (IBAction)bringFocusToControlField:(id)sender { if (![NSApp isActive]) [NSApp activateIgnoringOtherApps:YES]; - + if (![window isKeyWindow]) { [window makeKeyAndOrderFront:sender]; } [field selectText:sender]; - + [self setEmptyViewState:currentNote == nil]; } diff --git a/AttributedPlainText.h b/AttributedPlainText.h old mode 100644 new mode 100755 diff --git a/AttributedPlainText.m b/AttributedPlainText.m old mode 100644 new mode 100755 index 41a3023a..010080bb --- a/AttributedPlainText.m +++ b/AttributedPlainText.m @@ -248,9 +248,9 @@ - (NSArray*)allLinks { unsigned int startIndex = 0; NSMutableArray *array = [NSMutableArray arrayWithCapacity:1]; while (startIndex < [self length]) { - id link = [self findNextLinkAtIndex:startIndex effectiveRange:&range]; - if ([link isKindOfClass:[NSURL class]]) { - [array addObject:link]; + id alink = [self findNextLinkAtIndex:startIndex effectiveRange:&range]; + if ([alink isKindOfClass:[NSURL class]]) { + [array addObject:alink]; } startIndex = range.location+range.length; } @@ -261,19 +261,19 @@ - (NSArray*)allLinks { - (id)findNextLinkAtIndex:(unsigned int)startIndex effectiveRange:(NSRange *)range { NSRange linkRange; - id link = nil; - while (!link && startIndex < [self length]) { - link = [self attribute:NSLinkAttributeName atIndex:startIndex effectiveRange:&linkRange]; + id alink = nil; + while (!alink && startIndex < [self length]) { + alink = [self attribute:NSLinkAttributeName atIndex:startIndex effectiveRange:&linkRange]; startIndex++; } - if (link) { + if (alink) { range->location = linkRange.location; range->length = linkRange.length; } else { range->location = NSNotFound; range->length = 0; } - return link; + return alink; } #if SEPARATE_ATTRS diff --git a/BlorPasswordRetriever.h b/BlorPasswordRetriever.h old mode 100644 new mode 100755 diff --git a/BlorPasswordRetriever.m b/BlorPasswordRetriever.m old mode 100644 new mode 100755 diff --git a/BodyScroller.h b/BodyScroller.h old mode 100644 new mode 100755 diff --git a/BodyScroller.m b/BodyScroller.m old mode 100644 new mode 100755 diff --git a/BookmarksController.h b/BookmarksController.h old mode 100644 new mode 100755 diff --git a/BookmarksController.m b/BookmarksController.m old mode 100644 new mode 100755 index 36ecca42..c40bbd7d --- a/BookmarksController.m +++ b/BookmarksController.m @@ -111,8 +111,8 @@ - (id)delegate { - (BOOL)isEqual:(id)anObject { return noteObject == [anObject noteObject]; } -- (unsigned)hash { - return (unsigned)noteObject; +- (NSUInteger)hash { + return (NSUInteger)noteObject; } @end @@ -183,7 +183,7 @@ - (void)setNotes:(NSArray*)someNotes { } - (NoteObject*)noteWithUUIDBytes:(CFUUIDBytes)bytes { - unsigned noteIndex = [notes indexOfNoteWithUUIDBytes:&bytes]; + NSUInteger noteIndex = [notes indexOfNoteWithUUIDBytes:&bytes]; if (noteIndex != NSNotFound) return [notes objectAtIndex:noteIndex]; return nil; } @@ -253,7 +253,7 @@ - (void)updateBookmarksUI { - (void)selectBookmarkInTableView:(NoteBookmark*)bookmark { if (bookmarksTableView && bookmark) { //find bookmark index and select - unsigned bmIndex = [bookmarks indexOfObjectIdenticalTo:bookmark]; + NSUInteger bmIndex = [bookmarks indexOfObjectIdenticalTo:bookmark]; if (bmIndex != NSNotFound) { isSelectingProgrammatically = YES; [bookmarksTableView selectRow:bmIndex byExtendingSelection:NO]; @@ -263,7 +263,7 @@ - (void)selectBookmarkInTableView:(NoteBookmark*)bookmark { } } -- (BOOL)validateMenuItem:(id )menuItem { +- (BOOL)validateMenuItem:(NSMenuItem*)menuItem { //need to fix this for better style detection SEL action = [menuItem action]; @@ -299,7 +299,7 @@ - (void)restoreBookmark:(id)sender { [self restoreNoteBookmark:[sender representedObject]]; } -- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex { +- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex { if ([[aTableColumn identifier] isEqualToString:@"description"]) { NSString *description = [[bookmarks objectAtIndex:rowIndex] description]; if (description) @@ -320,11 +320,11 @@ - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColu return [NSString stringWithFormat:@"%@%@%@ %d", rowIndex > 17 ? ctrlCharStr : @"", rowIndex > 8 ? shiftCharStr : @"", cmdCharStr, (rowIndex % 9) + 1]; } -- (int)numberOfRowsInTableView:(NSTableView *)aTableView { +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView { return [bookmarks count]; } -- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex { +- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex { return NO; } @@ -346,7 +346,7 @@ - (BOOL)tableView:(NSTableView *)tv writeRows:(NSArray*)rows toPasteboard:(NSPas return YES; } -- (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id )info proposedRow:(int)row +- (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id )info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)op { NSDragOperation dragOp = ([info draggingSource] == bookmarksTableView) ? NSDragOperationMove : NSDragOperationCopy; @@ -356,13 +356,13 @@ - (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id ) return dragOp; } -- (BOOL)tableView:(NSTableView*)tv acceptDrop:(id )info row:(int)row dropOperation:(NSTableViewDropOperation)op { +- (BOOL)tableView:(NSTableView*)tv acceptDrop:(id )info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)op { if (row < 0) row = 0; if ([info draggingSource] == bookmarksTableView) { NSArray *rows = [[info draggingPasteboard] propertyListForType:MovedBookmarksType]; - int theRow = [[rows objectAtIndex:0] intValue]; + NSInteger theRow = [[rows objectAtIndex:0] intValue]; id object = [[bookmarks objectAtIndex:theRow] retain]; @@ -425,6 +425,9 @@ - (void)showBookmarks:(id)sender { [bookmarksTableView reloadData]; [window makeKeyAndOrderFront:self]; + + //TODO: hide bookmarks window if already open + //TODO: fix nspanel to not respond to close //highlight searches as appropriate while the window is open //selecting a search restores it @@ -453,7 +456,7 @@ - (void)addBookmark:(id)sender { NoteBookmark *bookmark = [[NoteBookmark alloc] initWithNoteObject:[delegate selectedNoteObject] searchString:newString]; if (bookmark) { - unsigned existingIndex = [bookmarks indexOfObject:bookmark]; + NSUInteger existingIndex = [bookmarks indexOfObject:bookmark]; if (existingIndex != NSNotFound) { //show them what they've already got NoteBookmark *existingBookmark = [bookmarks objectAtIndex:existingIndex]; diff --git a/BookmarksTable.h b/BookmarksTable.h old mode 100644 new mode 100755 diff --git a/BookmarksTable.m b/BookmarksTable.m old mode 100644 new mode 100755 diff --git a/BufferUtils.c b/BufferUtils.c old mode 100644 new mode 100755 index eb325871..4a2a0a1d --- a/BufferUtils.c +++ b/BufferUtils.c @@ -102,12 +102,12 @@ unsigned DumbWordCount(const void *s1, size_t len) { return count; } -int genericSortContextFirst(int (*context) (void*, void*), void* one, void* two) { +NSInteger genericSortContextFirst(int (*context) (void*, void*), void* one, void* two) { return context(one, two); } -int genericSortContextLast(void* one, void* two, int (*context) (void*, void*)) { +NSInteger genericSortContextLast(void* one, void* two, int (*context) (void*, void*)) { return context(&one, &two); } @@ -170,7 +170,7 @@ CFStringRef GetRandomizedFileName() { ProcessSerialNumber psn; OSStatus err = noErr; if ((err = GetCurrentProcess(&psn)) != noErr) { - printf("error getting process serial number: %ld\n", err); + printf("error getting process serial number: %d\n", (int)err); //just use the location of our memory psn.lowLongOfPSN = (unsigned long)&psn; @@ -219,7 +219,7 @@ OSStatus FSRefMakeInDirectoryWithString(FSRef *directoryRef, FSRef *childRef, CF OSStatus FSRefReadData(FSRef *fsRef, size_t maximumReadSize, UInt64 *bufferSize, void** newBuffer, UInt16 modeOptions) { OSStatus err = noErr; HFSUniStr255 dfName; //this is just NULL / 0, anyway - SInt16 refNum; + FSIORefNum refNum; SInt64 forkSize; ByteCount readActualCount = 0, totalReadBytes = 0; @@ -229,7 +229,7 @@ OSStatus FSRefReadData(FSRef *fsRef, size_t maximumReadSize, UInt64 *bufferSize, } if ((err = FSGetDataForkName(&dfName)) != noErr) { - printf("FSGetDataForkName: error %ld\n", err); + printf("FSGetDataForkName: error %d\n", (int)err); return err; } @@ -238,27 +238,27 @@ OSStatus FSRefReadData(FSRef *fsRef, size_t maximumReadSize, UInt64 *bufferSize, //get fork size //read data if ((err = FSOpenFork(fsRef, dfName.length, dfName.unicode, fsRdPerm, &refNum)) != noErr) { - printf("FSOpenFork: error %ld\n", err); + printf("FSOpenFork: error %d\n", (int)err); return err; } if ((forkSize = *bufferSize) < 1) { if ((err = FSGetForkSize(refNum, &forkSize)) != noErr) { - printf("FSGetForkSize: error %ld\n", err); + printf("FSGetForkSize: error %d\n", (int)err); return err; } } - long copyBufferSize = MIN(maximumReadSize, forkSize); + size_t copyBufferSize = MIN(maximumReadSize, (size_t)forkSize); void *fullSizeBuffer = (void*)malloc(forkSize); - while (noErr == err && totalReadBytes < forkSize) { + while (noErr == err && totalReadBytes < (ByteCount)forkSize) { err = FSReadFork(refNum, fsAtMark + modeOptions, 0, copyBufferSize, fullSizeBuffer + totalReadBytes, &readActualCount); totalReadBytes += readActualCount; } OSErr lastReadErr = err; if ((err = FSCloseFork(refNum)) != noErr) - printf("FSCloseFork: error %ld\n", err); + printf("FSCloseFork: error %d\n", (int)err); *newBuffer = fullSizeBuffer; //in case we read less than the expected size or the size was not initially known @@ -270,7 +270,7 @@ OSStatus FSRefReadData(FSRef *fsRef, size_t maximumReadSize, UInt64 *bufferSize, OSStatus FSRefWriteData(FSRef *fsRef, size_t maximumWriteSize, UInt64 bufferSize, const void* buffer, UInt16 modeOptions, Boolean truncateFile) { OSStatus err = noErr; HFSUniStr255 dfName; //this is just NULL / 0, anyway - SInt16 refNum; + FSIORefNum refNum; ByteCount writeActualCount = 0, totalWrittenBytes = 0; if (!buffer || !fsRef) { @@ -279,14 +279,14 @@ OSStatus FSRefWriteData(FSRef *fsRef, size_t maximumWriteSize, UInt64 bufferSize } if ((err = FSGetDataForkName(&dfName)) != noErr) { - printf("FSGetDataForkName: error %ld\n", err); + printf("FSGetDataForkName: error %d\n", (int)err); return err; } //FSOpenFork //get vrefnum or whatever if ((err = FSOpenFork(fsRef, dfName.length, dfName.unicode, fsWrPerm, &refNum)) != noErr) { - printf("FSOpenFork: error %ld\n", err); + printf("FSOpenFork: error %d\n", (int)err); return err; } @@ -302,12 +302,12 @@ OSStatus FSRefWriteData(FSRef *fsRef, size_t maximumWriteSize, UInt64 bufferSize OSErr writeError = err; if (truncateFile && (err = FSSetForkSize(refNum, fsFromStart, bufferSize))) { - printf("FSOpenFork: FSSetForkSize %ld\n", err); + printf("FSOpenFork: FSSetForkSize %d\n", (int)err); return err; } if ((err = FSCloseFork(refNum)) != noErr) - printf("FSCloseFork: error %ld\n", err); + printf("FSCloseFork: error %d\n", (int)err); return writeError; } diff --git a/BufferUtils.h b/BufferUtils.h old mode 100644 new mode 100755 diff --git a/CRC32.c b/CRC32.c old mode 100644 new mode 100755 diff --git a/CRC32.h b/CRC32.h old mode 100644 new mode 100755 diff --git a/CarbonFSErrorStrings.h b/CarbonFSErrorStrings.h old mode 100644 new mode 100755 diff --git a/DeletedNoteObject.h b/DeletedNoteObject.h old mode 100644 new mode 100755 diff --git a/DeletedNoteObject.m b/DeletedNoteObject.m old mode 100644 new mode 100755 index 2336317d..c38b7d74 --- a/DeletedNoteObject.m +++ b/DeletedNoteObject.m @@ -22,19 +22,33 @@ - (id)initWithExistingObject:(id)note { - (id)initWithCoder:(NSCoder*)decoder { if ([super init]) { - //needs a case for nskeyedarchiver as well; will CFUUIDBytes just be nsdata? - [decoder decodeValueOfObjCType:@encode(CFUUIDBytes) at:&uniqueNoteIDBytes]; - [decoder decodeValueOfObjCType:@encode(unsigned int) at:&serverModifiedTime]; - [decoder decodeValueOfObjCType:@encode(unsigned int) at:&logSequenceNumber]; + + if ([decoder allowsKeyedCoding]) { + NSUInteger decodedByteCount; + const uint8_t *decodedBytes = [decoder decodeBytesForKey:VAR_STR(uniqueNoteIDBytes) returnedLength:&decodedByteCount]; + memcpy(&uniqueNoteIDBytes, decodedBytes, MIN(decodedByteCount, sizeof(CFUUIDBytes))); + serverModifiedTime = [decoder decodeInt32ForKey:VAR_STR(serverModifiedTime)]; + logSequenceNumber = [decoder decodeInt32ForKey:VAR_STR(logSequenceNumber)]; + } else { + [decoder decodeValueOfObjCType:@encode(CFUUIDBytes) at:&uniqueNoteIDBytes]; + [decoder decodeValueOfObjCType:@encode(unsigned int) at:&serverModifiedTime]; + [decoder decodeValueOfObjCType:@encode(unsigned int) at:&logSequenceNumber]; + } } return self; } - (void)encodeWithCoder:(NSCoder *)coder { - [coder encodeValueOfObjCType:@encode(CFUUIDBytes) at:&uniqueNoteIDBytes]; - [coder encodeValueOfObjCType:@encode(unsigned int) at:&serverModifiedTime]; - [coder encodeValueOfObjCType:@encode(unsigned int) at:&logSequenceNumber]; - + + if ([coder allowsKeyedCoding]) { + [coder encodeBytes:(const uint8_t *)&uniqueNoteIDBytes length:sizeof(CFUUIDBytes) forKey:VAR_STR(uniqueNoteIDBytes)]; + [coder encodeInt32:serverModifiedTime forKey:VAR_STR(serverModifiedTime)]; + [coder encodeInt32:logSequenceNumber forKey:VAR_STR(logSequenceNumber)]; + } else { + [coder encodeValueOfObjCType:@encode(CFUUIDBytes) at:&uniqueNoteIDBytes]; + [coder encodeValueOfObjCType:@encode(unsigned int) at:&serverModifiedTime]; + [coder encodeValueOfObjCType:@encode(unsigned int) at:&logSequenceNumber]; + } } - (CFUUIDBytes *)uniqueNoteIDBytes { diff --git a/DeletionManager.h b/DeletionManager.h old mode 100644 new mode 100755 diff --git a/DeletionManager.m b/DeletionManager.m old mode 100644 new mode 100755 index 4064d08b..cd3a9f19 --- a/DeletionManager.m +++ b/DeletionManager.m @@ -188,19 +188,19 @@ - (void)windowDidEndSheet:(NSNotification *)aNotification { } } -- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex { +- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex { return NO; } -- (BOOL)tableView:(NSTableView *)aTableView shouldSelectRow:(int)rowIndex { +- (BOOL)tableView:(NSTableView *)aTableView shouldSelectRow:(NSInteger)rowIndex { return NO; } -- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex { +- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex { return filenameOfNote((NoteObject *)[deletedNotes objectAtIndex:rowIndex]); } -- (int)numberOfRowsInTableView:(NSTableView *)aTableView { +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView { return [deletedNotes count]; } diff --git a/DualField.h b/DualField.h old mode 100644 new mode 100755 diff --git a/DualField.m b/DualField.m old mode 100644 new mode 100755 diff --git a/EmptyView.h b/EmptyView.h old mode 100644 new mode 100755 diff --git a/EmptyView.m b/EmptyView.m old mode 100644 new mode 100755 diff --git a/EncodingsManager.h b/EncodingsManager.h old mode 100644 new mode 100755 diff --git a/EncodingsManager.m b/EncodingsManager.m old mode 100644 new mode 100755 diff --git a/English.lproj/BlorPasswordRetriever.nib/classes.nib b/English.lproj/BlorPasswordRetriever.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/BlorPasswordRetriever.nib/info.nib b/English.lproj/BlorPasswordRetriever.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/BlorPasswordRetriever.nib/keyedobjects.nib b/English.lproj/BlorPasswordRetriever.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/CarbonErrorStrings.plist b/English.lproj/CarbonErrorStrings.plist old mode 100644 new mode 100755 index 9e01a4a2..ac4f5e3e --- a/English.lproj/CarbonErrorStrings.plist +++ b/English.lproj/CarbonErrorStrings.plist @@ -1,5 +1,5 @@ - + -33 @@ -19,11 +19,11 @@ -40 a negative file position offset was specified -41 - the file won't fit in memory + the file won't fit in memory -42 there are too many open files -43 - the file wasn't found + the file wasn't found -44 the media is write-protected -45 @@ -41,7 +41,7 @@ -51 the file reference number is invalid -52 - the file position offset couldn't be obtained + the file position offset couldn't be obtained -53 the volume is no longer present -54 @@ -53,13 +53,13 @@ -57 the disk is not mac-formatted -58 - the volume's file system type is not handled + the volume's file system type is not handled -59 there was a problem in the middle of renaming -60 the master directory block is bad -61 - the file's permissions prevent you from writing + the file's permissions prevent you from writing -64 the drive is not installed -120 @@ -79,17 +79,19 @@ -818 the data could not be unserialized -819 - the write-ahead log file could not be initialized + the Interim Note-Changes file could not be initialized -820 - the write-ahead log couldn't be appended-to + the Interim Note-Changes file couldn't be appended-to -821 authentication failed -822 - the data couldn't be decompressed + the data couldn't be decompressed -823 you did not enter a passphrase -824 the data could not be formatted appropriately + -825 + notes had mis-matching values after decoding -1300 the specified file ID was not found on the file system -1301 @@ -101,9 +103,9 @@ -1304 the catalog changed unexpectedly -1306 - the file's contents were attempted to be exchanged with itself + the file's contents were attempted to be exchanged with itself -1307 - the file doesn't match the file ID number + the file doesn't match the file ID number -1308 the volume was improperly remounted -1309 @@ -131,11 +133,11 @@ -1407 a folder was in fact a file -1409 - the file's requested fork doesn't exist + the file's requested fork doesn't exist -1410 the requested name is too long to be valid -1411 - the file doesn't have a name + the file doesn't have a name -1412 an invalid positioning mode was specified for accessing the file -1413 diff --git a/English.lproj/Contact Information.nvhelp b/English.lproj/Contact Information.nvhelp old mode 100644 new mode 100755 diff --git a/English.lproj/DeletionManager.nib/classes.nib b/English.lproj/DeletionManager.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/DeletionManager.nib/info.nib b/English.lproj/DeletionManager.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/DeletionManager.nib/keyedobjects.nib b/English.lproj/DeletionManager.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/EncodingsManager.nib/classes.nib b/English.lproj/EncodingsManager.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/EncodingsManager.nib/info.nib b/English.lproj/EncodingsManager.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/EncodingsManager.nib/keyedobjects.nib b/English.lproj/EncodingsManager.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/Excruciatingly Useful Shortcuts.nvhelp b/English.lproj/Excruciatingly Useful Shortcuts.nvhelp old mode 100644 new mode 100755 diff --git a/English.lproj/ExporterManager.nib/classes.nib b/English.lproj/ExporterManager.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/ExporterManager.nib/info.nib b/English.lproj/ExporterManager.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/ExporterManager.nib/keyedobjects.nib b/English.lproj/ExporterManager.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/FindPanel.nib/classes.nib b/English.lproj/FindPanel.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/FindPanel.nib/info.nib b/English.lproj/FindPanel.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/FindPanel.nib/keyedobjects.nib b/English.lproj/FindPanel.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/FindPanel.strings b/English.lproj/FindPanel.strings old mode 100644 new mode 100755 diff --git a/English.lproj/How does this thing work?.nvhelp b/English.lproj/How does this thing work?.nvhelp old mode 100644 new mode 100755 diff --git a/English.lproj/InfoPlist.strings b/English.lproj/InfoPlist.strings old mode 100644 new mode 100755 diff --git a/English.lproj/KeyDerivationManager.nib/classes.nib b/English.lproj/KeyDerivationManager.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/KeyDerivationManager.nib/info.nib b/English.lproj/KeyDerivationManager.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/KeyDerivationManager.nib/keyedobjects.nib b/English.lproj/KeyDerivationManager.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/KeyDerivationManager~.nib/classes.nib b/English.lproj/KeyDerivationManager~.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/KeyDerivationManager~.nib/info.nib b/English.lproj/KeyDerivationManager~.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/KeyDerivationManager~.nib/keyedobjects.nib b/English.lproj/KeyDerivationManager~.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings old mode 100644 new mode 100755 index ab0942b0..56dc6bd9 Binary files a/English.lproj/Localizable.strings and b/English.lproj/Localizable.strings differ diff --git a/English.lproj/MainMenu-nssplitview.nib/designable.nib b/English.lproj/MainMenu-nssplitview.nib/designable.nib new file mode 100644 index 00000000..37d571cb --- /dev/null +++ b/English.lproj/MainMenu-nssplitview.nib/designable.nib @@ -0,0 +1,4260 @@ + + + + 1040 + 10B504 + 732 + 1038.2 + 437.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 732 + + + YES + + + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + YES + + + YES + + + + YES + + NSApplication + + + FirstResponder + + + NSApplication + + + 15 + 2 + {{201, 181}, {399, 560}} + 1618477056 + Notation + NSWindow + + View + + {3.40282e+38, 3.40282e+38} + {213, 107} + + + 256 + + YES + + + 266 + {{8, 528}, {381, 22}} + + YES + + -1804468671 + 268436480 + + + LucidaGrande + 13 + 1044 + + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor + + 3 + MAA + + + + + + + 274 + + YES + + + 274 + + YES + + + 274 + + YES + + + 2304 + + YES + + + 4352 + {382, 137} + + YES + + + 256 + {382, 17} + + + + + + 256 + {{383, 0}, {16, 17}} + + + + YES + + 3 + 2 + + + 6 + System + gridColor + + 3 + MC41AA + + + 14 + -633307136 + + + 1 + 15 + 0 + YES + 0 + + + {{1, 17}, {382, 140}} + + + + + 6 + System + controlBackgroundColor + + 3 + MC42NjY2NjY2ODY1AA + + + 4 + + + + 256 + {{383, 17}, {15, 140}} + + + _doScroller: + 0.91269838809967041 + + + + -2147483392 + {{-100, -100}, {382, 15}} + + 1 + + _doScroller: + 0.96598637104034424 + + + + 2304 + + YES + + + {{1, 0}, {382, 17}} + + + + + 4 + + + + {399, 158} + + + 18 + + + + + + QSAAAEEgAABBgAAAQYAAAA + + + {399, 158} + + NSView + + + + 274 + + YES + + + 274 + + YES + + + 2304 + + YES + + + 2322 + + YES + + YES + Apple HTML pasteboard type + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + Apple URL pasteboard type + CorePasteboardFlavorType 0x6D6F6F76 + NSColor pasteboard type + NSFilenamesPboardType + NSStringPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT RTFD pasteboard type + NeXT Rich Text Format v1.0 pasteboard type + NeXT TIFF v4.0 pasteboard type + NeXT font pasteboard type + NeXT ruler pasteboard type + WebURLsWithTitlesPboardType + public.url + + + {384, 29} + + + + + + + + + + + YES + + + 6 + + + + 384 + 1 + + + 12263 + 0 + + + + YES + + YES + NSBackgroundColor + NSColor + + + YES + + 6 + System + selectedTextBackgroundColor + + + + 6 + System + selectedTextColor + + + + + + + YES + + YES + NSColor + NSUnderline + + + YES + + 1 + MCAwIDEAA + + + + + + + 6 + {838, 1e+07} + {297, 0} + + + + {{1, 1}, {382, 345}} + + + + + + {4, -5} + 1 + + 4 + + + + 256 + {{383, 1}, {15, 331}} + + + _doScroller: + 1 + + + + -2147483392 + {{-100, -100}, {87, 18}} + + YES + 1 + + _doScroller: + 1 + 0.94565218687057495 + + + {399, 347} + + + 146 + + + + + + {{0, 167}, {399, 347}} + + NSView + + + {399, 514} + + Notation + + + {399, 560} + + + {{0, 0}, {1920, 1178}} + {213, 129} + {3.40282e+38, 3.40282e+38} + NotationWindow + + + MainMenu + + YES + + + Notational Velocity + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + Notational Velocity + + YES + + + About Notational Velocity + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences… + , + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Check for Updates… + + 1048576 + 2147483647 + + + 88 + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + + Services + + + YES + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Hide Notational Velocity + h + 1048576 + 2147483647 + + + + + + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Quit Notational Velocity + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + Note + + 1048576 + 2147483647 + + + submenuAction: + 89 + + Note + + YES + + + Rename + r + 1048576 + 2147483647 + + + 90 + + + + Tag + T + 1048576 + 2147483647 + + + 92 + + + + Delete + CA + 1048576 + 2147483647 + + + 91 + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Search or Create… + l + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Import… + + 1048576 + 2147483647 + + + 93 + + + + Export… + e + 1048576 + 2147483647 + + + 94 + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Page Setup… + P + 1048576 + 2147483647 + + + 95 + + + + Print… + p + 1048576 + 2147483647 + + + 96 + + + + + + + Edit + + 1048576 + 2147483647 + + + submenuAction: + + + Edit + + + YES + + + Undo + z + 1048576 + 2147483647 + + + + + + Redo + Z + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Cut + x + 1048576 + 2147483647 + + + + + + Copy + c + 1048576 + 2147483647 + + + + + + Paste + v + 1048576 + 2147483647 + + + + + + Paste as New Note + V + 1048576 + 2147483647 + + + + + + Clear + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Select All + a + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Find + + 1048576 + 2147483647 + + + submenuAction: + + + Find + + + YES + + + Find… + f + 1048576 + 2147483647 + + + 1 + + + + Find Next + g + 1048576 + 2147483647 + + + 2 + + + + Find Previous + G + 1048576 + 2147483647 + + + 3 + + + + Use Selection for Find + e + 1048576 + 2147483647 + + + 7 + + + + + + + Spelling + + 1048576 + 2147483647 + + + submenuAction: + + Spelling + + YES + + + Spelling… + : + 1048576 + 2147483647 + + + + + + Check Spelling + ; + 1048576 + 2147483647 + + + + + + Check Spelling as You Type + + 1048576 + 2147483647 + + + + + + + + + + + + View + + 1048576 + 2147483647 + + + submenuAction: + + View + + YES + + + Columns + + 1048576 + 2147483647 + + + submenuAction: + 97 + + Columns + + YES + + + Item + + 1048576 + 2147483647 + + + + + + + + + Sort By + + 1048576 + 2147483647 + + + submenuAction: + 98 + + Sort By + + YES + + + Item + + 1048576 + 2147483647 + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Next Note + j + 1048576 + 2147483647 + + + 106 + + + + Previous Note + k + 1048576 + 2147483647 + + + 107 + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Deselect Note(s) + d + 1048576 + 2147483647 + + + 101 + + + + + + + Format + + 1048576 + 2147483647 + + + submenuAction: + + + Format + + + YES + + + Plain Text Style + t + 1048576 + 2147483647 + + + + + + Bold + b + 1048576 + 2147483647 + + + 2 + + Bold + + YES + + YES + NSFont + NSOriginalFont + + + YES + + LucidaGrande-Bold + 14 + 16 + + + + + + + + + Italic + i + 1048576 + 2147483647 + + + 1 + + Italic + + YES + + YES + NSFont + NSOriginalFont + + + YES + + LucidaGrande + 14 + 16 + + + + + + + + + Underline + u + 1048576 + 2147483647 + + + + Underline + + YES + + YES + NSFont + NSOriginalFont + NSUnderline + + + YES + + + + + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Shift Left + [ + 1048576 + 2147483647 + + + + + + Shift Right + ] + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Fix Text Encoding… + + 1048576 + 2147483647 + + + 102 + + + + + + + Bookmarks + + 1048576 + 2147483647 + + + submenuAction: + 103 + + Bookmarks + + YES + + + Item + + 1048576 + 2147483647 + + + + + + + + + Window + + 1048576 + 2147483647 + + + submenuAction: + + + Window + + + YES + + + Minimize + m + 1048576 + 2147483647 + + + + + + Close + w + 1048576 + 2147483647 + + + + + + Zoom + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + + + _NSWindowsMenu + + + + + Help + + 1048576 + 2147483647 + + + submenuAction: + + Help + + YES + + + Notational Velocity Shortcuts + ? + 1048576 + 2147483647 + + + + + + + + _NSMainMenu + + + AppController + + + + 274 + + YES + + + 319 + {{0, 43}, {147, 23}} + + YES + + 67239424 + 138412032 + No Note Selected + + Helvetica + 18 + 16 + + + + 6 + System + controlColor + + + + 3 + MC40OTU5Njc3NDU4AA + + + + + {147, 102} + EmptyView + NSView + + + NSFontManager + + + + + YES + + + performMiniaturize: + + + + 37 + + + + arrangeInFront: + + + + 39 + + + + runPageLayout: + + + + 87 + + + + showHelp: + + + + 122 + + + + terminate: + + + + 139 + + + + orderFrontStandardAboutPanel: + + + + 142 + + + + hideOtherApplications: + + + + 146 + + + + hide: + + + + 152 + + + + unhideAllApplications: + + + + 153 + + + + cut: + + + + 175 + + + + paste: + + + + 176 + + + + redo: + + + + 178 + + + + selectAll: + + + + 179 + + + + undo: + + + + 180 + + + + copy: + + + + 181 + + + + showGuessPanel: + + + + 188 + + + + checkSpelling: + + + + 190 + + + + toggleContinuousSpellChecking: + + + + 192 + + + + performZoom: + + + + 198 + + + + field + + + + 216 + + + + window + + + + 217 + + + + fieldAction: + + + + 218 + + + + delegate + + + + 219 + + + + initialFirstResponder + + + + 227 + + + + delegate + + + + 229 + + + + editorStatusView + + + + 348 + + + + labelText + + + + 350 + + + + nextKeyView + + + + 351 + + + + showPreferencesWindow: + + + + 381 + + + + deleteNote: + + + + 491 + + + + performClose: + + + + 496 + + + + renameNote: + + + + 526 + + + + fixFileEncoding: + + + + 536 + + + + bringFocusToControlField: + + + + 555 + + + + shiftLeftAction: + + + + 568 + + + + shiftRightAction: + + + + 569 + + + + delete: + + + + 773 + + + + defaultStyle: + + + + 978 + + + + bold: + + + + 981 + + + + italic: + + + + 982 + + + + underlineNV: + + + + 984 + + + + performFindPanelAction: + + + + 985 + + + + importNotes: + + + + 986 + + + + printNote: + + + + 987 + + + + exportNote: + + + + 988 + + + + tagNote: + + + + 995 + + + + controlField + + + + 1019 + + + + delegate + + + + 1020 + + + + notesTableView + + + + 1021 + + + + nextKeyView + + + + 1022 + + + + controlField + + + + 1023 + + + + delegate + + + + 1024 + + + + nextKeyView + + + + 1025 + + + + nextKeyView + + + + 1026 + + + + notesTableView + + + + 1027 + + + + textView + + + + 1030 + + + + notesTable + + + + 1031 + + + + nextKeyView + + + + 1032 + + + + incrementNoteSelection: + + + + 1035 + + + + incrementNoteSelection: + + + + 1036 + + + + paste: + + + + 1037 + + + + deselectAll: + + + + 1038 + + + + delegate + + + + 1040 + + + + delegate + + + + 1041 + + + + performFindPanelAction: + + + + 1042 + + + + performFindPanelAction: + + + + 1043 + + + + performFindPanelAction: + + + + 1044 + + + + sparkleUpdateItem + + + + 1052 + + + + nextKeyView + + + + 1082 + + + + splitView + + + + 1083 + + + + delegate + + + + 1084 + + + + + YES + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + 21 + + + YES + + + + notation + + + 2 + + + YES + + + + + + + 206 + + + YES + + + + + + 29 + + + YES + + + + + + + + + + + MainMenu + + + 19 + + + YES + + + + + + 24 + + + YES + + + + + + + + + + 5 + + + + + 23 + + + + + 92 + + + + + 197 + + + + + 489 + + + + + 56 + + + YES + + + + + + 57 + + + YES + + + + + + + + + + + + + + + + + + 58 + + + + + 129 + + + + + 131 + + + YES + + + + + + 130 + + + + + 134 + + + + + 136 + + + + + 143 + + + + + 144 + + + + + 145 + + + + + 149 + + + + + 150 + + + + + 196 + + + + + 990 + + + + + 991 + + + + + 83 + + + YES + + + + + + 81 + + + YES + + + + + + + + + + + + + + + + 77 + + + + + 78 + + + + + 79 + + + + + 392 + + + + + 393 + + + + + 394 + + + + + 395 + + + + + 396 + + + + + 553 + + + + + 554 + + + + + 994 + + + + + 103 + + + YES + + + + + + 106 + + + YES + + + + + + 111 + + + + + 163 + + + YES + + + + + + 169 + + + YES + + + + + + + + + + + + + + + + + + 156 + + + + + 157 + + + + + 158 + + + + + 160 + + + + + 168 + + + YES + + + + + + 159 + + + YES + + + + + + + + + 154 + + + + + 161 + + + + + 162 + + + + + 167 + + + + + 171 + + + + + 172 + + + + + 173 + + + + + 184 + + + YES + + + + + + 185 + + + YES + + + + + + + + 187 + + + + + 189 + + + + + 191 + + + + + 550 + + + + + 557 + + + + + 771 + + + + + 1000 + + + + + 382 + + + YES + + + + + + 383 + + + YES + + + + + + + + + + + + 386 + + + YES + + + + + + 387 + + + YES + + + + + + 388 + + + + + 389 + + + YES + + + + + + 390 + + + YES + + + + + + 391 + + + + + 507 + + + + + 508 + + + + + 520 + + + + + 521 + + + + + 522 + + + + + 397 + + + YES + + + + + + 398 + + + YES + + + + + + + + + + + + + + 534 + + + + + 563 + + + + + 564 + + + + + 565 + + + + + 574 + + + + + 575 + + + + + 576 + + + + + 577 + + + + + 977 + + + + + 996 + + + YES + + + + + + 997 + + + YES + + + + + + 998 + + + + + 213 + + + AppController + + + 341 + + + YES + + + + editorStatus + + + 342 + + + YES + + + + + + 452 + + + Font Manager + + + 1054 + + + + + 1055 + + + + + -3 + + + Application + + + 1061 + + + YES + + + + + + + 1063 + + + YES + + + + + + 1062 + + + YES + + + + + + 1013 + + + YES + + + + + + + + + 1014 + + + + + 1056 + + + + + 1057 + + + + + 1058 + + + + + 1016 + + + YES + + + + + + + + 1017 + + + + + 1059 + + + + + 1060 + + + + + + + YES + + YES + 1000.IBPluginDependency + 1000.ImportedFromIB2 + 1013.IBPluginDependency + 1013.ImportedFromIB2 + 1014.CustomClassName + 1014.IBPluginDependency + 1014.ImportedFromIB2 + 1016.CustomClassName + 1016.IBPluginDependency + 1016.ImportedFromIB2 + 1017.CustomClassName + 1017.IBPluginDependency + 1017.ImportedFromIB2 + 103.IBPluginDependency + 103.ImportedFromIB2 + 1056.IBShouldRemoveOnLegacySave + 1057.IBShouldRemoveOnLegacySave + 1058.IBShouldRemoveOnLegacySave + 1059.IBShouldRemoveOnLegacySave + 106.IBPluginDependency + 106.ImportedFromIB2 + 1060.IBShouldRemoveOnLegacySave + 1061.IBEditorWindowLastContentRect + 1061.IBPluginDependency + 1062.IBPluginDependency + 1063.IBPluginDependency + 111.IBPluginDependency + 111.ImportedFromIB2 + 129.IBPluginDependency + 129.ImportedFromIB2 + 130.IBPluginDependency + 130.ImportedFromIB2 + 131.IBPluginDependency + 131.ImportedFromIB2 + 134.IBPluginDependency + 134.ImportedFromIB2 + 136.IBPluginDependency + 136.ImportedFromIB2 + 143.IBPluginDependency + 143.ImportedFromIB2 + 144.IBPluginDependency + 144.ImportedFromIB2 + 145.IBPluginDependency + 145.ImportedFromIB2 + 149.IBPluginDependency + 149.ImportedFromIB2 + 150.IBPluginDependency + 150.ImportedFromIB2 + 154.IBPluginDependency + 154.ImportedFromIB2 + 156.IBPluginDependency + 156.ImportedFromIB2 + 157.IBPluginDependency + 157.ImportedFromIB2 + 158.IBPluginDependency + 158.ImportedFromIB2 + 159.IBPluginDependency + 159.ImportedFromIB2 + 160.IBPluginDependency + 160.ImportedFromIB2 + 161.IBPluginDependency + 161.ImportedFromIB2 + 162.IBPluginDependency + 162.ImportedFromIB2 + 163.IBPluginDependency + 163.ImportedFromIB2 + 167.IBPluginDependency + 167.ImportedFromIB2 + 168.IBPluginDependency + 168.ImportedFromIB2 + 169.IBEditorWindowLastContentRect + 169.IBPluginDependency + 169.ImportedFromIB2 + 171.IBPluginDependency + 171.ImportedFromIB2 + 172.IBPluginDependency + 172.ImportedFromIB2 + 173.IBPluginDependency + 173.ImportedFromIB2 + 184.IBPluginDependency + 184.ImportedFromIB2 + 185.IBPluginDependency + 185.ImportedFromIB2 + 187.IBPluginDependency + 187.ImportedFromIB2 + 189.IBPluginDependency + 189.ImportedFromIB2 + 19.IBPluginDependency + 19.ImportedFromIB2 + 191.IBPluginDependency + 191.ImportedFromIB2 + 196.IBPluginDependency + 196.ImportedFromIB2 + 197.IBPluginDependency + 197.ImportedFromIB2 + 2.IBPluginDependency + 2.ImportedFromIB2 + 206.CustomClassName + 206.IBPluginDependency + 206.ImportedFromIB2 + 21.IBEditorWindowLastContentRect + 21.IBPluginDependency + 21.IBWindowTemplateEditedContentRect + 21.ImportedFromIB2 + 21.NSWindowTemplate.visibleAtLaunch + 21.windowTemplate.hasMinSize + 21.windowTemplate.minSize + 213.ImportedFromIB2 + 23.IBPluginDependency + 23.ImportedFromIB2 + 24.IBEditorWindowLastContentRect + 24.IBPluginDependency + 24.ImportedFromIB2 + 29.IBEditorWindowLastContentRect + 29.IBPluginDependency + 29.ImportedFromIB2 + 341.IBPluginDependency + 341.ImportedFromIB2 + 342.IBPluginDependency + 342.ImportedFromIB2 + 382.IBPluginDependency + 382.ImportedFromIB2 + 383.IBEditorWindowLastContentRect + 383.IBPluginDependency + 383.ImportedFromIB2 + 386.IBPluginDependency + 386.ImportedFromIB2 + 387.IBPluginDependency + 387.ImportedFromIB2 + 388.IBPluginDependency + 388.ImportedFromIB2 + 389.IBPluginDependency + 389.ImportedFromIB2 + 390.IBPluginDependency + 390.ImportedFromIB2 + 391.IBPluginDependency + 391.ImportedFromIB2 + 392.IBPluginDependency + 392.ImportedFromIB2 + 393.IBPluginDependency + 393.ImportedFromIB2 + 394.IBPluginDependency + 394.ImportedFromIB2 + 395.IBPluginDependency + 395.ImportedFromIB2 + 396.IBPluginDependency + 396.ImportedFromIB2 + 397.IBPluginDependency + 397.ImportedFromIB2 + 398.IBEditorWindowLastContentRect + 398.IBPluginDependency + 398.ImportedFromIB2 + 452.ImportedFromIB2 + 489.IBPluginDependency + 489.ImportedFromIB2 + 5.IBPluginDependency + 5.ImportedFromIB2 + 507.IBPluginDependency + 507.ImportedFromIB2 + 508.IBPluginDependency + 508.ImportedFromIB2 + 520.IBPluginDependency + 520.ImportedFromIB2 + 521.IBPluginDependency + 521.ImportedFromIB2 + 522.IBPluginDependency + 522.ImportedFromIB2 + 534.IBPluginDependency + 534.ImportedFromIB2 + 550.IBPluginDependency + 550.ImportedFromIB2 + 553.IBPluginDependency + 553.ImportedFromIB2 + 554.IBPluginDependency + 554.ImportedFromIB2 + 557.IBPluginDependency + 557.ImportedFromIB2 + 56.IBPluginDependency + 56.ImportedFromIB2 + 563.IBPluginDependency + 563.ImportedFromIB2 + 564.IBPluginDependency + 564.ImportedFromIB2 + 565.IBPluginDependency + 565.ImportedFromIB2 + 57.IBPluginDependency + 57.ImportedFromIB2 + 574.IBPluginDependency + 574.ImportedFromIB2 + 575.IBPluginDependency + 575.ImportedFromIB2 + 576.IBPluginDependency + 576.ImportedFromIB2 + 577.IBPluginDependency + 577.ImportedFromIB2 + 58.IBPluginDependency + 58.ImportedFromIB2 + 77.IBPluginDependency + 77.ImportedFromIB2 + 771.IBPluginDependency + 771.ImportedFromIB2 + 78.IBPluginDependency + 78.ImportedFromIB2 + 79.IBPluginDependency + 79.ImportedFromIB2 + 81.IBEditorWindowLastContentRect + 81.IBPluginDependency + 81.ImportedFromIB2 + 83.IBPluginDependency + 83.ImportedFromIB2 + 92.IBPluginDependency + 92.ImportedFromIB2 + 977.IBPluginDependency + 977.ImportedFromIB2 + 990.IBPluginDependency + 990.ImportedFromIB2 + 991.IBPluginDependency + 991.ImportedFromIB2 + 994.IBPluginDependency + 994.ImportedFromIB2 + 996.IBPluginDependency + 996.ImportedFromIB2 + 997.IBEditorWindowLastContentRect + 997.IBPluginDependency + 997.ImportedFromIB2 + 998.IBPluginDependency + 998.ImportedFromIB2 + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + NotesTableView + com.apple.InterfaceBuilder.CocoaPlugin + + FocusRingScrollView + com.apple.InterfaceBuilder.CocoaPlugin + + LinkingEditor + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + {{810, 50}, {494, 563}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{217, 881}, {214, 233}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + DualField + com.apple.InterfaceBuilder.CocoaPlugin + + {{24, 498}, {399, 560}} + com.apple.InterfaceBuilder.CocoaPlugin + {{24, 498}, {399, 560}} + + + + {213, 107} + + com.apple.InterfaceBuilder.CocoaPlugin + + {{471, 1021}, {194, 93}} + com.apple.InterfaceBuilder.CocoaPlugin + + {{0, 1114}, {603, 20}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{261, 991}, {187, 123}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{311, 951}, {211, 163}} + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{167, 921}, {222, 193}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{377, 1091}, {97, 23}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + YES + + + YES + + + + + YES + + + YES + + + + 1084 + + + + YES + + AppController + NSObject + + YES + + YES + bringFocusToControlField: + deleteNote: + exportNote: + fieldAction: + importNotes: + printNote: + renameNote: + showPreferencesWindow: + tagNote: + + + YES + id + id + id + id + id + id + id + id + id + + + + YES + + YES + editorStatusView + field + notesTableView + sparkleUpdateItem + splitView + textView + window + + + YES + EmptyView + DualField + NotesTableView + NSMenuItem + NSSplitView + LinkingEditor + NSWindow + + + + IBProjectSource + AppController.h + + + + AppController + NSObject + + YES + + YES + fixFileEncoding: + newNoteWithClipboard: + + + YES + id + id + + + + IBUserSource + + + + + DualField + NSTextField + + notesTable + NSTableView + + + IBProjectSource + DualField.h + + + + DualField + NSTextField + + IBUserSource + + + + + EmptyView + NSView + + labelText + NSTextField + + + IBProjectSource + EmptyView.h + + + + EmptyView + NSView + + IBUserSource + + + + + FirstResponder + + YES + + YES + bold: + defaultStyle: + deleteToBeginningOfLine: + deleteWordBackward: + italic: + shiftLeftAction: + shiftRightAction: + underlineNV: + + + YES + id + id + id + id + id + id + id + id + + + + IBUserSource + + + + + FocusRingScrollView + NSScrollView + + IBProjectSource + FocusRingScrollView.h + + + + FocusRingScrollView + NSScrollView + + IBUserSource + + + + + LinkingEditor + NSTextView + + YES + + YES + bold: + defaultStyle: + italic: + underlineNV: + + + YES + id + id + id + id + + + + YES + + YES + controlField + notesTableView + + + YES + NSTextField + NotesTableView + + + + IBProjectSource + LinkingEditor.h + + + + LinkingEditor + + YES + + YES + shiftLeftAction: + shiftRightAction: + + + YES + id + id + + + + IBProjectSource + LinkingEditor_Indentation.h + + + + LinkingEditor + NSTextView + + IBUserSource + + + + + NSObject + + IBProjectSource + GlobalPrefs.h + + + + NSObject + + IBProjectSource + NotationController.h + + + + NSObject + + IBProjectSource + NoteObject.h + + + + NSObject + + IBProjectSource + PassphrasePicker.h + + + + NSTableView + + IBProjectSource + NotesTableView.h + + + + NSTextView + + + + NSTextView + NSText + + performFindPanelAction: + id + + + IBUserSource + + + + + NSWindow + + IBProjectSource + PrefsWindowController.h + + + + NotesTableView + NSTableView + + YES + + YES + actionHideShowColumn: + incrementNoteSelection: + + + YES + id + id + + + + controlField + NSTextField + + + + + NotesTableView + NSTableView + + paste: + id + + + IBUserSource + + + + + + YES + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSHelpManager.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSPageLayout.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + + + NSBrowser + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSBrowser.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSDocument + NSObject + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + id + id + id + id + id + id + + + + IBFrameworkSource + AppKit.framework/Headers/NSDocument.h + + + + NSDocument + + IBFrameworkSource + AppKit.framework/Headers/NSDocumentScripting.h + + + + NSFontManager + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSMatrix + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSMatrix.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSMenuItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSMovieView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMovieView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + + NSObject + + IBFrameworkSource + PrintCore.framework/Headers/PDEPluginInterface.h + + + + NSObject + + IBFrameworkSource + SecurityInterface.framework/Headers/SFAuthorizationView.h + + + + NSObject + + IBFrameworkSource + SecurityInterface.framework/Headers/SFCertificatePanel.h + + + + NSObject + + IBFrameworkSource + SecurityInterface.framework/Headers/SFChooseIdentityPanel.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUAppcast.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebDownload.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebEditingDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebFrameLoadDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebJavaPlugIn.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPlugin.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPluginContainer.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPolicyDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebResourceLoadDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebScriptObject.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebUIDelegate.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSScrollView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSScrollView.h + + + + NSScroller + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSScroller.h + + + + NSSplitView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSSplitView.h + + + + NSTableHeaderView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTableHeaderView.h + + + + NSTableView + NSControl + + + + NSText + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSText.h + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSTextView + NSText + + IBFrameworkSource + AppKit.framework/Headers/NSTextView.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSWindow + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSWindowScripting.h + + + + WebView + NSView + + YES + + YES + goBack: + goForward: + makeTextLarger: + makeTextSmaller: + makeTextStandardSize: + reload: + reloadFromOrigin: + stopLoading: + takeStringURLFrom: + toggleContinuousSpellChecking: + toggleSmartInsertDelete: + + + YES + id + id + id + id + id + id + id + id + id + id + id + + + + IBFrameworkSource + WebKit.framework/Headers/WebView.h + + + + + 0 + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + ../Notation.xcodeproj + 3 + + diff --git a/English.lproj/MainMenu-nssplitview.nib/keyedobjects.nib b/English.lproj/MainMenu-nssplitview.nib/keyedobjects.nib new file mode 100644 index 00000000..d8ca5a14 Binary files /dev/null and b/English.lproj/MainMenu-nssplitview.nib/keyedobjects.nib differ diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index 88e34e7b..d2e65fb7 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/English.lproj/MainMenu~.nib/classes.nib b/English.lproj/MainMenu~.nib/classes.nib new file mode 100644 index 00000000..973650b1 --- /dev/null +++ b/English.lproj/MainMenu~.nib/classes.nib @@ -0,0 +1,113 @@ +{ + IBClasses = ( + { + ACTIONS = { + bringFocusToControlField = id; + deleteNote = id; + exportNote = id; + fieldAction = id; + fixFileEncoding = id; + importNotes = id; + newNoteWithClipboard = id; + printNote = id; + renameNote = id; + showPreferencesWindow = id; + tagNote = id; + }; + CLASS = AppController; + LANGUAGE = ObjC; + OUTLETS = { + editorStatusView = EmptyView; + field = DualField; + notesTableView = NotesTableView; + sparkleUpdateItem = NSMenuItem; + splitSubview = RBSplitSubview; + splitView = RBSplitView; + textView = LinkingEditor; + window = NSWindow; + }; + SUPERCLASS = NSObject; + }, + { + CLASS = DualField; + LANGUAGE = ObjC; + OUTLETS = { + notesTable = NotesTableView; + }; + SUPERCLASS = NSTextField; + }, + { + CLASS = EmptyView; + LANGUAGE = ObjC; + OUTLETS = { + labelText = NSTextField; + }; + SUPERCLASS = NSView; + }, + { + ACTIONS = { + bold = id; + defaultStyle = id; + deleteToBeginningOfLine = id; + deleteWordBackward = id; + italic = id; + shiftLeftAction = id; + shiftRightAction = id; + underlineNV = id; + }; + CLASS = FirstResponder; + LANGUAGE = ObjC; + SUPERCLASS = NSObject; + }, + { + CLASS = FocusRingScrollView; + LANGUAGE = ObjC; + SUPERCLASS = NSScrollView; + }, + { + CLASS = HeaderViewWithMenu; + LANGUAGE = ObjC; + SUPERCLASS = NSTableHeaderView; + }, + { + ACTIONS = { + bold = id; + italic = id; + underlineNV = id; + }; + CLASS = LinkingEditor; + LANGUAGE = ObjC; + OUTLETS = { + controlField = DualField; + notesTableView = id; + }; + SUPERCLASS = NSTextView; + }, + { + ACTIONS = { + performFindPanelAction = id; + }; + CLASS = NSTextView; + LANGUAGE = ObjC; + SUPERCLASS = NSText; + }, + { + CLASS = NoteAttributeColumn; + LANGUAGE = ObjC; + SUPERCLASS = NSTableColumn; + }, + { + ACTIONS = { + incrementNoteSelection = id; + paste = id; + }; + CLASS = NotesTableView; + LANGUAGE = ObjC; + OUTLETS = { + controlField = NSTextField; + }; + SUPERCLASS = NSTableView; + } + ); + IBVersion = 1; +} \ No newline at end of file diff --git a/English.lproj/MainMenu~.nib/data.dependency b/English.lproj/MainMenu~.nib/data.dependency new file mode 100644 index 00000000..71914e28 --- /dev/null +++ b/English.lproj/MainMenu~.nib/data.dependency @@ -0,0 +1,10 @@ + + + + + IBPaletteDependency + + RBSplitView + + + diff --git a/English.lproj/MainMenu~.nib/info.nib b/English.lproj/MainMenu~.nib/info.nib new file mode 100644 index 00000000..facc8b7d --- /dev/null +++ b/English.lproj/MainMenu~.nib/info.nib @@ -0,0 +1,31 @@ + + + + + IBDocumentLocation + 112 343 380 431 0 0 1680 1028 + IBEditorPositions + + 29 + 34 1134 574 44 0 0 1920 1178 + 341 + 735 613 167 144 0 0 1680 1028 + + IBFramework Version + 489.0 + IBLockedObjects + + 233 + 208 + + IBOldestOS + 3 + IBOpenObjects + + 21 + 29 + + IBSystem Version + 9L30 + + diff --git a/English.lproj/MainMenu~.nib/keyedobjects.nib b/English.lproj/MainMenu~.nib/keyedobjects.nib new file mode 100644 index 00000000..88e34e7b Binary files /dev/null and b/English.lproj/MainMenu~.nib/keyedobjects.nib differ diff --git a/English.lproj/NotationPrefsView.nib/classes.nib b/English.lproj/NotationPrefsView.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/NotationPrefsView.nib/info.nib b/English.lproj/NotationPrefsView.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/NotationPrefsView.nib/keyedobjects.nib b/English.lproj/NotationPrefsView.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PTKeyComboPanel.nib/classes.nib b/English.lproj/PTKeyComboPanel.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PTKeyComboPanel.nib/info.nib b/English.lproj/PTKeyComboPanel.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PTKeyComboPanel.nib/keyedobjects.nib b/English.lproj/PTKeyComboPanel.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PTKeyComboPanel~.nib/classes.nib b/English.lproj/PTKeyComboPanel~.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PTKeyComboPanel~.nib/info.nib b/English.lproj/PTKeyComboPanel~.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PTKeyComboPanel~.nib/keyedobjects.nib b/English.lproj/PTKeyComboPanel~.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PassphraseChanger.nib/classes.nib b/English.lproj/PassphraseChanger.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PassphraseChanger.nib/info.nib b/English.lproj/PassphraseChanger.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PassphraseChanger.nib/keyedobjects.nib b/English.lproj/PassphraseChanger.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PassphrasePicker.nib/classes.nib b/English.lproj/PassphrasePicker.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PassphrasePicker.nib/info.nib b/English.lproj/PassphrasePicker.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PassphrasePicker.nib/keyedobjects.nib b/English.lproj/PassphrasePicker.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PassphraseRetriever.nib/classes.nib b/English.lproj/PassphraseRetriever.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PassphraseRetriever.nib/info.nib b/English.lproj/PassphraseRetriever.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/PassphraseRetriever.nib/keyedobjects.nib b/English.lproj/PassphraseRetriever.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/Preferences.nib/classes.nib b/English.lproj/Preferences.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/SavedSearches.nib/classes.nib b/English.lproj/SavedSearches.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/SavedSearches.nib/info.nib b/English.lproj/SavedSearches.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/SavedSearches.nib/keyedobjects.nib b/English.lproj/SavedSearches.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/SavedSearches~.nib/classes.nib b/English.lproj/SavedSearches~.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/SavedSearches~.nib/info.nib b/English.lproj/SavedSearches~.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/SavedSearches~.nib/keyedobjects.nib b/English.lproj/SavedSearches~.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/TagEditingManager.nib/classes.nib b/English.lproj/TagEditingManager.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/TagEditingManager.nib/info.nib b/English.lproj/TagEditingManager.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/TagEditingManager.nib/keyedobjects.nib b/English.lproj/TagEditingManager.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/This is the title of a note.nvhelp b/English.lproj/This is the title of a note.nvhelp old mode 100644 new mode 100755 diff --git a/English.lproj/URLGetter.nib/classes.nib b/English.lproj/URLGetter.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/URLGetter.nib/info.nib b/English.lproj/URLGetter.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/URLGetter.nib/keyedobjects.nib b/English.lproj/URLGetter.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/English.lproj/URLGetter~.nib/classes.nib b/English.lproj/URLGetter~.nib/classes.nib old mode 100644 new mode 100755 diff --git a/English.lproj/URLGetter~.nib/info.nib b/English.lproj/URLGetter~.nib/info.nib old mode 100644 new mode 100755 diff --git a/English.lproj/URLGetter~.nib/keyedobjects.nib b/English.lproj/URLGetter~.nib/keyedobjects.nib old mode 100644 new mode 100755 diff --git a/ExporterManager.h b/ExporterManager.h old mode 100644 new mode 100755 diff --git a/ExporterManager.m b/ExporterManager.m old mode 100644 new mode 100755 diff --git a/FSExchangeObjectsCompat.c b/FSExchangeObjectsCompat.c old mode 100644 new mode 100755 index 30457ef3..8c9e864e --- a/FSExchangeObjectsCompat.c +++ b/FSExchangeObjectsCompat.c @@ -4,36 +4,34 @@ */ #include "FSExchangeObjectsCompat.h" +#include +#include +#include -#define GetVolParmsInfoExtendedAttributes(volParms) (((volParms)->vMVersion >= 3) ? (volParms)->vMExtendedAttributes : 0) +__private_extern__ u_int32_t volumeCapabilities(const char *path) +{ + struct attrlist alist; + bzero(&alist, sizeof(alist)); + alist.bitmapcount = ATTR_BIT_MAP_COUNT; + alist.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES; // XXX: VOL_INFO must always be set -OSErr FSGetVolParms(FSVolumeRefNum volRefNum, UInt32 bufferSize, GetVolParmsInfoBuffer *volParmsInfo, UInt32 *actualInfoSize) { - OSErr result; - HParamBlockRec pb; - - /* check parameters */ - require_action((NULL != volParmsInfo) && (NULL != actualInfoSize), - BadParameter, result = paramErr); - - pb.ioParam.ioNamePtr = NULL; - pb.ioParam.ioVRefNum = volRefNum; - pb.ioParam.ioBuffer = (Ptr)volParmsInfo; - pb.ioParam.ioReqCount = (SInt32)bufferSize; - result = PBHGetVolParmsSync(&pb); - require_noerr(result, PBHGetVolParmsSync); - - /* return number of bytes the file system returned in volParmsInfo buffer */ - *actualInfoSize = (UInt32)pb.ioParam.ioActCount; - -PBHGetVolParmsSync: -BadParameter: - - return ( result ); + struct { + u_int32_t v_size; + /* Fixed storage */ + vol_capabilities_attr_t v_caps; + } vinfo; + bzero(&vinfo, sizeof(vinfo)); + if (0 == getattrlist(path, &alist, &vinfo, sizeof(vinfo), 0) + && 0 != (alist.volattr & ATTR_VOL_CAPABILITIES)) { + return (vinfo.v_caps.capabilities[VOL_CAPABILITIES_FORMAT]); + } + + return (0); } -Boolean VolSupportsFSExchangeObjects(const GetVolParmsInfoBuffer *volParms) +Boolean VolSupportsFSExchangeObjects(u_int32_t volCapabilities) { - return ( (GetVolParmsInfoExtendedAttributes(volParms) & (1L << bSupportsFSExchangeObjects)) != 0 ); + return ( 0 != (volCapabilities & VOL_CAP_INT_EXCHANGEDATA)); } @@ -96,23 +94,19 @@ static OSErr GenerateUniqueHFSUniStr(long *startSeed, const FSRef *dir1, const F } Boolean VolumeOfFSRefSupportsExchangeObjects(const FSRef *fsRef) { - OSErr result; - GetVolParmsInfoBuffer volParmsInfo; - FSCatalogInfo sourceCatalogInfo; - UInt32 infoSize; - - /* get source volume's vRefNum */ - result = FSGetCatalogInfo(fsRef, kFSCatInfoVolume, &sourceCatalogInfo, NULL, NULL, NULL); - require_noerr(result, DetermineSourceVRefNumFailed); + /* get source volume's path */ + char path[PATH_MAX+1]; + (void)FSRefMakePath(fsRef, (UInt8*)path, PATH_MAX); + + char root[PATH_MAX+1]; + root[0] = root[PATH_MAX] = 0; + struct statfs sb; + if (0 == statfs(path, &sb)) { + bcopy(sb.f_mntonname, root, MIN(PATH_MAX, sizeof(sb.f_mntonname))); + } /* see if that volume supports FSExchangeObjects */ - result = FSGetVolParms(sourceCatalogInfo.volume, sizeof(GetVolParmsInfoBuffer), - &volParmsInfo, &infoSize); - return (noErr == result) && VolSupportsFSExchangeObjects(&volParmsInfo); - -DetermineSourceVRefNumFailed: - - return false; + return (VolSupportsFSExchangeObjects(volumeCapabilities(root))); } OSErr FSExchangeObjectsEmulate(const FSRef *sourceRef, const FSRef *destRef, FSRef *newSourceRef, FSRef *newDestRef) { diff --git a/FSExchangeObjectsCompat.h b/FSExchangeObjectsCompat.h old mode 100644 new mode 100755 diff --git a/FastListDataSource.h b/FastListDataSource.h old mode 100644 new mode 100755 index 9ef32d79..31123f92 --- a/FastListDataSource.h +++ b/FastListDataSource.h @@ -11,25 +11,25 @@ @interface FastListDataSource : NSObject { id *objects; - unsigned int count; + NSUInteger count; IMP objRetain, objRelease; } - (id)initWithClass:(Class)aClass; - (const id *)immutableObjects; -- (unsigned int)count; +- (NSUInteger)count; -- (unsigned)indexOfObjectIdenticalTo:(id)address; +- (NSUInteger)indexOfObjectIdenticalTo:(id)address; - (NSArray*)objectsAtFilteredIndexes:(NSIndexSet*)indexSet; - (void)fillArrayFromArray:(NSArray*)array; - (BOOL)filterArrayUsingFunction:(BOOL (*)(id, void*))present context:(void*)context; -- (void)sortStableUsingFunction:(int (*)(id *, id *))compare; +- (void)sortStableUsingFunction:(NSInteger (*)(id *, id *))compare; - (void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject - forTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex; -- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex; -- (int)numberOfRowsInTableView:(NSTableView *)aTableView; + forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex; +- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex; +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView; @end diff --git a/FastListDataSource.m b/FastListDataSource.m old mode 100644 new mode 100755 index c1679ad3..7dbe3609 --- a/FastListDataSource.m +++ b/FastListDataSource.m @@ -31,12 +31,12 @@ - (const id *)immutableObjects { return (const id *)objects; } -- (unsigned int)count { +- (NSUInteger)count { return count; } -- (unsigned)indexOfObjectIdenticalTo:(id)address { - register unsigned i; +- (NSUInteger)indexOfObjectIdenticalTo:(id)address { + register NSUInteger i; if (address) { for (i=0; iCFBundleExecutable Notational Velocity CFBundleGetInfoString - 2.0 β0, Copyright © 2009 Zachary Schneirov, All Rights Reserved. + 2.0 β1, Copyright © 2009 Zachary Schneirov, All Rights Reserved. CFBundleIconFile Notality CFBundleIdentifier @@ -142,13 +142,28 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0 β0 + 2.0 β1 CFBundleSignature N†l√ CFBundleVersion - 2.0 β0 + 2.0 β1 LSMinimumSystemVersion 10.3.9 + LSMinimumSystemVersionByArchitecture + + i386 + 10.4.4 + x86_64 + 10.6.0 + ppc + 10.3.9 + + LSArchitecturePriority + + x86_64 + i386 + ppc + NSMainNibFile MainMenu NSPrincipalClass diff --git a/KeyDerivationDelaySlider.h b/KeyDerivationDelaySlider.h old mode 100644 new mode 100755 diff --git a/KeyDerivationDelaySlider.m b/KeyDerivationDelaySlider.m old mode 100644 new mode 100755 diff --git a/KeyDerivationManager.h b/KeyDerivationManager.h old mode 100644 new mode 100755 diff --git a/KeyDerivationManager.m b/KeyDerivationManager.m old mode 100644 new mode 100755 diff --git a/LabelEditor.h b/LabelEditor.h old mode 100644 new mode 100755 diff --git a/LabelEditor.m b/LabelEditor.m old mode 100644 new mode 100755 diff --git a/LabelObject.h b/LabelObject.h old mode 100644 new mode 100755 diff --git a/LabelObject.m b/LabelObject.m old mode 100644 new mode 100755 diff --git a/LabelsListController.h b/LabelsListController.h old mode 100644 new mode 100755 diff --git a/LabelsListController.m b/LabelsListController.m old mode 100644 new mode 100755 index 2a198b0c..bb95c477 --- a/LabelsListController.m +++ b/LabelsListController.m @@ -59,8 +59,8 @@ - (NSSet*)notesAtFilteredIndex:(int)labelIndex { //figure out which notes to display given some selected labels - (NSSet*)notesAtFilteredIndexes:(NSIndexSet*)anIndexSet { - unsigned int i, numLabels = [anIndexSet count]; - unsigned int *labelsBuffer = malloc(numLabels * sizeof(unsigned int)); + NSUInteger i, numLabels = [anIndexSet count]; + NSUInteger *labelsBuffer = malloc(numLabels * sizeof(NSUInteger)); NSRange range = NSMakeRange([anIndexSet firstIndex], ([anIndexSet lastIndex]-[anIndexSet firstIndex]) + 1); [anIndexSet getIndexes:labelsBuffer maxCount:numLabels inIndexRange:&range]; diff --git a/License.txt b/License.txt old mode 100644 new mode 100755 diff --git a/LinkingEditor.h b/LinkingEditor.h old mode 100644 new mode 100755 diff --git a/LinkingEditor.m b/LinkingEditor.m old mode 100644 new mode 100755 index f3f30d68..4df4ccbd --- a/LinkingEditor.m +++ b/LinkingEditor.m @@ -11,6 +11,11 @@ #import "NSString_NV.h" #include +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +#include +#endif + +static long (*GetGetScriptManagerVariablePointer())(short); @implementation LinkingEditor @@ -717,7 +722,7 @@ - (IBAction)performFindPanelAction:(id)sender { rowNumber = (tag == NSFindPanelActionPrevious ? totalNotes - 1 : 0); - } else if (textFinder && [textFinder lastFindWasSuccessful] == LAST_FIND_NO && //if the last find op. didn't work + } else if (textFinder && [textFinder nv_lastFindWasSuccessful] == LAST_FIND_NO && //if the last find op. didn't work selectedRangeDuringFind.location == [self selectedRange].location && //and user didn't change the selection noteDuringFind == [controller selectedNoteObject] && //or select a different note [stringDuringFind isEqualToString:currentFindString]) { //or type a new search string @@ -857,7 +862,7 @@ - (void)insertTabIgnoringFieldEditor:(id)sender { } }*/ -- (BOOL)validateMenuItem:(id )menuItem { +- (BOOL)validateMenuItem:(NSMenuItem*)menuItem { //need to fix this for better style detection SEL action = [menuItem action]; @@ -953,7 +958,7 @@ - (id)highlightLinkAtIndex:(unsigned)givenIndex { return aLink; } -- (void)clickedOnLink:(id)aLink atIndex:(unsigned)charIndex { +- (void)clickedOnLink:(id)aLink atIndex:(NSUInteger)charIndex { NSEvent *currentEvent = [[self window] currentEvent]; if (![prefsController URLsAreClickable] && [currentEvent modifierFlags] & NSCommandKeyMask) { @@ -1027,13 +1032,13 @@ - (BOOL)shouldChangeTextInRange:(NSRange)affectedCharRange replacementString:(NS //changedRange = NSMakeRange(affectedCharRange.location, affectedCharRange.length); - int begin = [string rangeOfCharacterFromSet:separatorCharacterSet options:NSBackwardsSearch + NSUInteger begin = [string rangeOfCharacterFromSet:separatorCharacterSet options:NSBackwardsSearch range:NSMakeRange(0, affectedCharRange.location)].location; if (begin == NSNotFound) { begin = 0; } - int end = [string rangeOfCharacterFromSet:separatorCharacterSet options:0 + NSUInteger end = [string rangeOfCharacterFromSet:separatorCharacterSet options:0 range:NSMakeRange(affectedCharRange.location + affectedCharRange.length, [string length] - (affectedCharRange.location + affectedCharRange.length))].location; if (end == NSNotFound) { @@ -1062,15 +1067,49 @@ - (BOOL)shouldChangeTextInRange:(NSRange)affectedCharRange replacementString:(NS return [super shouldChangeTextInRange:affectedCharRange replacementString:replacementString]; } +static long (*GetGetScriptManagerVariablePointer())(short) { + static long (*_GetScriptManagerVariablePointer)(short) = NULL; + if (!_GetScriptManagerVariablePointer) { + NSLog(@"looking up"); + CFBundleRef csBundle = CFBundleCreate(NULL, CFURLCreateWithFileSystemPath(NULL, CFSTR("/System/Library/Frameworks/CoreServices.framework"), kCFURLPOSIXPathStyle, TRUE)); + if (csBundle) _GetScriptManagerVariablePointer = (long (*)(short))CFBundleGetDataPointerForName(csBundle, CFSTR("GetScriptManagerVariable")); + } + return _GetScriptManagerVariablePointer; +} + - (void)fixTypingAttributesForSubstitutedFonts { - //this check helps prevent NSTextView from being repeatedly punched in the face when it can't help it + //fixes a problem with fonts substituted by non-system input languages that Apple should have fixed themselves + + //if the user has chosen a default font that does not support the current input script, and then changes back to a language input that _does_ + //then the font in the typing attributes will be changed back to match. the problem is that this change occurs only upon changing the input language + //if the user starts typing in the middle of a block of font-substituted text, the typing attributes will change to that font + //the result is that typing english in the middle of a block of japanese will use Hiragino Kaku Gothic instead of whatever else the user had chosen + //this method detects these types of spurious font-changes and reverts to the default font, but only if the font would not be immediately switched back + //as a result of continuing to type in the native script. //we'd ideally check smKeyScript against available scripts of current note body font: //call RevertTextEncodingToScriptInfo on ATSFontFamilyGetEncoding(ATSFontFamilyFindFromName(CFStringRef([bodyFont familyName]), kATSOptionFlagsDefault)) //because someone on a japanese-localized system could see their font changing around a lot if they didn't set their note body font to something suitable for their language - if (GetScriptManagerVariable(smSysScript) == GetScriptManagerVariable(smKeyScript)) { - //only attempt to restore fonts (with styles of course) if the current script is system default--that is, not using an input manager that would change the font + BOOL currentKeyboardInputIsSystemLanguage = NO; + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if (IsLeopardOrLater) { + TISInputSourceRef inputRef = TISCopyCurrentKeyboardInputSource(); + NSArray* inputLangs = [[(NSArray*)TISGetInputSourceProperty(inputRef, kTISPropertyInputSourceLanguages) retain] autorelease]; + CFRelease(inputRef); + NSString *preferredLang = [[(NSArray*)CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication) autorelease] objectAtIndex:0]; + currentKeyboardInputIsSystemLanguage = [inputLangs containsObject:preferredLang]; + } else { + currentKeyboardInputIsSystemLanguage = GetGetScriptManagerVariablePointer()(smSysScript) == GetGetScriptManagerVariablePointer()(smKeyScript); + } +#else + currentKeyboardInputIsSystemLanguage = GetScriptManagerVariable(smSysScript) == GetScriptManagerVariable(smKeyScript); +#endif + + if (currentKeyboardInputIsSystemLanguage) { + //only attempt to restore fonts (with styles of course) if the current script is system default--that is, not using an input method that would change the font + //this check helps prevent NSTextView from being repeatedly punched in the face when it can't help it NSFont *currentFont = [prefsController noteBodyFont]; if (![[[[self typingAttributes] objectForKey:NSFontAttributeName] familyName] isEqualToString:[currentFont familyName]]) { diff --git a/LinkingEditor_Indentation.h b/LinkingEditor_Indentation.h old mode 100644 new mode 100755 diff --git a/LinkingEditor_Indentation.m b/LinkingEditor_Indentation.m old mode 100644 new mode 100755 diff --git a/MultiTextFinder.h b/MultiTextFinder.h old mode 100644 new mode 100755 diff --git a/MultiTextFinder.m b/MultiTextFinder.m old mode 100644 new mode 100755 diff --git a/MultiplePageView.h b/MultiplePageView.h old mode 100644 new mode 100755 diff --git a/MultiplePageView.m b/MultiplePageView.m old mode 100644 new mode 100755 index a2d14a6a..da29a49c --- a/MultiplePageView.m +++ b/MultiplePageView.m @@ -293,7 +293,7 @@ - (BOOL)knowsPageRange:(NSRangePointer)aRange { return YES; } -- (NSRect)rectForPage:(int)page { +- (NSRect)rectForPage:(NSInteger)page { return [self documentRectForPageNumber:page-1]; /* Our page numbers start from 0; the kit's from 1 */ } diff --git a/NSCollection_utils.h b/NSCollection_utils.h old mode 100644 new mode 100755 index 6a1f5238..554aea7f --- a/NSCollection_utils.h +++ b/NSCollection_utils.h @@ -33,11 +33,11 @@ @interface NSArray (NoteUtilities) //- (NSRange)nextRangeForString:(NSString*)string activeNote:(NoteObject*)startNote options:(unsigned)opts range:(NSRange)inRange; - (void)addMenuItemsForURLsInNotes:(NSMenu*)urlsMenu; -- (unsigned int)indexOfNoteWithUUIDBytes:(CFUUIDBytes*)bytes; +- (NSUInteger)indexOfNoteWithUUIDBytes:(CFUUIDBytes*)bytes; @end @interface NSMutableArray (Sorting) -- (void)sortUnstableUsingFunction:(int (*)(id *, id *))compare; -- (void)sortStableUsingFunction:(int (*)(id *, id *))compare usingBuffer:(id **)buffer ofSize:(unsigned int*)bufSize; +- (void)sortUnstableUsingFunction:(NSInteger (*)(id *, id *))compare; +- (void)sortStableUsingFunction:(NSInteger (*)(id *, id *))compare usingBuffer:(id **)buffer ofSize:(unsigned int*)bufSize; @end \ No newline at end of file diff --git a/NSCollection_utils.m b/NSCollection_utils.m old mode 100644 new mode 100755 index 0f3a0ed6..7143136e --- a/NSCollection_utils.m +++ b/NSCollection_utils.m @@ -83,8 +83,8 @@ - (NSMutableSet*)setIntersectedWithSet:(NSSet*)set { @implementation NSArray (NoteUtilities) -- (unsigned int)indexOfNoteWithUUIDBytes:(CFUUIDBytes*)bytes { - unsigned int i; +- (NSUInteger)indexOfNoteWithUUIDBytes:(CFUUIDBytes*)bytes { + NSUInteger i; for (i=0; i<[self count]; i++) { NoteObject *note = [self objectAtIndex:i]; CFUUIDBytes *noteBytes = [note uniqueNoteIDBytes]; @@ -174,12 +174,12 @@ - (void)addMenuItemsForURLsInNotes:(NSMenu*)urlsMenu { @implementation NSMutableArray (Sorting) -- (void)sortUnstableUsingFunction:(int (*)(id *, id *))compare { - [self sortUsingFunction:(int (*)(id, id, void *))genericSortContextLast context:compare]; +- (void)sortUnstableUsingFunction:(NSInteger (*)(id *, id *))compare { + [self sortUsingFunction:(NSInteger (*)(id, id, void *))genericSortContextLast context:compare]; } -- (void)sortStableUsingFunction:(int (*)(id *, id *))compare usingBuffer:(id **)buffer ofSize:(unsigned int*)bufSize { - unsigned int count = CFArrayGetCount((CFArrayRef)self); +- (void)sortStableUsingFunction:(NSInteger (*)(id *, id *))compare usingBuffer:(id **)buffer ofSize:(unsigned int*)bufSize { + CFIndex count = CFArrayGetCount((CFArrayRef)self); ResizeBuffer((void***)buffer, count, bufSize); diff --git a/NSData_transformations.h b/NSData_transformations.h old mode 100644 new mode 100755 diff --git a/NSData_transformations.m b/NSData_transformations.m old mode 100644 new mode 100755 diff --git a/NSString_NV.h b/NSString_NV.h old mode 100644 new mode 100755 diff --git a/NSString_NV.m b/NSString_NV.m old mode 100644 new mode 100755 index 458e2f07..738b6d7e --- a/NSString_NV.m +++ b/NSString_NV.m @@ -108,7 +108,7 @@ + (NSString*)relativeDateStringWithAbsoluteTime:(CFAbsoluteTime)absTime { (CFDictionaryCopyDescriptionCallBack)NULL, (CFDictionaryEqualCallBack)NULL, (CFDictionaryHashCallBack)NULL }; dateStringsCache = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &keyCallbacks, &kCFTypeDictionaryValueCallBacks); } - int minutesCount = (int)((int)absTime / 60); + NSInteger minutesCount = (NSInteger)((NSInteger)absTime / 60); NSString *dateString = (NSString*)CFDictionaryGetValue(dateStringsCache, (const void *)minutesCount); @@ -243,9 +243,9 @@ - (void)copyItemToPasteboard:(id)sender { - (NSURL*)linkForWord { //full of annoying little hacks to catch (hopefully) the most common non-links - unsigned length = [self length]; + NSUInteger length = [self length]; - unsigned protocolSpecLoc = [self rangeOfString:@"://" options:NSLiteralSearch].location; + NSUInteger protocolSpecLoc = [self rangeOfString:@"://" options:NSLiteralSearch].location; if (length >= 5 && protocolSpecLoc != NSNotFound && protocolSpecLoc > 0) return [NSURL URLWithString:self]; @@ -258,11 +258,11 @@ - (NSURL*)linkForWord { } if (length >= 5) { - unsigned atSignLoc = [self rangeOfString:@"@" options:NSLiteralSearch].location; + NSUInteger atSignLoc = [self rangeOfString:@"@" options:NSLiteralSearch].location; if (atSignLoc != NSNotFound && atSignLoc > 0) { //if we contain an @, but do not start with one, and have a period somewhere after the @ but not at the end, then make it an email address - unsigned periodLoc = [self rangeOfString:@"." options:NSLiteralSearch range:NSMakeRange(atSignLoc, length - atSignLoc)].location; + NSUInteger periodLoc = [self rangeOfString:@"." options:NSLiteralSearch range:NSMakeRange(atSignLoc, length - atSignLoc)].location; if (periodLoc != NSNotFound && periodLoc > atSignLoc + 1 && periodLoc != length - 1) { //make sure it's not some kind of SCP or CVS path @@ -397,7 +397,7 @@ - (unsigned)numberOfLeadingSpacesFromRange:(NSRange*)range tabWidth:(unsigned)ta unsigned spaceCount = 0; BOOL done = NO; unsigned tabW = tabWidth; - unsigned endOfWhiteSpaceIndex = NSNotFound; + NSUInteger endOfWhiteSpaceIndex = NSNotFound; if (range->length == 0) { return 0; @@ -571,6 +571,7 @@ + (NSMutableString*)getShortLivedStringFromData:(NSMutableData*)data ofGuessedEn } //try UTF-8 here, if any bytes are greater than 127 + //TODO: also use UTF-8 if string is 7-bit (might make ContainsHighAscii() moot here) if (ContainsHighAscii([data bytes], [data length])) { if (RunningTigerAppKitOrHigher) stringFromData = [[NSMutableString alloc] initWithBytesNoCopy:[data mutableBytes] length:[data length] encoding:NSUTF8StringEncoding freeWhenDone:NO]; diff --git a/NSTextFinder.h b/NSTextFinder.h old mode 100644 new mode 100755 index d14a95b2..49fff4ed --- a/NSTextFinder.h +++ b/NSTextFinder.h @@ -62,6 +62,6 @@ enum {LAST_FIND_UNKNOWN, LAST_FIND_NO, LAST_FIND_YES}; @end @interface NSTextFinder (LastFind) -- (int)lastFindWasSuccessful; +- (int)nv_lastFindWasSuccessful; @end diff --git a/NSTextFinder_LastFind.m b/NSTextFinder_LastFind.m old mode 100644 new mode 100755 index e5f089f4..d52b3df8 --- a/NSTextFinder_LastFind.m +++ b/NSTextFinder_LastFind.m @@ -10,8 +10,13 @@ @implementation NSTextFinder (LastFind) -- (int)lastFindWasSuccessful { - int i; +- (int)nv_lastFindWasSuccessful { + #if defined(OBJC2_UNAVAILABLE) + NSNumber *success = [self valueForKey:@"lastFindWasSuccessful"]; + if (success) + return ([success boolValue] ? LAST_FIND_YES : LAST_FIND_NO); + #else + int i; Ivar ivar; //this might not work so well with Obj-C 2 @@ -24,7 +29,8 @@ - (int)lastFindWasSuccessful { return *lastFind ? LAST_FIND_YES : LAST_FIND_NO; } } - + #endif + NSLog(@"No lastFindWasSuccessful ivars found!"); return LAST_FIND_UNKNOWN; } diff --git a/Notality.icns b/Notality.icns old mode 100644 new mode 100755 diff --git a/Notation.freqorder b/Notation.freqorder old mode 100644 new mode 100755 diff --git a/Notation.launchorder b/Notation.launchorder old mode 100644 new mode 100755 diff --git a/Notation.xcodeproj/project.pbxproj b/Notation.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 3e02f29b..1a7103b0 --- a/Notation.xcodeproj/project.pbxproj +++ b/Notation.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 45; objects = { /* Begin PBXBuildFile section */ @@ -27,7 +27,6 @@ 2114C2A80958D24800614E74 /* hmacsha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 2114C2A70958D24800614E74 /* hmacsha1.c */; }; 212089B10B0C24F500A15A69 /* AlienNoteImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 212089B00B0C24F500A15A69 /* AlienNoteImporter.m */; }; 212089D80B0C2CA500A15A69 /* StickiesDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 212089D70B0C2CA500A15A69 /* StickiesDocument.m */; }; - 2127E80A0A86727C00F802AB /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2127E8080A86727C00F802AB /* MainMenu.nib */; }; 212850880B56E549005F6E34 /* CarbonErrorStrings.plist in Resources */ = {isa = PBXBuildFile; fileRef = 212850860B56E549005F6E34 /* CarbonErrorStrings.plist */; }; 212B84620978422300F3597F /* NSString_NV.m in Sources */ = {isa = PBXBuildFile; fileRef = 212B84610978422300F3597F /* NSString_NV.m */; }; 212DCA470A6AD28700F74E46 /* EncodingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 212DCA460A6AD28700F74E46 /* EncodingsManager.m */; }; @@ -67,9 +66,10 @@ 217EB3CE0B0F62FB0041A8A9 /* NSTextFinder_LastFind.m in Sources */ = {isa = PBXBuildFile; fileRef = 217EB3CD0B0F62FB0041A8A9 /* NSTextFinder_LastFind.m */; }; 2181171309F311110020A252 /* DeletedNoteObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 2181171209F311110020A252 /* DeletedNoteObject.m */; }; 21813562105AF27400A0AE18 /* Acknowledgements.txt in Resources */ = {isa = PBXBuildFile; fileRef = 21813561105AF27400A0AE18 /* Acknowledgements.txt */; }; + 2182B39A106B2296008641E4 /* RBSplitSubview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2182B396106B2296008641E4 /* RBSplitSubview.m */; }; + 2182B39B106B2296008641E4 /* RBSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2182B398106B2296008641E4 /* RBSplitView.m */; }; + 2182B3C3106B2509008641E4 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2182B3C1106B2509008641E4 /* MainMenu.nib */; }; 218D43330AA2ABC600F36CCA /* NotesTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2191930209CFBEBD00586B15 /* NotesTableView.m */; }; - 2191858809BEAB6400586B15 /* RBSplitSubview.m in Sources */ = {isa = PBXBuildFile; fileRef = 2191858409BEAB6400586B15 /* RBSplitSubview.m */; }; - 2191858909BEAB6400586B15 /* RBSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2191858609BEAB6400586B15 /* RBSplitView.m */; }; 21918FD009C49B2500586B15 /* EmptyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 21918FCE09C49B2400586B15 /* EmptyView.m */; }; 219190F109C4A60700586B15 /* DualField.m in Sources */ = {isa = PBXBuildFile; fileRef = 219190F009C4A60700586B15 /* DualField.m */; }; 2191926409C52A9200586B15 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2191926309C52A9100586B15 /* libcrypto.dylib */; }; @@ -162,7 +162,6 @@ 212089B00B0C24F500A15A69 /* AlienNoteImporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlienNoteImporter.m; sourceTree = ""; }; 212089D60B0C2CA500A15A69 /* StickiesDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StickiesDocument.h; sourceTree = ""; }; 212089D70B0C2CA500A15A69 /* StickiesDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StickiesDocument.m; sourceTree = ""; }; - 2127E8090A86727C00F802AB /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = ""; }; 212850870B56E549005F6E34 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/CarbonErrorStrings.plist; sourceTree = ""; }; 212B84600978422300F3597F /* NSString_NV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSString_NV.h; sourceTree = ""; }; 212B84610978422300F3597F /* NSString_NV.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NSString_NV.m; sourceTree = ""; }; @@ -226,11 +225,12 @@ 2181171209F311110020A252 /* DeletedNoteObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeletedNoteObject.m; sourceTree = ""; }; 2181193909FA9CF90020A252 /* SynchronizedNoteProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SynchronizedNoteProtocol.h; sourceTree = ""; }; 21813561105AF27400A0AE18 /* Acknowledgements.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Acknowledgements.txt; sourceTree = ""; }; - 2191858309BEAB6400586B15 /* RBSplitSubview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RBSplitSubview.h; path = RBSplitView/RBSplitSubview.h; sourceTree = ""; }; - 2191858409BEAB6400586B15 /* RBSplitSubview.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = RBSplitSubview.m; path = RBSplitView/RBSplitSubview.m; sourceTree = ""; }; - 2191858509BEAB6400586B15 /* RBSplitView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RBSplitView.h; path = RBSplitView/RBSplitView.h; sourceTree = ""; }; - 2191858609BEAB6400586B15 /* RBSplitView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = RBSplitView.m; path = RBSplitView/RBSplitView.m; sourceTree = ""; }; - 2191858709BEAB6400586B15 /* RBSplitViewPrivateDefines.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RBSplitViewPrivateDefines.h; path = RBSplitView/RBSplitViewPrivateDefines.h; sourceTree = ""; }; + 2182B395106B2296008641E4 /* RBSplitSubview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RBSplitSubview.h; path = RBSplitView/RBSplitSubview.h; sourceTree = ""; }; + 2182B396106B2296008641E4 /* RBSplitSubview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RBSplitSubview.m; path = RBSplitView/RBSplitSubview.m; sourceTree = ""; }; + 2182B397106B2296008641E4 /* RBSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RBSplitView.h; path = RBSplitView/RBSplitView.h; sourceTree = ""; }; + 2182B398106B2296008641E4 /* RBSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RBSplitView.m; path = RBSplitView/RBSplitView.m; sourceTree = ""; }; + 2182B399106B2296008641E4 /* RBSplitViewPrivateDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RBSplitViewPrivateDefines.h; path = RBSplitView/RBSplitViewPrivateDefines.h; sourceTree = ""; }; + 2182B3C2106B2509008641E4 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = ""; }; 21918FCE09C49B2400586B15 /* EmptyView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = EmptyView.m; sourceTree = ""; }; 21918FCF09C49B2500586B15 /* EmptyView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EmptyView.h; sourceTree = ""; }; 219190EF09C4A60600586B15 /* DualField.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DualField.h; sourceTree = ""; }; @@ -481,14 +481,14 @@ name = "Help Notes"; sourceTree = ""; }; - 2191857D09BEAB5300586B15 /* RBSplitView */ = { + 2182B38E106B2286008641E4 /* RBSplitView */ = { isa = PBXGroup; children = ( - 2191858309BEAB6400586B15 /* RBSplitSubview.h */, - 2191858409BEAB6400586B15 /* RBSplitSubview.m */, - 2191858509BEAB6400586B15 /* RBSplitView.h */, - 2191858609BEAB6400586B15 /* RBSplitView.m */, - 2191858709BEAB6400586B15 /* RBSplitViewPrivateDefines.h */, + 2182B395106B2296008641E4 /* RBSplitSubview.h */, + 2182B396106B2296008641E4 /* RBSplitSubview.m */, + 2182B397106B2296008641E4 /* RBSplitView.h */, + 2182B398106B2296008641E4 /* RBSplitView.m */, + 2182B399106B2296008641E4 /* RBSplitViewPrivateDefines.h */, ); name = RBSplitView; sourceTree = ""; @@ -577,8 +577,8 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( + 2182B38E106B2286008641E4 /* RBSplitView */, 21F1CD490B3A38CB001FB5F6 /* HotKeys */, - 2191857D09BEAB5300586B15 /* RBSplitView */, 211345A10B35D8340081B064 /* Crypto */, 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */, 29B97316FDCFA39411CA2CEA /* main.m */, @@ -603,7 +603,7 @@ 8D1107310486CEB800E47090 /* Info.plist */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 212850860B56E549005F6E34 /* CarbonErrorStrings.plist */, - 2127E8080A86727C00F802AB /* MainMenu.nib */, + 2182B3C1106B2509008641E4 /* MainMenu.nib */, 212DCFF50A6E005000F74E46 /* DeletionManager.nib */, 212DCB2F0A6AE38500F74E46 /* EncodingsManager.nib */, 219195E409D3A20F00586B15 /* Preferences.nib */, @@ -642,7 +642,6 @@ 8D11072C0486CEB800E47090 /* Sources */, 8D11072E0486CEB800E47090 /* Frameworks */, 213FB6AD0B52E1B2004C74BD /* CopyFiles */, - 2146A4710BF221040094835F /* ShellScript */, ); buildRules = ( ); @@ -660,7 +659,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = 212B842709780B5000F3597F /* Build configuration list for PBXProject "Notation" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; mainGroup = 29B97314FDCFA39411CA2CEA /* Notation */; projectDirPath = ""; @@ -689,7 +688,6 @@ 215DEE1309F1AA4C009A710B /* Editing.tiff in Resources */, 212DCB310A6AE38500F74E46 /* EncodingsManager.nib in Resources */, 212DCFF70A6E005000F74E46 /* DeletionManager.nib in Resources */, - 2127E80A0A86727C00F802AB /* MainMenu.nib in Resources */, 2144950F0ADC883100E2A2B6 /* PasswordAssistantButton.tif in Resources */, 214495100ADC883100E2A2B6 /* PasswordAssistantButtonPressed.tif in Resources */, 2144957A0ADCC06300E2A2B6 /* PassphrasePicker.nib in Resources */, @@ -712,27 +710,12 @@ 213621ED0B92413F008C0830 /* FindPanel.nib in Resources */, 214C6C59105445410085D386 /* Notality.icns in Resources */, 21813562105AF27400A0AE18 /* Acknowledgements.txt in Resources */, + 2182B3C3106B2509008641E4 /* MainMenu.nib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 2146A4710BF221040094835F /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = "/usr/bin/perl -w"; - shellScript = "# /usr/bin/perl -w\n#\n# Last updated: 21MAR06, Andy O'Meara and Rob Barris\n#\n# This is an Xcode post-build phase script for devs who sleep better at night knowing\n# that their deployment binaries are as stripped as possible. This makes life more difficult\n# for a hacker/cracker to locate sensitive code to trace, study, and/or extract.\n#\n# This script will execute only if the Xcode \"Deployment Postprocessing\" setting\n# is set (aka DEPLOYMENT_POSTPROCESSING).\n#\n# The downside to shipping a stripped binary is that your user's crash reports\n# will be useless unless you have a link map to convert code offsets (from a stack trace)\n# into proc names. To address this, this script moves your pre-stripped executable\n# to the build dir, appending \"_full\" to the filename, allowing you to retain it for\n# the day you need it in order to decipher a stack trace. You do this by using 'atos'\n# with the original generated binary (type 'man atos' for info).\n#\n# Recommended Xcode build settings:\n# Dead Code Stripping YES\n# Only Link In Essential Symbols NO\n# Deployment Postprocessing YES (this activates this script)\n# Strip Linked Product NO\n# Use Separate Strip NO\n# Strip Style All Symbols\n# Strip Debug Symbols During Copy NO\n# Preserve Private External Symbols NO\n# Separate PCH Symbols YES\n# Symbols Hidden By Default YES (Critical!)\n# Inline Functions Hidden YES\n#\n# Note that if you're building a dynamic library, you'll need to explicitly\n# declare any symbols that you want to be exported. See the following:\n# file:///Developer/ADC%20Reference%20Library/documentation/DeveloperTools/Conceptual/CppRuntimeEnv/Articles/SymbolVisibility.html\n#\n\nuse strict;\n\ndie \"$0: Must be run from Xcode\" unless $ENV{\"BUILT_PRODUCTS_DIR\"};\n\n# This script is activated via an Xcode env flag.\nif ( $ENV{DEPLOYMENT_POSTPROCESSING} ne \"YES\" ) {\n exit 0;\n}\n\nprint \"\\n\\n==================== Commencing external stripping phase...\\n\";\n \nmy $BINARY = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Contents/MacOS/$ENV{EXECUTABLE_NAME}\";\nmy $BINARY_FULL = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{EXECUTABLE_NAME}_full\";\nmy $BINARY_i386 = \"${BINARY}_i386\";\nmy $BINARY_ppc = \"${BINARY}_ppc\";\n\n \n# Extract each arch into a \"thin\" binary for stripping\n`lipo \"$BINARY\" -thin ppc -output \"$BINARY_ppc\" `;\n`lipo \"$BINARY\" -thin i386 -output \"$BINARY_i386\"`;\n\n# Retain the orignal binary for QA and use with the util 'atos'\n`mv -f \"$BINARY\" \"$BINARY_FULL\"`;\n\n# Perform desired stripping on each thin binary. \n`strip -S -x -o \"${BINARY_ppc}_tmp\" -r \"$BINARY_ppc\" `;\n`strip -S -x -o \"${BINARY_i386}_tmp\" -r \"$BINARY_i386\"`;\n\n# We're now done with the original thin binaries, so chuck them.\n`rm -f \"$BINARY_ppc\" `;\n`rm -f \"$BINARY_i386\"`;\n\n# Make the new universal binary from our stripped thin pieces.\n`lipo -arch i386 \"${BINARY_i386}_tmp\" -arch ppc \"${BINARY_ppc}_tmp\" -create -output \"$BINARY\"`;\n\n# We're now done with the temp thin binaries, so chuck them.\n`rm -f \"${BINARY_ppc}_tmp\" `;\n`rm -f \"${BINARY_i386}_tmp\"`;\n\n\nprint \"\\n==================== External strip phase complete\\n\";\n\n\n#EOF\n"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 8D11072C0486CEB800E47090 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -755,8 +738,6 @@ 2155DF44097C992800163A10 /* AttributedPlainText.m in Sources */, 21D60128098FDB46007440DF /* GlobalPrefs.m in Sources */, 21A73DC8099712A8009F8A6C /* WALController.m in Sources */, - 2191858809BEAB6400586B15 /* RBSplitSubview.m in Sources */, - 2191858909BEAB6400586B15 /* RBSplitView.m in Sources */, 21918FD009C49B2500586B15 /* EmptyView.m in Sources */, 219190F109C4A60700586B15 /* DualField.m in Sources */, 219192D409CFBC8800586B15 /* NoteAttributeColumn.m in Sources */, @@ -797,6 +778,8 @@ 217D02D60B77061E0004E02D /* BodyScroller.m in Sources */, 213621F20B92414F008C0830 /* MultiTextFinder.m in Sources */, 21469C8C0BEBA6A10094835F /* TemporaryFileCache.m in Sources */, + 2182B39A106B2296008641E4 /* RBSplitSubview.m in Sources */, + 2182B39B106B2296008641E4 /* RBSplitView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -867,14 +850,6 @@ name = Localizable.strings; sourceTree = ""; }; - 2127E8080A86727C00F802AB /* MainMenu.nib */ = { - isa = PBXVariantGroup; - children = ( - 2127E8090A86727C00F802AB /* English */, - ); - name = MainMenu.nib; - sourceTree = ""; - }; 212850860B56E549005F6E34 /* CarbonErrorStrings.plist */ = { isa = PBXVariantGroup; children = ( @@ -931,6 +906,14 @@ name = KeyDerivationManager.nib; sourceTree = ""; }; + 2182B3C1106B2509008641E4 /* MainMenu.nib */ = { + isa = PBXVariantGroup; + children = ( + 2182B3C2106B2509008641E4 /* English */, + ); + name = MainMenu.nib; + sourceTree = ""; + }; 219195E409D3A20F00586B15 /* Preferences.nib */ = { isa = PBXVariantGroup; children = ( @@ -985,10 +968,6 @@ 212B842409780B5000F3597F /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -1045,10 +1024,6 @@ 212B842509780B5000F3597F /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); COPY_PHASE_STRIP = NO; DEPLOYMENT_POSTPROCESSING = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -1086,9 +1061,12 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "$(LIBRARY_SEARCH_PATHS)"; + "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; + ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ""; PREBINDING = NO; PRODUCT_NAME = "Notational Velocity"; + "SDKROOT[arch=x86_64]" = macosx10.5; SECTORDER_FLAGS = ( "-sectorder", __TEXT, @@ -1106,10 +1084,6 @@ 212B842609780B5000F3597F /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)", @@ -1157,6 +1131,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = ( + x86_64, ppc, i386, ); @@ -1165,12 +1140,16 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_THREADSAFE_STATICS = NO; + "GCC_VERSION[sdk=macosx10.4][arch=*]" = 4.0; GCC_WARN_SHADOW = YES; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + MACOSX_DEPLOYMENT_TARGET = 10.4; + "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx10.4; + "SDKROOT[arch=x86_64]" = macosx10.5; }; name = Development; }; @@ -1178,6 +1157,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = ( + x86_64, ppc, i386, ); @@ -1186,12 +1166,15 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_THREADSAFE_STATICS = NO; + "GCC_VERSION[sdk=macosx10.4][arch=*]" = 4.0; GCC_WARN_SHADOW = YES; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; + SDKROOT = macosx10.4; + "SDKROOT[arch=x86_64]" = macosx10.5; }; name = Deployment; }; @@ -1199,6 +1182,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = ( + x86_64, ppc, i386, ); @@ -1207,12 +1191,15 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_THREADSAFE_STATICS = NO; + "GCC_VERSION[sdk=macosx10.4][arch=*]" = 4.0; GCC_WARN_SHADOW = YES; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + MACOSX_DEPLOYMENT_TARGET = 10.4; + "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; + SDKROOT = macosx10.4; + "SDKROOT[arch=x86_64]" = macosx10.5; }; name = Default; }; @@ -1222,22 +1209,22 @@ 212B842309780B5000F3597F /* Build configuration list for PBXNativeTarget "Notation" */ = { isa = XCConfigurationList; buildConfigurations = ( - 212B842409780B5000F3597F /* Development */, 212B842509780B5000F3597F /* Deployment */, + 212B842409780B5000F3597F /* Development */, 212B842609780B5000F3597F /* Default */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; + defaultConfigurationName = Deployment; }; 212B842709780B5000F3597F /* Build configuration list for PBXProject "Notation" */ = { isa = XCConfigurationList; buildConfigurations = ( - 212B842809780B5000F3597F /* Development */, 212B842909780B5000F3597F /* Deployment */, + 212B842809780B5000F3597F /* Development */, 212B842A09780B5000F3597F /* Default */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; + defaultConfigurationName = Deployment; }; /* End XCConfigurationList section */ }; diff --git a/Notation.xcodeproj/scrod.mode1 b/Notation.xcodeproj/scrod.mode1 old mode 100644 new mode 100755 diff --git a/Notation.xcodeproj/scrod.mode1v3 b/Notation.xcodeproj/scrod.mode1v3 old mode 100644 new mode 100755 index 7003face..7fc2aaf0 --- a/Notation.xcodeproj/scrod.mode1v3 +++ b/Notation.xcodeproj/scrod.mode1v3 @@ -193,31 +193,51 @@ Name Default Notifications - + + + XCObserverAutoDisconnectKey + + XCObserverDefintionKey + + XCObserverFactoryKey + XCPerspectivesSpecificationIdentifier + XCObserverGUIDKey + XCObserverProjectIdentifier + XCObserverNotificationKey + PBXStatusBuildStateMessageNotification + XCObserverTargetKey + XCMainBuildResultsModuleGUID + XCObserverTriggerKey + awakenModuleWithObserver: + XCObserverValidationKey + + + OpenEditors Content PBXProjectModuleGUID - 21B544E2105D901A002097C4 + 21313DEB106C9BFC00C8D785 PBXProjectModuleLabel - LinkingEditor.m + NoteObject.m PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 21B544E3105D901A002097C4 + 21313DEC106C9BFC00C8D785 PBXProjectModuleLabel - LinkingEditor.m + NoteObject.m _historyCapacity 0 bookmark - 2139CF5C105D986E00FD961B + 2170B4AE106D228100AF1CAC history - 21C8157C105D9679006479FC + 21313DED106C9BFC00C8D785 + 21313DF6106C9CFF00C8D785 SplitCount @@ -229,35 +249,36 @@ Geometry Frame - {{0, 20}, {987, 717}} + {{0, 20}, {1100, 702}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 318 120 987 758 0 0 1440 878 + 526 435 1100 743 0 0 1920 1178 Content PBXProjectModuleGUID - 210092411059673F003BFE5E + 21313DDD106C9B2200C8D785 PBXProjectModuleLabel - NotationController.m + NoteObject.m PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 210092421059673F003BFE5E + 21313DDE106C9B2200C8D785 PBXProjectModuleLabel - NotationController.m + NoteObject.m _historyCapacity 0 bookmark - 2139CF5D105D986E00FD961B + 2170B4AF106D228100AF1CAC history - 21C8157D105D9679006479FC + 21313DDF106C9B2200C8D785 + 21313DF7106C9CFF00C8D785 SplitCount @@ -269,35 +290,35 @@ Geometry Frame - {{0, 20}, {966, 717}} + {{0, 20}, {1063, 704}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 285 120 966 758 0 0 1440 878 + 277 433 1063 745 0 0 1920 1178 Content PBXProjectModuleGUID - 218134B0105AE47A00A0AE18 + 21313DC8106C97F100C8D785 PBXProjectModuleLabel - NotationFileManager.m + PrefsWindowController.m PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - 218134B1105AE47A00A0AE18 + 21313DC9106C97F100C8D785 PBXProjectModuleLabel - NotationFileManager.m + PrefsWindowController.m _historyCapacity 0 bookmark - 2139CF5E105D986E00FD961B + 2170B4B0106D228100AF1CAC history - 21C8157E105D9679006479FC + 21313DF8106C9CFF00C8D785 SplitCount @@ -309,11 +330,51 @@ Geometry Frame - {{0, 20}, {1144, 717}} + {{0, 20}, {936, 704}} PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 115 120 1144 758 0 0 1440 878 + 689 433 936 745 0 0 1920 1178 + + + + Content + + PBXProjectModuleGUID + 21ED6C73106C162D00D37194 + PBXProjectModuleLabel + Notation_Prefix.pch + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 21ED6C74106C162D00D37194 + PBXProjectModuleLabel + Notation_Prefix.pch + _historyCapacity + 0 + bookmark + 2170B4B1106D228100AF1CAC + history + + 21313DF9106C9CFF00C8D785 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {775, 665}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 988 397 775 706 0 0 1920 1178 @@ -355,7 +416,6 @@ 1C37FBAC04509CD000000102 1C37FAAC04509CD000000102 - 1C08E77C0454961000C914BD 1C37FABC05509CD000000102 1C37FABC05539CD112110102 E2644B35053B69B200211256 @@ -373,7 +433,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 337 + 270 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -390,8 +450,8 @@ 2191930609CFBED200586B15 212089CF0B0C2BCF00A15A69 29B97315FDCFA39411CA2CEA + 2182B38E106B2286008641E4 21F1CD490B3A38CB001FB5F6 - 2191857D09BEAB5300586B15 211345A10B35D8340081B064 29B97317FDCFA39411CA2CEA 217DB1810B7CE5B9008CD564 @@ -409,13 +469,13 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 152 - 131 + 64 + 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 2070}, {337, 700}} + {{0, 0}, {270, 687}} PBXTopSmartGroupGIDs @@ -427,19 +487,19 @@ GeometryConfiguration Frame - {{0, 0}, {354, 718}} + {{0, 0}, {287, 705}} GroupTreeTableConfiguration MainColumn - 337 + 270 RubberWindowFrame - 45 119 359 759 0 0 1440 878 + 34 432 292 746 0 0 1920 1178 Module PBXSmartGroupTreeModule Proportion - 354pt + 287pt Dock @@ -450,7 +510,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - AppController.m + NoteObject.h PBXSplitModuleInNavigatorKey Split0 @@ -458,78 +518,55 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - AppController.m + NoteObject.h _historyCapacity 0 bookmark - 2139CF5B105D986E00FD961B + 2170B4AB106D228100AF1CAC history 21C61FAB10542D40004D5948 21C61FAC10542D40004D5948 21C61FAD10542D40004D5948 - 21C61FC410542EA3004D5948 - 21C61FD410542F10004D5948 21C61FEC10542FB9004D5948 21C61FED10542FB9004D5948 21C61FEE10542FB9004D5948 - 21C6206410543D7D004D5948 21C6206510543D7D004D5948 21C6206610543D7D004D5948 - 21C6206710543D7D004D5948 21C6206810543D7D004D5948 - 21C6206910543D7D004D5948 21C6206A10543D7D004D5948 21C6206B10543D7D004D5948 - 21C6206C10543D7D004D5948 - 21C6206D10543D7D004D5948 21C6206E10543D7D004D5948 - 21C6206F10543D7D004D5948 - 21C6207010543D7D004D5948 21C6207110543D7D004D5948 214C6C641054454C0085D386 214C6C651054454C0085D386 21B5447D105D7963002097C4 - 21B54535105D953C002097C4 - 21B54536105D953C002097C4 21B54537105D953C002097C4 2139CF51105D985D00FD961B - 2139CF52105D985D00FD961B - 2139CF53105D985D00FD961B - - prevStack - - 21C61FAF10542D40004D5948 - 21C61FB010542D40004D5948 - 21C61FB110542D40004D5948 - 21C61FC610542EA3004D5948 - 21C61FD710542F10004D5948 - 21C61FF010542FB9004D5948 - 21C61FF110542FB9004D5948 - 21C61FF210542FB9004D5948 - 21C6200B10542FD1004D5948 - 21C620151054311C004D5948 - 21C6207410543D7D004D5948 - 21C6207510543D7D004D5948 - 21C6207610543D7D004D5948 - 21C6207710543D7D004D5948 - 21C6207810543D7D004D5948 - 21C6207910543D7D004D5948 - 21C6207A10543D7D004D5948 - 21C6207B10543D7D004D5948 - 21C6207C10543D7D004D5948 - 21C6207D10543D7D004D5948 - 21C6207E10543D7D004D5948 - 21C6207F10543D7D004D5948 - 21C6208010543D7D004D5948 - 21C6208110543D7D004D5948 - 214C6C681054454C0085D386 - 21B5447F105D7963002097C4 - 21B5453A105D953C002097C4 - 21B5453B105D953C002097C4 - 21B5453D105D953C002097C4 - 2139CF54105D985D00FD961B - 2139CF55105D985D00FD961B + 2182B39D106B2359008641E4 + 2182B3BB106B24FA008641E4 + 2182B3D1106B2561008641E4 + 2182B429106B35CC008641E4 + 2182B42A106B35CC008641E4 + 2182B42B106B35CC008641E4 + 2182B42D106B35CC008641E4 + 2182B46E106B3E9E008641E4 + 2182B46F106B3E9E008641E4 + 2182B479106B3EDA008641E4 + 21313D28106C7F1700C8D785 + 21313D86106C908300C8D785 + 21313D87106C908300C8D785 + 21313DBE106C97F100C8D785 + 21313DC0106C97F100C8D785 + 21313DC1106C97F100C8D785 + 21313DC2106C97F100C8D785 + 21313DC3106C97F100C8D785 + 21313DC4106C97F100C8D785 + 21313DD5106C9B2200C8D785 + 21313DD6106C9B2200C8D785 + 21313DD7106C9B2200C8D785 + 21313DE8106C9BFC00C8D785 + 21313DF5106C9CFF00C8D785 SplitCount @@ -543,7 +580,7 @@ Frame {{0, 0}, {0, 0}} RubberWindowFrame - 45 119 359 759 0 0 1440 878 + 34 432 292 746 0 0 1920 1178 Module PBXNavigatorGroup @@ -561,14 +598,14 @@ GeometryConfiguration Frame - {{0, 5}, {0, 713}} + {{0, 5}, {0, 700}} RubberWindowFrame - 45 119 359 759 0 0 1440 878 + 34 432 292 746 0 0 1920 1178 Module XCDetailModule Proportion - 713pt + 700pt Proportion @@ -587,12 +624,14 @@ TableOfContents - 2139CF31105D96EA00FD961B + 2170B4AC106D228100AF1CAC 1CE0B1FE06471DED0097A5F4 - 2139CF32105D96EA00FD961B + 2170B4AD106D228100AF1CAC 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 + ToolbarConfigUserDefaultsMinorVersion + 2 ToolbarConfiguration xcode.toolbar.config.defaultV3 @@ -706,7 +745,7 @@ StatusbarIsVisible TimeStamp - 0.0 + 275587708.90259397 ToolbarDisplayMode 1 ToolbarIsVisible @@ -721,18 +760,15 @@ 5 WindowOrderList - 1C530D57069F1CE1000CFCEE - 1C78EAAD065D492600B07095 1CD10A99069EF8BA00B06720 - 21B54540105D953C002097C4 - 218134B0105AE47A00A0AE18 - 210092411059673F003BFE5E - 21C6208410543D7D004D5948 - /Users/scrod/Projects/Notation/Notation.xcodeproj - 21B544E2105D901A002097C4 + 21ED6C73106C162D00D37194 + 21313DC8106C97F100C8D785 + 21313DDD106C9B2200C8D785 + 21313DEB106C9BFC00C8D785 + /Users/scrod/Projects/Notation-64bit/Notation.xcodeproj WindowString - 45 119 359 759 0 0 1440 878 + 34 432 292 746 0 0 1920 1178 WindowToolsV3 @@ -748,36 +784,36 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + NotesTableView.m StatusBarVisibility GeometryConfiguration Frame - {{0, 0}, {759, 226}} + {{0, 0}, {740, 402}} RubberWindowFrame - 625 382 759 496 0 0 1440 878 + 623 133 740 745 0 0 1440 878 Module PBXNavigatorGroup Proportion - 226pt + 402pt - BecomeActive - ContentConfiguration PBXProjectModuleGUID XCMainBuildResultsModuleGUID PBXProjectModuleLabel - Build + Build Results XCBuildResultsTrigger_Collapse 1021 XCBuildResultsTrigger_Open @@ -786,18 +822,18 @@ GeometryConfiguration Frame - {{0, 231}, {759, 224}} + {{0, 407}, {740, 297}} RubberWindowFrame - 625 382 759 496 0 0 1440 878 + 623 133 740 745 0 0 1440 878 Module PBXBuildResultsModule Proportion - 224pt + 297pt Proportion - 455pt + 704pt Name @@ -811,14 +847,14 @@ TableOfContents 21C6208410543D7D004D5948 - 2139CF3B105D985900FD961B + 21313D0A106C7CD900C8D785 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID ToolbarConfiguration xcode.toolbar.config.buildV3 WindowString - 625 382 759 496 0 0 1440 878 + 623 133 740 745 0 0 1440 878 WindowToolGUID 21C6208410543D7D004D5948 WindowToolIsVisible @@ -905,10 +941,10 @@ Frame {{381, 0}, {775, 325}} RubberWindowFrame - 257 192 1156 650 0 0 1440 878 + 705 385 1156 650 0 0 1920 1178 RubberWindowFrame - 257 192 1156 650 0 0 1440 878 + 705 385 1156 650 0 0 1920 1178 Module PBXDebugSessionModule @@ -931,18 +967,18 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 2139CF3C105D985900FD961B + 2170B4B2106D228100AF1CAC 1C162984064C10D400B95A72 - 2139CF3D105D985900FD961B - 2139CF3E105D985900FD961B - 2139CF3F105D985900FD961B - 2139CF40105D985900FD961B - 2139CF41105D985900FD961B + 2170B4B3106D228100AF1CAC + 2170B4B4106D228100AF1CAC + 2170B4B5106D228100AF1CAC + 2170B4B6106D228100AF1CAC + 2170B4B7106D228100AF1CAC ToolbarConfiguration xcode.toolbar.config.debugV3 WindowString - 257 192 1156 650 0 0 1440 878 + 705 385 1156 650 0 0 1920 1178 WindowToolGUID 1CD10A99069EF8BA00B06720 WindowToolIsVisible @@ -971,25 +1007,25 @@ PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - LinkingEditor.m + AppController.m StatusBarVisibility GeometryConfiguration Frame - {{0, 0}, {1242, 488}} + {{0, 0}, {1173, 445}} RubberWindowFrame - 187 64 1242 814 0 0 1440 878 + 233 77 1173 801 0 0 1440 878 Module PBXNavigatorGroup Proportion - 1242pt + 1173pt Proportion - 488pt + 445pt ContentConfiguration @@ -1002,18 +1038,18 @@ GeometryConfiguration Frame - {{0, 493}, {1242, 280}} + {{0, 450}, {1173, 310}} RubberWindowFrame - 187 64 1242 814 0 0 1440 878 + 233 77 1173 801 0 0 1440 878 Module PBXProjectFindModule Proportion - 280pt + 310pt Proportion - 773pt + 760pt Name @@ -1027,13 +1063,13 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 2139CF4E105D985900FD961B - 2139CF4F105D985900FD961B + 21313D19106C7D3800C8D785 + 21313D1A106C7D3800C8D785 1CDD528C0622207200134675 1CD0528E0623707200166675 WindowString - 187 64 1242 814 0 0 1440 878 + 233 77 1173 801 0 0 1440 878 WindowToolGUID 1C530D57069F1CE1000CFCEE WindowToolIsVisible @@ -1058,6 +1094,8 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -1070,7 +1108,7 @@ Frame {{0, 0}, {928, 577}} RubberWindowFrame - 194 260 928 618 0 0 1440 878 + 429 260 928 618 0 0 1440 878 Module PBXDebugCLIModule @@ -1093,17 +1131,17 @@ TableOfContents 1C78EAAD065D492600B07095 - 2139CF50105D985900FD961B + 21313D27106C7F1600C8D785 1C78EAAC065D492600B07095 ToolbarConfiguration xcode.toolbar.config.consoleV3 WindowString - 194 260 928 618 0 0 1440 878 + 429 260 928 618 0 0 1440 878 WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff --git a/Notation.xcodeproj/scrod.pbxuser b/Notation.xcodeproj/scrod.pbxuser old mode 100644 new mode 100755 index 7539febe..cf72b2e4 --- a/Notation.xcodeproj/scrod.pbxuser +++ b/Notation.xcodeproj/scrod.pbxuser @@ -33,8 +33,9 @@ }; 2110BADD0B640D2100F5C52E /* BookmarksController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {771, 1400}}"; - sepNavSelRange = "{531, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {861, 1287}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{698, 1240}"; sepNavVisRect = "{{0, 0}, {771, 748}}"; sepNavWindowFrame = "{{539, 181}, {810, 877}}"; }; @@ -86,18 +87,18 @@ }; 211344440B354E000081B064 /* idea_ossl.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {420, 5320}}"; - sepNavSelRange = "{7795, 19}"; - sepNavVisRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {679, 5239}}"; + sepNavSelRange = "{8704, 0}"; + sepNavVisRange = "{8302, 420}"; sepNavVisRect = "{{0, 0}, {728, 635}}"; sepNavWindowFrame = "{{61, 114}, {767, 764}}"; }; }; 211345A90B35D8540081B064 /* broken_md5.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {24, 3612}}"; + sepNavIntBoundsRect = "{{0, 0}, {679, 3302}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 0}"; + sepNavVisRange = "{0, 1043}"; sepNavVisRect = "{{0, 0}, {724, 671}}"; sepNavWindowFrame = "{{84, 78}, {763, 800}}"; }; @@ -132,7 +133,7 @@ argumentStrings = ( ); autoAttachOnCrash = 1; - breakpointsEnabled = 0; + breakpointsEnabled = 1; configStateDict = { "PBXLSLaunchAction-0" = { PBXLSLaunchAction = 0; @@ -194,6 +195,9 @@ scmConfiguration = { CVSToolPath = /usr/bin/ocvs; CVSUseSSH = YES; + repositoryNamesForRoots = { + "" = ""; + }; }; scmType = scm.cvs; }; @@ -203,81 +207,81 @@ }; 2114C11409575BD400614E74 /* AppController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {546, 1078}}"; - sepNavSelRange = "{1226, 0}"; - sepNavVisRange = "{781, 1151}"; + sepNavIntBoundsRect = "{{0, 0}, {1112, 1014}}"; + sepNavSelRange = "{678, 17}"; + sepNavVisRange = "{423, 968}"; sepNavVisRect = "{{0, 38}, {566, 526}}"; - sepNavWindowFrame = "{{1032, 51}, {605, 656}}"; + sepNavWindowFrame = "{{835, 77}, {605, 656}}"; }; }; 2114C11509575BD400614E74 /* AppController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {672, 18284}}"; - sepNavSelRange = "{28418, 14}"; - sepNavVisRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {1209, 16744}}"; + sepNavSelRange = "{19903, 0}"; + sepNavVisRange = "{18756, 1188}"; sepNavVisRect = "{{0, 15945}, {1000, 995}}"; - sepNavWindowFrame = "{{375, 97}, {1351, 1081}}"; + sepNavWindowFrame = "{{89, 77}, {1351, 801}}"; }; }; 2114C13D0957732800614E74 /* NotationController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {708, 2674}}"; - sepNavSelRange = "{1657, 45}"; - sepNavVisRange = "{818, 1355}"; + sepNavIntBoundsRect = "{{0, 0}, {1112, 2327}}"; + sepNavSelRange = "{4204, 23}"; + sepNavVisRange = "{3620, 1502}"; sepNavVisRect = "{{0, 637}, {619, 618}}"; - sepNavWindowFrame = "{{299, 65}, {658, 747}}"; + sepNavWindowFrame = "{{198, 83}, {966, 795}}"; }; }; 2114C13E0957732800614E74 /* NotationController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {984, 21756}}"; - sepNavSelRange = "{7099, 0}"; - sepNavVisRange = "{6382, 1994}"; + sepNavIntBoundsRect = "{{0, 0}, {1244, 21099}}"; + sepNavSelRange = "{48171, 0}"; + sepNavVisRange = "{49697, 1761}"; sepNavVisRect = "{{0, 17808}, {927, 898}}"; - sepNavWindowFrame = "{{285, 64}, {966, 814}}"; + sepNavWindowFrame = "{{198, 83}, {966, 795}}"; }; }; 2114C1440957733200614E74 /* NoteObject.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {982, 2534}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 800}"; + sepNavIntBoundsRect = "{{0, 0}, {24, 2478}}"; + sepNavSelRange = "{288, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 1495}, {708, 899}}"; sepNavWindowFrame = "{{252, 0}, {747, 1028}}"; }; }; 2114C1450957733200614E74 /* NoteObject.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1181, 17990}}"; - sepNavSelRange = "{26691, 0}"; - sepNavVisRange = "{26233, 1028}"; + sepNavIntBoundsRect = "{{0, 0}, {1004, 18788}}"; + sepNavSelRange = "{35593, 27}"; + sepNavVisRange = "{34847, 1559}"; sepNavVisRect = "{{0, 1728}, {1024, 899}}"; - sepNavWindowFrame = "{{122, 64}, {1063, 814}}"; + sepNavWindowFrame = "{{122, 77}, {1063, 801}}"; }; }; 2114C23B095883A600614E74 /* NSData_transformations.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {766, 686}}"; - sepNavSelRange = "{341, 0}"; - sepNavVisRange = "{0, 1393}"; + sepNavIntBoundsRect = "{{0, 0}, {628, 598}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 479}, {718, 206}}"; sepNavWindowFrame = "{{571, 64}, {825, 814}}"; }; }; 2114C23C095883A600614E74 /* NSData_transformations.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1181, 6776}}"; - sepNavSelRange = "{5455, 0}"; - sepNavVisRange = "{4903, 1062}"; + sepNavIntBoundsRect = "{{0, 0}, {1118, 6487}}"; + sepNavSelRange = "{8861, 0}"; + sepNavVisRange = "{8361, 1356}"; sepNavVisRect = "{{0, 2346}, {801, 615}}"; - sepNavWindowFrame = "{{526, 134}, {840, 744}}"; + sepNavWindowFrame = "{{546, 134}, {840, 744}}"; }; }; 2114C25A095885C800614E74 /* English */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1860, 6258}}"; - sepNavSelRange = "{16663, 0}"; - sepNavVisRange = "{0, 1591}"; + sepNavIntBoundsRect = "{{0, 0}, {1678, 5837}}"; + sepNavSelRange = "{14825, 0}"; + sepNavVisRange = "{14112, 1622}"; sepNavVisRect = "{{0, 2894}, {1160, 752}}"; sepNavWindowFrame = "{{208, 64}, {1199, 814}}"; }; @@ -328,11 +332,11 @@ }; 212089B00B0C24F500A15A69 /* AlienNoteImporter.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1181, 7420}}"; - sepNavSelRange = "{1968, 73}"; - sepNavVisRange = "{1265, 1737}"; + sepNavIntBoundsRect = "{{0, 0}, {1237, 6695}}"; + sepNavSelRange = "{1373, 0}"; + sepNavVisRange = "{0, 1770}"; sepNavVisRect = "{{0, 4774}, {718, 99}}"; - sepNavWindowFrame = "{{180, 64}, {1151, 814}}"; + sepNavWindowFrame = "{{139, 77}, {1151, 801}}"; }; }; 212089D60B0C2CA500A15A69 /* StickiesDocument.h */ = { @@ -357,7 +361,7 @@ sepNavIntBoundsRect = "{{0, 0}, {838, 2310}}"; sepNavSelRange = "{2304, 0}"; sepNavVisRect = "{{0, 1411}, {838, 899}}"; - sepNavWindowFrame = "{{462, 150}, {877, 1028}}"; + sepNavWindowFrame = "{{462, 71}, {877, 807}}"; }; }; 212B84600978422300F3597F /* NSString_NV.h */ = { @@ -371,12 +375,12 @@ }; 212B84610978422300F3597F /* NSString_NV.m */ = { uiCtxt = { - sepNavFolds = "{\n c = (\n {\n l = \"CFComparatorFunction comparator\";\n r = \"{6602, 35}\";\n s = 1;\n },\n {\n l = \"void * context\";\n r = \"{6638, 18}\";\n s = 1;\n }\n );\n r = \"{0, 23682}\";\n s = 0;\n}"; - sepNavIntBoundsRect = "{{0, 0}, {1062, 8890}}"; - sepNavSelRange = "{23329, 0}"; - sepNavVisRange = "{21826, 1805}"; + sepNavFolds = "{\n c = (\n {\n l = \"CFComparatorFunction comparator\";\n r = \"{6620, 35}\";\n s = 1;\n },\n {\n l = \"void * context\";\n r = \"{6656, 18}\";\n s = 1;\n }\n );\n r = \"{0, 23796}\";\n s = 0;\n}"; + sepNavIntBoundsRect = "{{0, 0}, {1237, 8164}}"; + sepNavSelRange = "{21259, 27}"; + sepNavVisRange = "{21199, 2247}"; sepNavVisRect = "{{0, 3436}, {989, 899}}"; - sepNavWindowFrame = "{{146, 64}, {1028, 814}}"; + sepNavWindowFrame = "{{337, 77}, {1028, 801}}"; }; }; 212DCA450A6AD28700F74E46 /* EncodingsManager.h */ = { @@ -390,9 +394,9 @@ }; 212DCA460A6AD28700F74E46 /* EncodingsManager.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1320, 4074}}"; - sepNavSelRange = "{7567, 0}"; - sepNavVisRange = "{7324, 1931}"; + sepNavIntBoundsRect = "{{0, 0}, {1538, 3809}}"; + sepNavSelRange = "{9848, 2}"; + sepNavVisRange = "{8530, 1922}"; sepNavVisRect = "{{0, 3637}, {727, 244}}"; sepNavWindowFrame = "{{299, 64}, {1224, 814}}"; }; @@ -408,13 +412,238 @@ }; 212DCF600A6DEECB00F74E46 /* DeletionManager.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {174, 2884}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {1112, 2782}}"; + sepNavSelRange = "{1318, 12}"; + sepNavVisRange = "{882, 809}"; sepNavVisRect = "{{0, 2014}, {866, 898}}"; sepNavWindowFrame = "{{282, 151}, {905, 1027}}"; }; }; + 21313D28106C7F1700C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 21A6E6FC0974204F008436A9 /* LabelsListController.m */; + name = "LabelsListController.m: 17"; + rLen = 0; + rLoc = 305; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313D86106C908300C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 212B84610978422300F3597F /* NSString_NV.m */; + name = "NSString_NV.m: 402"; + rLen = 0; + rLoc = 15145; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313D87106C908300C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 219588D00961D7F200972B8C /* LinkingEditor.h */; + name = "LinkingEditor.h: 51"; + rLen = 0; + rLoc = 1500; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DB8106C978100C8D785 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 2191982109D607C600586B15 /* PrefsWindowController.m */; + }; + 21313DBE106C97F100C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 219588D10961D7F200972B8C /* LinkingEditor.m */; + name = "LinkingEditor.m: 956"; + rLen = 5; + rLoc = 36176; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DC0106C97F100C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 219FD3140B2CC655004E132B /* LinkingEditor_Indentation.h */; + name = "LinkingEditor_Indentation.h: 17"; + rLen = 0; + rLoc = 333; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DC1106C97F100C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 219190EF09C4A60600586B15 /* DualField.h */; + name = "DualField.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DC2106C97F100C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 219192D309CFBC8700586B15 /* NoteAttributeColumn.m */; + name = "NoteAttributeColumn.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DC3106C97F100C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 219190F009C4A60700586B15 /* DualField.m */; + name = "DualField.m: 194"; + rLen = 18; + rLoc = 6017; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DC4106C97F100C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2191982109D607C600586B15 /* PrefsWindowController.m */; + name = "PrefsWindowController.m: 432"; + rLen = 0; + rLoc = 16297; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DD5106C9B2200C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 21A2F95C09DF3FDC001AF0B5 /* NotationPrefs.h */; + name = "NotationPrefs.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DD6106C9B2200C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2191930109CFBEBD00586B15 /* NotesTableView.h */; + name = "NotesTableView.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DD7106C9B2200C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1450957733200614E74 /* NoteObject.m */; + name = "NoteObject.m: 493"; + rLen = 0; + rLoc = 17658; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DDF106C9B2200C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1440957733200614E74 /* NoteObject.h */; + name = "NoteObject.h: 16"; + rLen = 0; + rLoc = 288; + rType = 0; + vrLen = 1261; + vrLoc = 0; + }; + 21313DE0106C9B2200C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1450957733200614E74 /* NoteObject.m */; + name = "NoteObject.m: 34"; + rLen = 20; + rLoc = 712; + rType = 0; + vrLen = 1423; + vrLoc = 144; + }; + 21313DE8106C9BFC00C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C11509575BD400614E74 /* AppController.m */; + name = "AppController.m: 303"; + rLen = 9; + rLoc = 10826; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DE9106C9BFC00C8D785 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 2114C1440957733200614E74 /* NoteObject.h */; + }; + 21313DED106C9BFC00C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1440957733200614E74 /* NoteObject.h */; + name = "NoteObject.h: 16"; + rLen = 0; + rLoc = 288; + rType = 0; + vrLen = 1362; + vrLoc = 0; + }; + 21313DEE106C9BFC00C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1450957733200614E74 /* NoteObject.m */; + rLen = 1; + rLoc = 1017; + rType = 1; + }; + 21313DF5106C9CFF00C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1440957733200614E74 /* NoteObject.h */; + name = "NoteObject.h: 16"; + rLen = 0; + rLoc = 288; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21313DF6106C9CFF00C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1450957733200614E74 /* NoteObject.m */; + name = "NoteObject.m: 987"; + rLen = 0; + rLoc = 34099; + rType = 0; + vrLen = 1519; + vrLoc = 33280; + }; + 21313DF7106C9CFF00C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1450957733200614E74 /* NoteObject.m */; + name = "NoteObject.m: 1036"; + rLen = 27; + rLoc = 35593; + rType = 0; + vrLen = 1596; + vrLoc = 34847; + }; + 21313DF8106C9CFF00C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2191982109D607C600586B15 /* PrefsWindowController.m */; + name = "PrefsWindowController.m: 217"; + rLen = 0; + rLoc = 7900; + rType = 0; + vrLen = 1996; + vrLoc = 6770; + }; + 21313DF9106C9CFF00C8D785 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */; + name = "Notation_Prefix.pch: 67"; + rLen = 0; + rLoc = 1677; + rType = 0; + vrLen = 1371; + vrLoc = 500; + }; 213621EF0B92414F008C0830 /* MultiTextFinder.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {138, 392}}"; @@ -426,8 +655,9 @@ }; 213621F00B92414F008C0830 /* MultiTextFinder.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1004, 2772}}"; - sepNavSelRange = "{4941, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {782, 2600}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 514}"; sepNavVisRect = "{{0, 2114}, {718, 99}}"; sepNavWindowFrame = "{{317, 179}, {915, 999}}"; }; @@ -460,87 +690,6 @@ vrLen = 0; vrLoc = 0; }; - 2139CF52105D985D00FD961B /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - CFBundleGetInfoString, - ); - name = /Users/scrod/Projects/Notation/Info.plist; - rLen = 0; - rLoc = 2147483647; - }; - 2139CF53105D985D00FD961B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2114C11509575BD400614E74 /* AppController.m */; - rLen = 14; - rLoc = 28418; - rType = 0; - }; - 2139CF54105D985D00FD961B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 089C165DFE840E0CC02AAC07 /* English */; - name = "InfoPlist.strings: 3"; - rLen = 0; - rLoc = 82; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 2139CF55105D985D00FD961B /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - CFBundleGetInfoString, - ); - name = /Users/scrod/Projects/Notation/Info.plist; - rLen = 0; - rLoc = 2147483647; - }; - 2139CF5B105D986E00FD961B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2114C11509575BD400614E74 /* AppController.m */; - name = "AppController.m: 716"; - rLen = 14; - rLoc = 28418; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 2139CF5C105D986E00FD961B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 219588D10961D7F200972B8C /* LinkingEditor.m */; - name = "LinkingEditor.m: 770"; - rLen = 0; - rLoc = 29121; - rType = 0; - vrLen = 1314; - vrLoc = 28397; - }; - 2139CF5D105D986E00FD961B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2114C13E0957732800614E74 /* NotationController.m */; - name = "NotationController.m: 246"; - rLen = 0; - rLoc = 7099; - rType = 0; - vrLen = 1994; - vrLoc = 6382; - }; - 2139CF5E105D986E00FD961B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 217CEBA209E9885500DF0E09 /* NotationFileManager.m */; - name = "NotationFileManager.m: 167"; - rLen = 16; - rLoc = 5277; - rType = 0; - vrLen = 2001; - vrLoc = 4087; - }; 213FAD510B3C6B52004C74BD /* FSExchangeObjectsCompat.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {30, 210}}"; @@ -552,9 +701,9 @@ }; 213FAD520B3C6B52004C74BD /* FSExchangeObjectsCompat.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {186, 4298}}"; - sepNavSelRange = "{56, 0}"; - sepNavVisRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {1112, 3848}}"; + sepNavSelRange = "{11120, 4}"; + sepNavVisRange = "{10252, 961}"; sepNavVisRect = "{{0, 623}, {883, 899}}"; sepNavWindowFrame = "{{598, 62}, {922, 1028}}"; }; @@ -624,10 +773,6 @@ isa = PBXBookmark; fRef = 215DEE1209F1AA4C009A710B /* Editing.tiff */; }; - 214C6C681054454C0085D386 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 215DEE1209F1AA4C009A710B /* Editing.tiff */; - }; 21544FBF0B06332600C0D1D5 /* KeyDerivationManager.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {907, 888}}"; @@ -672,7 +817,7 @@ }; 2155DEA4097B5F0300163A10 /* BufferUtils.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {24, 434}}"; + sepNavIntBoundsRect = "{{0, 0}, {26, 403}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 307}, {718, 99}}"; @@ -681,9 +826,9 @@ }; 2155DEA5097B5F0300163A10 /* BufferUtils.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {982, 4648}}"; - sepNavSelRange = "{206, 20}"; - sepNavVisRange = "{0, 823}"; + sepNavIntBoundsRect = "{{0, 0}, {985, 4004}}"; + sepNavSelRange = "{5170, 0}"; + sepNavVisRange = "{4764, 811}"; sepNavVisRect = "{{0, 52}, {985, 891}}"; sepNavWindowFrame = "{{468, 64}, {1024, 814}}"; }; @@ -698,9 +843,9 @@ }; 2155DF43097C992800163A10 /* AttributedPlainText.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {12, 2380}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {1112, 3874}}"; + sepNavSelRange = "{7059, 0}"; + sepNavVisRange = "{6964, 1203}"; sepNavVisRect = "{{20, 1404}, {1002, 483}}"; sepNavWindowFrame = "{{240, 64}, {1176, 814}}"; }; @@ -731,10 +876,11 @@ }; 21582DC40B73F59A00711663 /* BookmarksController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1256, 7070}}"; - sepNavSelRange = "{12691, 2}"; + sepNavIntBoundsRect = "{{0, 0}, {12, 6591}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 5360}, {881, 970}}"; - sepNavWindowFrame = "{{148, -115}, {920, 1099}}"; + sepNavWindowFrame = "{{148, 77}, {920, 801}}"; }; }; 215DE83609ECC4FE009A710B /* HeaderViewWIthMenu.h */ = { @@ -760,35 +906,88 @@ }; 2168EC5109E33B0300778D02 /* FrozenNotation.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {751, 898}}"; - sepNavSelRange = "{468, 28}"; + sepNavIntBoundsRect = "{{0, 0}, {26, 416}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 0}, {751, 898}}"; - sepNavWindowFrame = "{{794, 1}, {790, 1027}}"; + sepNavWindowFrame = "{{650, 71}, {790, 807}}"; }; }; 2168EC5209E33B0300778D02 /* FrozenNotation.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {860, 2380}}"; - sepNavSelRange = "{2001, 8}"; + sepNavIntBoundsRect = "{{0, 0}, {12, 3052}}"; + sepNavSelRange = "{631, 31}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 1481}, {856, 899}}"; - sepNavWindowFrame = "{{212, 0}, {895, 1028}}"; + sepNavWindowFrame = "{{212, 73}, {895, 805}}"; }; }; + 2170B4AB106D228100AF1CAC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1440957733200614E74 /* NoteObject.h */; + name = "NoteObject.h: 16"; + rLen = 0; + rLoc = 288; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 2170B4AE106D228100AF1CAC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1450957733200614E74 /* NoteObject.m */; + name = "NoteObject.m: 987"; + rLen = 0; + rLoc = 34099; + rType = 0; + vrLen = 1366; + vrLoc = 33433; + }; + 2170B4AF106D228100AF1CAC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C1450957733200614E74 /* NoteObject.m */; + name = "NoteObject.m: 1036"; + rLen = 27; + rLoc = 35593; + rType = 0; + vrLen = 1559; + vrLoc = 34847; + }; + 2170B4B0106D228100AF1CAC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2191982109D607C600586B15 /* PrefsWindowController.m */; + name = "PrefsWindowController.m: 217"; + rLen = 0; + rLoc = 7900; + rType = 0; + vrLen = 1902; + vrLoc = 6864; + }; + 2170B4B1106D228100AF1CAC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */; + name = "Notation_Prefix.pch: 67"; + rLen = 0; + rLoc = 1677; + rType = 0; + vrLen = 1341; + vrLoc = 530; + }; 217CEBA109E9885500DF0E09 /* NotationFileManager.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {839, 709}}"; - sepNavSelRange = "{586, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {819, 726}}"; + sepNavSelRange = "{2172, 0}"; + sepNavVisRange = "{0, 2283}"; sepNavVisRect = "{{0, 0}, {839, 709}}"; - sepNavWindowFrame = "{{1045, 64}, {878, 838}}"; + sepNavWindowFrame = "{{435, 159}, {878, 838}}"; }; }; 217CEBA209E9885500DF0E09 /* NotationFileManager.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1085, 7952}}"; - sepNavSelRange = "{5277, 16}"; - sepNavVisRange = "{4087, 2001}"; + sepNavIntBoundsRect = "{{0, 0}, {1181, 7761}}"; + sepNavSelRange = "{4528, 0}"; + sepNavVisRange = "{3842, 1485}"; sepNavVisRect = "{{0, 1987}, {1002, 483}}"; - sepNavWindowFrame = "{{115, 64}, {1144, 814}}"; + sepNavWindowFrame = "{{806, 159}, {982, 1019}}"; }; }; 217D02D30B77061E0004E02D /* BodyScroller.h */ = { @@ -825,9 +1024,9 @@ }; 217D4B570A61F42700887100 /* NSTextFinder.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1036, 952}}"; + sepNavIntBoundsRect = "{{0, 0}, {12, 884}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{525, 1345}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 335}, {1056, 617}}"; sepNavWindowFrame = "{{216, 132}, {1095, 746}}"; }; @@ -842,16 +1041,16 @@ }; 217EB3CD0B0F62FB0041A8A9 /* NSTextFinder_LastFind.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {711, 618}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 642}"; + sepNavIntBoundsRect = "{{0, 0}, {711, 634}}"; + sepNavSelRange = "{185, 0}"; + sepNavVisRange = "{0, 856}"; sepNavVisRect = "{{0, 0}, {731, 617}}"; sepNavWindowFrame = "{{277, 132}, {770, 746}}"; }; }; 2181171109F311110020A252 /* DeletedNoteObject.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {24, 434}}"; + sepNavIntBoundsRect = "{{0, 0}, {26, 403}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 117}, {739, 289}}"; @@ -860,17 +1059,18 @@ }; 2181171209F311110020A252 /* DeletedNoteObject.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {881, 784}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 1428}"; + sepNavIntBoundsRect = "{{0, 0}, {922, 871}}"; + sepNavSelRange = "{620, 0}"; + sepNavVisRange = "{0, 1888}"; sepNavVisRect = "{{0, 509}, {739, 289}}"; - sepNavWindowFrame = "{{452, 64}, {940, 814}}"; + sepNavWindowFrame = "{{226, 77}, {940, 801}}"; }; }; 2181193909FA9CF90020A252 /* SynchronizedNoteProtocol.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1158, 895}}"; - sepNavSelRange = "{326, 12}"; + sepNavIntBoundsRect = "{{0, 0}, {26, 273}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 0}, {1158, 895}}"; sepNavWindowFrame = "{{389, 4}, {1197, 1024}}"; }; @@ -883,68 +1083,143 @@ sepNavWindowFrame = "{{15, 92}, {1351, 1081}}"; }; }; - 2191858309BEAB6400586B15 /* RBSplitSubview.h */ = { + 2182B395106B2296008641E4 /* RBSplitSubview.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {12, 1442}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 2054}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {772, 540}}"; - sepNavWindowFrame = "{{138, 116}, {811, 669}}"; + sepNavVisRange = "{0, 376}"; }; }; - 2191858409BEAB6400586B15 /* RBSplitSubview.m */ = { + 2182B396106B2296008641E4 /* RBSplitSubview.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {752, 13118}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 1242}"; - sepNavVisRect = "{{0, 5190}, {929, 806}}"; - sepNavWindowFrame = "{{256, 93}, {968, 935}}"; + sepNavIntBoundsRect = "{{0, 0}, {1416, 12670}}"; + sepNavSelRange = "{24114, 16}"; + sepNavVisRange = "{23175, 2100}"; + sepNavWindowFrame = "{{47, 132}, {1086, 807}}"; }; }; - 2191858509BEAB6400586B15 /* RBSplitView.h */ = { + 2182B398106B2296008641E4 /* RBSplitView.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1154, 3164}}"; - sepNavSelRange = "{8917, 0}"; - sepNavVisRect = "{{0, 2284}, {880, 616}}"; - sepNavWindowFrame = "{{557, 70}, {919, 746}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 22685}}"; + sepNavSelRange = "{63248, 0}"; + sepNavVisRange = "{62932, 855}"; + sepNavWindowFrame = "{{19, 133}, {1051, 801}}"; }; }; - 2191858609BEAB6400586B15 /* RBSplitView.m */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1472, 24360}}"; - sepNavSelRange = "{53597, 7}"; - sepNavVisRect = "{{0, 20507}, {727, 244}}"; - sepNavWindowFrame = "{{763, 1}, {910, 1027}}"; - }; + 2182B39D106B2359008641E4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 21F1CD680B3A38DB001FB5F6 /* PTKeyBroadcaster.h */; + name = "PTKeyBroadcaster.h: 4"; + rLen = 0; + rLoc = 40; + rType = 0; + vrLen = 237; + vrLoc = 0; }; - 2191858709BEAB6400586B15 /* RBSplitViewPrivateDefines.h */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {980, 1372}}"; - sepNavSelRange = "{1609, 0}"; - sepNavVisRect = "{{0, 0}, {802, 710}}"; - sepNavWindowFrame = "{{15, 183}, {841, 840}}"; - }; + 2182B3BB106B24FA008641E4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2182B395106B2296008641E4 /* RBSplitSubview.h */; + name = "RBSplitSubview.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 376; + vrLoc = 0; }; - 21918FCE09C49B2400586B15 /* EmptyView.m */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {138, 672}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 0}"; - sepNavVisRect = "{{0, 252}, {955, 211}}"; - sepNavWindowFrame = "{{231, 191}, {811, 668}}"; - }; + 2182B3D1106B2561008641E4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 213621F00B92414F008C0830 /* MultiTextFinder.m */; + name = "MultiTextFinder.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 514; + vrLoc = 0; }; - 21918FCF09C49B2500586B15 /* EmptyView.h */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {772, 540}}"; - sepNavSelRange = "{0, 0}"; + 2182B429106B35CC008641E4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2181171109F311110020A252 /* DeletedNoteObject.h */; + name = "DeletedNoteObject.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 2182B42A106B35CC008641E4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2181193909FA9CF90020A252 /* SynchronizedNoteProtocol.h */; + name = "SynchronizedNoteProtocol.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 2182B42B106B35CC008641E4 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 215DEA4609EF6446009A710B /* Notes.tiff */; + }; + 2182B42D106B35CC008641E4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 21F1CD6C0B3A38DB001FB5F6 /* PTKeyComboPanel.m */; + name = "PTKeyComboPanel.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 2182B46E106B3E9E008641E4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2155DEA4097B5F0300163A10 /* BufferUtils.h */; + name = "BufferUtils.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 2182B46F106B3E9E008641E4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2114C23B095883A600614E74 /* NSData_transformations.h */; + name = "NSData_transformations.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 2182B479106B3EDA008641E4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 21A6E6FB0974204F008436A9 /* LabelsListController.h */; + name = "LabelsListController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 21918FCE09C49B2400586B15 /* EmptyView.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {138, 672}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 0}"; + sepNavVisRect = "{{0, 252}, {955, 211}}"; + sepNavWindowFrame = "{{231, 191}, {811, 668}}"; + }; + }; + 21918FCF09C49B2500586B15 /* EmptyView.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {772, 540}}"; + sepNavSelRange = "{0, 0}"; sepNavVisRect = "{{0, 0}, {772, 540}}"; sepNavWindowFrame = "{{15, 72}, {811, 669}}"; }; }; 219190EF09C4A60600586B15 /* DualField.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {12, 182}}"; + sepNavIntBoundsRect = "{{0, 0}, {117, 364}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 0}, {1031, 616}}"; @@ -953,9 +1228,9 @@ }; 219190F009C4A60700586B15 /* DualField.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1181, 4550}}"; - sepNavSelRange = "{6316, 7}"; - sepNavVisRange = "{6118, 1124}"; + sepNavIntBoundsRect = "{{0, 0}, {999, 4082}}"; + sepNavSelRange = "{6017, 18}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 1362}, {1002, 483}}"; sepNavWindowFrame = "{{453, 54}, {947, 1028}}"; }; @@ -970,27 +1245,29 @@ }; 219192D309CFBC8700586B15 /* NoteAttributeColumn.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {823, 896}}"; - sepNavSelRange = "{370, 7}"; + sepNavIntBoundsRect = "{{0, 0}, {229, 845}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 280}, {823, 616}}"; sepNavWindowFrame = "{{190, 101}, {862, 745}}"; }; }; 2191930109CFBEBD00586B15 /* NotesTableView.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {566, 1260}}"; - sepNavSelRange = "{764, 23}"; + sepNavIntBoundsRect = "{{0, 0}, {152, 1183}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 148}, {566, 531}}"; sepNavWindowFrame = "{{85, 106}, {605, 660}}"; }; }; 2191930209CFBEBD00586B15 /* NotesTableView.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {879, 10752}}"; - sepNavSelRange = "{248, 0}"; - sepNavVisRange = "{0, 2245}"; + sepNavIntBoundsRect = "{{0, 0}, {978, 9971}}"; + sepNavSelRange = "{17835, 0}"; + sepNavVisRange = "{17247, 1262}"; sepNavVisRect = "{{0, 977}, {899, 899}}"; - sepNavWindowFrame = "{{330, 64}, {938, 814}}"; + sepNavWindowFrame = "{{330, 73}, {938, 805}}"; }; }; 2191982009D607C600586B15 /* PrefsWindowController.h */ = { @@ -1003,27 +1280,29 @@ }; 2191982109D607C600586B15 /* PrefsWindowController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {897, 6384}}"; - sepNavSelRange = "{7134, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {882, 6482}}"; + sepNavSelRange = "{7900, 0}"; + sepNavVisRange = "{6864, 1902}"; sepNavVisRect = "{{0, 2355}, {897, 822}}"; - sepNavWindowFrame = "{{491, 110}, {936, 951}}"; + sepNavWindowFrame = "{{353, 77}, {936, 801}}"; }; }; 219588D00961D7F200972B8C /* LinkingEditor.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {776, 952}}"; - sepNavSelRange = "{1467, 4}"; + sepNavIntBoundsRect = "{{0, 0}, {894, 819}}"; + sepNavSelRange = "{1500, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 374}, {536, 578}}"; sepNavWindowFrame = "{{305, 129}, {575, 707}}"; }; }; 219588D10961D7F200972B8C /* LinkingEditor.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1458, 15568}}"; - sepNavSelRange = "{29121, 0}"; - sepNavVisRange = "{28397, 1314}"; + sepNavIntBoundsRect = "{{0, 0}, {1251, 14690}}"; + sepNavSelRange = "{36536, 0}"; + sepNavVisRange = "{35777, 1839}"; sepNavVisRect = "{{0, 12943}, {718, 341}}"; - sepNavWindowFrame = "{{318, 64}, {987, 814}}"; + sepNavWindowFrame = "{{249, 77}, {1191, 801}}"; }; }; 219739F90AFE42A10046683E /* PassphraseRetriever.h */ = { @@ -1045,18 +1324,18 @@ }; 219FD3140B2CC655004E132B /* LinkingEditor_Indentation.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {982, 414}}"; + sepNavIntBoundsRect = "{{0, 0}, {418, 348}}"; sepNavSelRange = "{333, 0}"; - sepNavVisRange = "{0, 340}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 0}, {1075, 916}}"; sepNavWindowFrame = "{{211, 133}, {1114, 1045}}"; }; }; 219FD3150B2CC655004E132B /* LinkingEditor_Indentation.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1181, 2982}}"; - sepNavSelRange = "{3104, 17}"; - sepNavVisRange = "{2272, 1596}"; + sepNavIntBoundsRect = "{{0, 0}, {1181, 2940}}"; + sepNavSelRange = "{2600, 18}"; + sepNavVisRange = "{2278, 1590}"; sepNavVisRect = "{{0, 644}, {718, 99}}"; sepNavWindowFrame = "{{65, 64}, {1114, 814}}"; }; @@ -1081,16 +1360,18 @@ }; 21A2F95C09DF3FDC001AF0B5 /* NotationPrefs.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {751, 1638}}"; - sepNavSelRange = "{3077, 11}"; + sepNavIntBoundsRect = "{{0, 0}, {26, 1573}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 739}, {751, 899}}"; sepNavWindowFrame = "{{487, 150}, {790, 1028}}"; }; }; 21A2F95D09DF3FDC001AF0B5 /* NotationPrefs.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1002, 10192}}"; - sepNavSelRange = "{1594, 7}"; + sepNavIntBoundsRect = "{{0, 0}, {964, 9152}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 661}"; sepNavVisRect = "{{0, 578}, {1002, 483}}"; sepNavWindowFrame = "{{291, 115}, {851, 1063}}"; }; @@ -1105,10 +1386,11 @@ }; 21A2FA1609DF6174001AF0B5 /* NotationPrefsViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1272, 6188}}"; - sepNavSelRange = "{14671, 2}"; + sepNavIntBoundsRect = "{{0, 0}, {12, 3429}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 5404}, {1272, 771}}"; - sepNavWindowFrame = "{{118, 184}, {1311, 900}}"; + sepNavWindowFrame = "{{105, 77}, {1311, 801}}"; }; }; 21A30EA50971D11D0071E9AF /* FastListDataSource.h */ = { @@ -1121,54 +1403,53 @@ }; 21A30EA60971D11D0071E9AF /* FastListDataSource.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {12, 924}}"; + sepNavIntBoundsRect = "{{0, 0}, {674, 2184}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 0}"; + sepNavVisRange = "{0, 345}"; sepNavVisRect = "{{0, 1414}, {893, 616}}"; sepNavWindowFrame = "{{389, 105}, {932, 745}}"; }; }; 21A6E6FB0974204F008436A9 /* LabelsListController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {744, 541}}"; - sepNavSelRange = "{308, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {26, 507}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 0}, {744, 541}}"; sepNavWindowFrame = "{{76, 330}, {783, 671}}"; }; }; 21A6E6FC0974204F008436A9 /* LabelsListController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {982, 1974}}"; + sepNavIntBoundsRect = "{{0, 0}, {96, 1664}}"; sepNavSelRange = "{305, 0}"; - sepNavVisRange = "{0, 582}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 0}, {718, 174}}"; sepNavWindowFrame = "{{274, 78}, {902, 848}}"; }; }; 21A73DC6099712A8009F8A6C /* WALController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {621, 966}}"; - sepNavSelRange = "{593, 15}"; + sepNavIntBoundsRect = "{{0, 0}, {601, 994}}"; + sepNavSelRange = "{1320, 0}"; + sepNavVisRange = "{433, 1363}"; sepNavVisRect = "{{0, 154}, {621, 702}}"; - sepNavWindowFrame = "{{101, 49}, {660, 832}}"; + sepNavWindowFrame = "{{122, 235}, {660, 832}}"; }; }; 21A73DC7099712A8009F8A6C /* WALController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {928, 7574}}"; - sepNavSelRange = "{12551, 6}"; + sepNavIntBoundsRect = "{{0, 0}, {1013, 6708}}"; + sepNavSelRange = "{10694, 0}"; + sepNavVisRange = "{9908, 1464}"; sepNavVisRect = "{{0, 4900}, {928, 882}}"; - sepNavWindowFrame = "{{972, -39}, {967, 1011}}"; + sepNavWindowFrame = "{{206, 77}, {985, 801}}"; }; }; 21B5447D105D7963002097C4 /* PBXBookmark */ = { isa = PBXBookmark; fRef = 214C6C58105445410085D386 /* Notality.icns */; }; - 21B5447F105D7963002097C4 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 214C6C58105445410085D386 /* Notality.icns */; - }; 21B544CA105D8FAB002097C4 /* -[NSException raise] */ = { isa = PBXSymbolicBreakpoint; actions = ( @@ -1211,26 +1492,6 @@ state = 1; symbolName = "-[NSException raise]"; }; - 21B54535105D953C002097C4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 217CEBA209E9885500DF0E09 /* NotationFileManager.m */; - name = "NotationFileManager.m: 216"; - rLen = 18; - rLoc = 7028; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21B54536105D953C002097C4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 219588D10961D7F200972B8C /* LinkingEditor.m */; - name = "LinkingEditor.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 21B54537105D953C002097C4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 212B84600978422300F3597F /* NSString_NV.h */; @@ -1241,38 +1502,6 @@ vrLen = 0; vrLoc = 0; }; - 21B5453A105D953C002097C4 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - CFBundleGetInfoString, - ); - name = /Users/scrod/Projects/Notation/Info.plist; - rLen = 0; - rLoc = 2147483647; - }; - 21B5453B105D953C002097C4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 217CEBA209E9885500DF0E09 /* NotationFileManager.m */; - name = "NotationFileManager.m: 216"; - rLen = 18; - rLoc = 7028; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21B5453D105D953C002097C4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 212B84600978422300F3597F /* NSString_NV.h */; - name = "NSString_NV.h: 6"; - rLen = 39; - rLoc = 101; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 21C61FAB10542D40004D5948 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 213FAD510B3C6B52004C74BD /* FSExchangeObjectsCompat.h */; @@ -1303,76 +1532,6 @@ vrLen = 0; vrLoc = 0; }; - 21C61FAF10542D40004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 213FAD510B3C6B52004C74BD /* FSExchangeObjectsCompat.h */; - name = "FSExchangeObjectsCompat.h: 5"; - rLen = 0; - rLoc = 49; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C61FB010542D40004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 215453EE0B067A5100C0D1D5 /* KeyDerivationDelaySlider.h */; - name = "KeyDerivationDelaySlider.h: 12"; - rLen = 0; - rLoc = 236; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C61FB110542D40004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 211345A90B35D8540081B064 /* broken_md5.c */; - name = "broken_md5.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C61FC410542EA3004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2114C23B095883A600614E74 /* NSData_transformations.h */; - name = "NSData_transformations.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C61FC610542EA3004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2114C23B095883A600614E74 /* NSData_transformations.h */; - name = "NSData_transformations.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C61FD410542F10004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 213FAD520B3C6B52004C74BD /* FSExchangeObjectsCompat.c */; - name = "FSExchangeObjectsCompat.c: 3"; - rLen = 0; - rLoc = 56; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C61FD710542F10004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 213FAD520B3C6B52004C74BD /* FSExchangeObjectsCompat.c */; - name = "FSExchangeObjectsCompat.c: 3"; - rLen = 0; - rLoc = 56; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 21C61FEC10542FB9004D5948 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 2114C2870958CC9100614E74 /* pbkdf2.c */; @@ -1403,66 +1562,6 @@ vrLen = 0; vrLoc = 0; }; - 21C61FF010542FB9004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2114C2870958CC9100614E74 /* pbkdf2.c */; - name = "pbkdf2.c: 12"; - rLen = 34; - rLoc = 112; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C61FF110542FB9004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 213621EF0B92414F008C0830 /* MultiTextFinder.h */; - name = "MultiTextFinder.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C61FF210542FB9004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 21469C890BEBA6A10094835F /* TemporaryFileCache.h */; - name = "TemporaryFileCache.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6200B10542FD1004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 21FF94F50B5AD23B00DB6A2F /* ExporterManager.m */; - name = "ExporterManager.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C620151054311C004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 219588D10961D7F200972B8C /* LinkingEditor.m */; - name = "LinkingEditor.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6206410543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2155DEA4097B5F0300163A10 /* BufferUtils.h */; - name = "BufferUtils.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 21C6206510543D7D004D5948 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 21395BB30B7FDB85007BCFAA /* Notation.freqorder */; @@ -1483,16 +1582,6 @@ vrLen = 0; vrLoc = 0; }; - 21C6206710543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 212DCF600A6DEECB00F74E46 /* DeletionManager.m */; - name = "DeletionManager.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 21C6206810543D7D004D5948 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 212DCA450A6AD28700F74E46 /* EncodingsManager.h */; @@ -1503,16 +1592,6 @@ vrLen = 0; vrLoc = 0; }; - 21C6206910543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 219FD3150B2CC655004E132B /* LinkingEditor_Indentation.m */; - name = "LinkingEditor_Indentation.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 21C6206A10543D7D004D5948 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 214495120ADC8A6600E2A2B6 /* PassphrasePicker.m */; @@ -1533,26 +1612,6 @@ vrLen = 0; vrLoc = 0; }; - 21C6206C10543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 212B84610978422300F3597F /* NSString_NV.m */; - name = "NSString_NV.m: 345"; - rLen = 0; - rLoc = 13244; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6206D10543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2181171109F311110020A252 /* DeletedNoteObject.h */; - name = "DeletedNoteObject.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 21C6206E10543D7D004D5948 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 211344430B354E000081B064 /* idea_ossl.h */; @@ -1563,26 +1622,6 @@ vrLen = 0; vrLoc = 0; }; - 21C6206F10543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */; - name = "Notation_Prefix.pch: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207010543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2114C13E0957732800614E74 /* NotationController.m */; - name = "NotationController.m: 435"; - rLen = 0; - rLoc = 13754; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 21C6207110543D7D004D5948 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 21FF94F50B5AD23B00DB6A2F /* ExporterManager.m */; @@ -1593,147 +1632,6 @@ vrLen = 0; vrLoc = 0; }; - 21C6207410543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2155DEA4097B5F0300163A10 /* BufferUtils.h */; - name = "BufferUtils.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207510543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 21395BB30B7FDB85007BCFAA /* Notation.freqorder */; - name = "Notation.freqorder: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207610543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 212DCF5F0A6DEECB00F74E46 /* DeletionManager.h */; - name = "DeletionManager.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207710543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 212DCF600A6DEECB00F74E46 /* DeletionManager.m */; - name = "DeletionManager.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207810543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 212DCA450A6AD28700F74E46 /* EncodingsManager.h */; - name = "EncodingsManager.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207910543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 219FD3150B2CC655004E132B /* LinkingEditor_Indentation.m */; - name = "LinkingEditor_Indentation.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207A10543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 214495120ADC8A6600E2A2B6 /* PassphrasePicker.m */; - name = "PassphrasePicker.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207B10543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 21DC788D097894B600E59B09 /* NSCollection_utils.h */; - name = "NSCollection_utils.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207C10543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 212B84610978422300F3597F /* NSString_NV.m */; - name = "NSString_NV.m: 345"; - rLen = 0; - rLoc = 13244; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207D10543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2181171109F311110020A252 /* DeletedNoteObject.h */; - name = "DeletedNoteObject.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207E10543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 211344430B354E000081B064 /* idea_ossl.h */; - name = "idea_ossl.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6207F10543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */; - name = "Notation_Prefix.pch: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 21C6208010543D7D004D5948 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 21F1CD6A0B3A38DB001FB5F6 /* PTKeyCodes.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - ); - name = /Users/scrod/Notation/PTHotKeys/PTKeyCodes.plist; - rLen = 0; - rLoc = 2147483647; - }; - 21C6208110543D7D004D5948 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2114C13E0957732800614E74 /* NotationController.m */; - name = "NotationController.m: 435"; - rLen = 0; - rLoc = 13754; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 21C737930B50C73E0048C08A /* MultiplePageView.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1117, 896}}"; @@ -1752,36 +1650,6 @@ sepNavWindowFrame = "{{307, 0}, {1176, 1028}}"; }; }; - 21C8157C105D9679006479FC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 219588D10961D7F200972B8C /* LinkingEditor.m */; - name = "LinkingEditor.m: 770"; - rLen = 0; - rLoc = 29121; - rType = 0; - vrLen = 1314; - vrLoc = 28397; - }; - 21C8157D105D9679006479FC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2114C13E0957732800614E74 /* NotationController.m */; - name = "NotationController.m: 246"; - rLen = 0; - rLoc = 7099; - rType = 0; - vrLen = 1994; - vrLoc = 6382; - }; - 21C8157E105D9679006479FC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 217CEBA209E9885500DF0E09 /* NotationFileManager.m */; - name = "NotationFileManager.m: 167"; - rLen = 16; - rLoc = 5277; - rType = 0; - vrLen = 2067; - vrLoc = 4021; - }; 21D60126098FDB46007440DF /* GlobalPrefs.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {663, 1974}}"; @@ -1792,9 +1660,9 @@ }; 21D60127098FDB46007440DF /* GlobalPrefs.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {882, 9156}}"; - sepNavSelRange = "{9913, 0}"; - sepNavVisRange = "{9630, 1440}"; + sepNavIntBoundsRect = "{{0, 0}, {1181, 8814}}"; + sepNavSelRange = "{13149, 1}"; + sepNavVisRange = "{12616, 871}"; sepNavVisRect = "{{0, 753}, {845, 895}}"; sepNavWindowFrame = "{{377, 64}, {884, 814}}"; }; @@ -1810,9 +1678,9 @@ }; 21DC788E097894B600E59B09 /* NSCollection_utils.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {24, 2702}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {1112, 2912}}"; + sepNavSelRange = "{2436, 0}"; + sepNavVisRange = "{1608, 1081}"; sepNavVisRect = "{{0, 1894}, {1002, 483}}"; sepNavWindowFrame = "{{481, 64}, {1178, 814}}"; }; @@ -1833,6 +1701,16 @@ sepNavWindowFrame = "{{436, 0}, {851, 1028}}"; }; }; + 21ED6CE0106C22D900D37194 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */; + name = "Notation_Prefix.pch: 67"; + rLen = 0; + rLoc = 1677; + rType = 0; + vrLen = 1341; + vrLoc = 530; + }; 21F1CD650B3A38DB001FB5F6 /* PTHotKeyCenter.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {760, 686}}"; @@ -1844,16 +1722,18 @@ }; 21F1CD660B3A38DB001FB5F6 /* PTHotKeyCenter.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {718, 3360}}"; - sepNavSelRange = "{4328, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {726, 3094}}"; + sepNavSelRange = "{2350, 0}"; + sepNavVisRange = "{2073, 616}"; sepNavVisRect = "{{0, 2912}, {718, 99}}"; sepNavWindowFrame = "{{180, 94}, {819, 746}}"; }; }; 21F1CD680B3A38DB001FB5F6 /* PTKeyBroadcaster.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {780, 899}}"; - sepNavSelRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {474, 273}}"; + sepNavSelRange = "{40, 0}"; + sepNavVisRange = "{0, 237}"; sepNavVisRect = "{{0, 0}, {780, 899}}"; sepNavWindowFrame = "{{15, -5}, {819, 1028}}"; }; @@ -1885,9 +1765,9 @@ }; 21F1CD6C0B3A38DB001FB5F6 /* PTKeyComboPanel.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {760, 2604}}"; + sepNavIntBoundsRect = "{{0, 0}, {474, 2431}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 861}"; + sepNavVisRange = "{0, 0}"; sepNavVisRect = "{{0, 336}, {955, 211}}"; sepNavWindowFrame = "{{322, 64}, {819, 814}}"; }; @@ -1926,9 +1806,9 @@ }; 21FF94F50B5AD23B00DB6A2F /* ExporterManager.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1181, 2212}}"; - sepNavSelRange = "{2689, 0}"; - sepNavVisRange = "{1419, 1880}"; + sepNavIntBoundsRect = "{{0, 0}, {1258, 2171}}"; + sepNavSelRange = "{4555, 0}"; + sepNavVisRange = "{3430, 1682}"; sepNavVisRect = "{{0, 1415}, {1152, 825}}"; sepNavWindowFrame = "{{380, 83}, {1191, 954}}"; }; @@ -1942,8 +1822,10 @@ }; }; 29B97313FDCFA39411CA2CEA /* Project object */ = { + activeArchitecturePreference = x86_64; activeBuildConfigurationName = Deployment; activeExecutable = 2114C0D00957570800614E74 /* Notational Velocity */; + activeSDKPreference = macosx10.5; activeTarget = 8D1107260486CEB800E47090 /* Notation */; addToTargets = ( 8D1107260486CEB800E47090 /* Notation */, @@ -2050,7 +1932,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFindDataSource_LocationID; PBXFileTableDataSourceColumnWidthsKey = ( 200, - 45.2085, + 45.20849609375, ); PBXFileTableDataSourceColumnsKey = ( PBXFindDataSource_MessageID, @@ -2119,79 +2001,68 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 274568937; - PBXWorkspaceStateSaveDate = 274568937; + PBXPerProjectTemplateStateSaveDate = 275587708; + PBXWorkspaceStateSaveDate = 275587708; }; perUserProjectItems = { - 2139CF51105D985D00FD961B /* PBXTextBookmark */ = 2139CF51105D985D00FD961B /* PBXTextBookmark */; - 2139CF52105D985D00FD961B /* PlistBookmark */ = 2139CF52105D985D00FD961B /* PlistBookmark */; - 2139CF53105D985D00FD961B /* PBXTextBookmark */ = 2139CF53105D985D00FD961B /* PBXTextBookmark */; - 2139CF54105D985D00FD961B /* PBXTextBookmark */ = 2139CF54105D985D00FD961B /* PBXTextBookmark */; - 2139CF55105D985D00FD961B /* PlistBookmark */ = 2139CF55105D985D00FD961B /* PlistBookmark */; - 2139CF5B105D986E00FD961B /* PBXTextBookmark */ = 2139CF5B105D986E00FD961B /* PBXTextBookmark */; - 2139CF5C105D986E00FD961B /* PBXTextBookmark */ = 2139CF5C105D986E00FD961B /* PBXTextBookmark */; - 2139CF5D105D986E00FD961B /* PBXTextBookmark */ = 2139CF5D105D986E00FD961B /* PBXTextBookmark */; - 2139CF5E105D986E00FD961B /* PBXTextBookmark */ = 2139CF5E105D986E00FD961B /* PBXTextBookmark */; - 214C6C641054454C0085D386 /* PlistBookmark */ = 214C6C641054454C0085D386 /* PlistBookmark */; - 214C6C651054454C0085D386 /* PBXBookmark */ = 214C6C651054454C0085D386 /* PBXBookmark */; - 214C6C681054454C0085D386 /* PBXBookmark */ = 214C6C681054454C0085D386 /* PBXBookmark */; - 21B5447D105D7963002097C4 /* PBXBookmark */ = 21B5447D105D7963002097C4 /* PBXBookmark */; - 21B5447F105D7963002097C4 /* PBXBookmark */ = 21B5447F105D7963002097C4 /* PBXBookmark */; - 21B54535105D953C002097C4 /* PBXTextBookmark */ = 21B54535105D953C002097C4 /* PBXTextBookmark */; - 21B54536105D953C002097C4 /* PBXTextBookmark */ = 21B54536105D953C002097C4 /* PBXTextBookmark */; - 21B54537105D953C002097C4 /* PBXTextBookmark */ = 21B54537105D953C002097C4 /* PBXTextBookmark */; - 21B5453A105D953C002097C4 /* PlistBookmark */ = 21B5453A105D953C002097C4 /* PlistBookmark */; - 21B5453B105D953C002097C4 /* PBXTextBookmark */ = 21B5453B105D953C002097C4 /* PBXTextBookmark */; - 21B5453D105D953C002097C4 /* PBXTextBookmark */ = 21B5453D105D953C002097C4 /* PBXTextBookmark */; - 21C61FAB10542D40004D5948 /* PBXTextBookmark */ = 21C61FAB10542D40004D5948 /* PBXTextBookmark */; - 21C61FAC10542D40004D5948 /* PBXTextBookmark */ = 21C61FAC10542D40004D5948 /* PBXTextBookmark */; - 21C61FAD10542D40004D5948 /* PBXTextBookmark */ = 21C61FAD10542D40004D5948 /* PBXTextBookmark */; - 21C61FAF10542D40004D5948 /* PBXTextBookmark */ = 21C61FAF10542D40004D5948 /* PBXTextBookmark */; - 21C61FB010542D40004D5948 /* PBXTextBookmark */ = 21C61FB010542D40004D5948 /* PBXTextBookmark */; - 21C61FB110542D40004D5948 /* PBXTextBookmark */ = 21C61FB110542D40004D5948 /* PBXTextBookmark */; - 21C61FC410542EA3004D5948 /* PBXTextBookmark */ = 21C61FC410542EA3004D5948 /* PBXTextBookmark */; - 21C61FC610542EA3004D5948 /* PBXTextBookmark */ = 21C61FC610542EA3004D5948 /* PBXTextBookmark */; - 21C61FD410542F10004D5948 /* PBXTextBookmark */ = 21C61FD410542F10004D5948 /* PBXTextBookmark */; - 21C61FD710542F10004D5948 /* PBXTextBookmark */ = 21C61FD710542F10004D5948 /* PBXTextBookmark */; - 21C61FEC10542FB9004D5948 /* PBXTextBookmark */ = 21C61FEC10542FB9004D5948 /* PBXTextBookmark */; - 21C61FED10542FB9004D5948 /* PBXTextBookmark */ = 21C61FED10542FB9004D5948 /* PBXTextBookmark */; - 21C61FEE10542FB9004D5948 /* PBXTextBookmark */ = 21C61FEE10542FB9004D5948 /* PBXTextBookmark */; - 21C61FF010542FB9004D5948 /* PBXTextBookmark */ = 21C61FF010542FB9004D5948 /* PBXTextBookmark */; - 21C61FF110542FB9004D5948 /* PBXTextBookmark */ = 21C61FF110542FB9004D5948 /* PBXTextBookmark */; - 21C61FF210542FB9004D5948 /* PBXTextBookmark */ = 21C61FF210542FB9004D5948 /* PBXTextBookmark */; - 21C6200B10542FD1004D5948 /* PBXTextBookmark */ = 21C6200B10542FD1004D5948 /* PBXTextBookmark */; - 21C620151054311C004D5948 /* PBXTextBookmark */ = 21C620151054311C004D5948 /* PBXTextBookmark */; - 21C6206410543D7D004D5948 /* PBXTextBookmark */ = 21C6206410543D7D004D5948 /* PBXTextBookmark */; - 21C6206510543D7D004D5948 /* PBXTextBookmark */ = 21C6206510543D7D004D5948 /* PBXTextBookmark */; - 21C6206610543D7D004D5948 /* PBXTextBookmark */ = 21C6206610543D7D004D5948 /* PBXTextBookmark */; - 21C6206710543D7D004D5948 /* PBXTextBookmark */ = 21C6206710543D7D004D5948 /* PBXTextBookmark */; - 21C6206810543D7D004D5948 /* PBXTextBookmark */ = 21C6206810543D7D004D5948 /* PBXTextBookmark */; - 21C6206910543D7D004D5948 /* PBXTextBookmark */ = 21C6206910543D7D004D5948 /* PBXTextBookmark */; - 21C6206A10543D7D004D5948 /* PBXTextBookmark */ = 21C6206A10543D7D004D5948 /* PBXTextBookmark */; - 21C6206B10543D7D004D5948 /* PBXTextBookmark */ = 21C6206B10543D7D004D5948 /* PBXTextBookmark */; - 21C6206C10543D7D004D5948 /* PBXTextBookmark */ = 21C6206C10543D7D004D5948 /* PBXTextBookmark */; - 21C6206D10543D7D004D5948 /* PBXTextBookmark */ = 21C6206D10543D7D004D5948 /* PBXTextBookmark */; - 21C6206E10543D7D004D5948 /* PBXTextBookmark */ = 21C6206E10543D7D004D5948 /* PBXTextBookmark */; - 21C6206F10543D7D004D5948 /* PBXTextBookmark */ = 21C6206F10543D7D004D5948 /* PBXTextBookmark */; - 21C6207010543D7D004D5948 /* PBXTextBookmark */ = 21C6207010543D7D004D5948 /* PBXTextBookmark */; - 21C6207110543D7D004D5948 /* PBXTextBookmark */ = 21C6207110543D7D004D5948 /* PBXTextBookmark */; - 21C6207410543D7D004D5948 /* PBXTextBookmark */ = 21C6207410543D7D004D5948 /* PBXTextBookmark */; - 21C6207510543D7D004D5948 /* PBXTextBookmark */ = 21C6207510543D7D004D5948 /* PBXTextBookmark */; - 21C6207610543D7D004D5948 /* PBXTextBookmark */ = 21C6207610543D7D004D5948 /* PBXTextBookmark */; - 21C6207710543D7D004D5948 /* PBXTextBookmark */ = 21C6207710543D7D004D5948 /* PBXTextBookmark */; - 21C6207810543D7D004D5948 /* PBXTextBookmark */ = 21C6207810543D7D004D5948 /* PBXTextBookmark */; - 21C6207910543D7D004D5948 /* PBXTextBookmark */ = 21C6207910543D7D004D5948 /* PBXTextBookmark */; - 21C6207A10543D7D004D5948 /* PBXTextBookmark */ = 21C6207A10543D7D004D5948 /* PBXTextBookmark */; - 21C6207B10543D7D004D5948 /* PBXTextBookmark */ = 21C6207B10543D7D004D5948 /* PBXTextBookmark */; - 21C6207C10543D7D004D5948 /* PBXTextBookmark */ = 21C6207C10543D7D004D5948 /* PBXTextBookmark */; - 21C6207D10543D7D004D5948 /* PBXTextBookmark */ = 21C6207D10543D7D004D5948 /* PBXTextBookmark */; - 21C6207E10543D7D004D5948 /* PBXTextBookmark */ = 21C6207E10543D7D004D5948 /* PBXTextBookmark */; - 21C6207F10543D7D004D5948 /* PBXTextBookmark */ = 21C6207F10543D7D004D5948 /* PBXTextBookmark */; - 21C6208010543D7D004D5948 /* PlistBookmark */ = 21C6208010543D7D004D5948 /* PlistBookmark */; - 21C6208110543D7D004D5948 /* PBXTextBookmark */ = 21C6208110543D7D004D5948 /* PBXTextBookmark */; - 21C8157C105D9679006479FC /* PBXTextBookmark */ = 21C8157C105D9679006479FC /* PBXTextBookmark */; - 21C8157D105D9679006479FC /* PBXTextBookmark */ = 21C8157D105D9679006479FC /* PBXTextBookmark */; - 21C8157E105D9679006479FC /* PBXTextBookmark */ = 21C8157E105D9679006479FC /* PBXTextBookmark */; + 21313D28106C7F1700C8D785 = 21313D28106C7F1700C8D785 /* PBXTextBookmark */; + 21313D86106C908300C8D785 = 21313D86106C908300C8D785 /* PBXTextBookmark */; + 21313D87106C908300C8D785 = 21313D87106C908300C8D785 /* PBXTextBookmark */; + 21313DB8106C978100C8D785 = 21313DB8106C978100C8D785 /* PBXBookmark */; + 21313DBE106C97F100C8D785 = 21313DBE106C97F100C8D785 /* PBXTextBookmark */; + 21313DC0106C97F100C8D785 = 21313DC0106C97F100C8D785 /* PBXTextBookmark */; + 21313DC1106C97F100C8D785 = 21313DC1106C97F100C8D785 /* PBXTextBookmark */; + 21313DC2106C97F100C8D785 = 21313DC2106C97F100C8D785 /* PBXTextBookmark */; + 21313DC3106C97F100C8D785 = 21313DC3106C97F100C8D785 /* PBXTextBookmark */; + 21313DC4106C97F100C8D785 = 21313DC4106C97F100C8D785 /* PBXTextBookmark */; + 21313DD5106C9B2200C8D785 = 21313DD5106C9B2200C8D785 /* PBXTextBookmark */; + 21313DD6106C9B2200C8D785 = 21313DD6106C9B2200C8D785 /* PBXTextBookmark */; + 21313DD7106C9B2200C8D785 = 21313DD7106C9B2200C8D785 /* PBXTextBookmark */; + 21313DDF106C9B2200C8D785 = 21313DDF106C9B2200C8D785 /* PBXTextBookmark */; + 21313DE0106C9B2200C8D785 = 21313DE0106C9B2200C8D785 /* PBXTextBookmark */; + 21313DE8106C9BFC00C8D785 = 21313DE8106C9BFC00C8D785 /* PBXTextBookmark */; + 21313DE9106C9BFC00C8D785 = 21313DE9106C9BFC00C8D785 /* PBXBookmark */; + 21313DED106C9BFC00C8D785 = 21313DED106C9BFC00C8D785 /* PBXTextBookmark */; + 21313DEE106C9BFC00C8D785 = 21313DEE106C9BFC00C8D785 /* PBXTextBookmark */; + 21313DF5106C9CFF00C8D785 = 21313DF5106C9CFF00C8D785 /* PBXTextBookmark */; + 21313DF6106C9CFF00C8D785 = 21313DF6106C9CFF00C8D785 /* PBXTextBookmark */; + 21313DF7106C9CFF00C8D785 = 21313DF7106C9CFF00C8D785 /* PBXTextBookmark */; + 21313DF8106C9CFF00C8D785 = 21313DF8106C9CFF00C8D785 /* PBXTextBookmark */; + 21313DF9106C9CFF00C8D785 = 21313DF9106C9CFF00C8D785 /* PBXTextBookmark */; + 2139CF51105D985D00FD961B = 2139CF51105D985D00FD961B /* PBXTextBookmark */; + 214C6C641054454C0085D386 = 214C6C641054454C0085D386 /* PlistBookmark */; + 214C6C651054454C0085D386 = 214C6C651054454C0085D386 /* PBXBookmark */; + 2170B4AB106D228100AF1CAC /* PBXTextBookmark */ = 2170B4AB106D228100AF1CAC /* PBXTextBookmark */; + 2170B4AE106D228100AF1CAC /* PBXTextBookmark */ = 2170B4AE106D228100AF1CAC /* PBXTextBookmark */; + 2170B4AF106D228100AF1CAC /* PBXTextBookmark */ = 2170B4AF106D228100AF1CAC /* PBXTextBookmark */; + 2170B4B0106D228100AF1CAC /* PBXTextBookmark */ = 2170B4B0106D228100AF1CAC /* PBXTextBookmark */; + 2170B4B1106D228100AF1CAC /* PBXTextBookmark */ = 2170B4B1106D228100AF1CAC /* PBXTextBookmark */; + 2182B39D106B2359008641E4 = 2182B39D106B2359008641E4 /* PBXTextBookmark */; + 2182B3BB106B24FA008641E4 = 2182B3BB106B24FA008641E4 /* PBXTextBookmark */; + 2182B3D1106B2561008641E4 = 2182B3D1106B2561008641E4 /* PBXTextBookmark */; + 2182B429106B35CC008641E4 = 2182B429106B35CC008641E4 /* PBXTextBookmark */; + 2182B42A106B35CC008641E4 = 2182B42A106B35CC008641E4 /* PBXTextBookmark */; + 2182B42B106B35CC008641E4 = 2182B42B106B35CC008641E4 /* PBXBookmark */; + 2182B42D106B35CC008641E4 = 2182B42D106B35CC008641E4 /* PBXTextBookmark */; + 2182B46E106B3E9E008641E4 = 2182B46E106B3E9E008641E4 /* PBXTextBookmark */; + 2182B46F106B3E9E008641E4 = 2182B46F106B3E9E008641E4 /* PBXTextBookmark */; + 2182B479106B3EDA008641E4 = 2182B479106B3EDA008641E4 /* PBXTextBookmark */; + 21B5447D105D7963002097C4 = 21B5447D105D7963002097C4 /* PBXBookmark */; + 21B54537105D953C002097C4 = 21B54537105D953C002097C4 /* PBXTextBookmark */; + 21C61FAB10542D40004D5948 = 21C61FAB10542D40004D5948 /* PBXTextBookmark */; + 21C61FAC10542D40004D5948 = 21C61FAC10542D40004D5948 /* PBXTextBookmark */; + 21C61FAD10542D40004D5948 = 21C61FAD10542D40004D5948 /* PBXTextBookmark */; + 21C61FEC10542FB9004D5948 = 21C61FEC10542FB9004D5948 /* PBXTextBookmark */; + 21C61FED10542FB9004D5948 = 21C61FED10542FB9004D5948 /* PBXTextBookmark */; + 21C61FEE10542FB9004D5948 = 21C61FEE10542FB9004D5948 /* PBXTextBookmark */; + 21C6206510543D7D004D5948 = 21C6206510543D7D004D5948 /* PBXTextBookmark */; + 21C6206610543D7D004D5948 = 21C6206610543D7D004D5948 /* PBXTextBookmark */; + 21C6206810543D7D004D5948 = 21C6206810543D7D004D5948 /* PBXTextBookmark */; + 21C6206A10543D7D004D5948 = 21C6206A10543D7D004D5948 /* PBXTextBookmark */; + 21C6206B10543D7D004D5948 = 21C6206B10543D7D004D5948 /* PBXTextBookmark */; + 21C6206E10543D7D004D5948 = 21C6206E10543D7D004D5948 /* PBXTextBookmark */; + 21C6207110543D7D004D5948 = 21C6207110543D7D004D5948 /* PBXTextBookmark */; + 21ED6CE0106C22D900D37194 = 21ED6CE0106C22D900D37194 /* PBXTextBookmark */; }; sourceControlManager = 2114C0D90957570F00614E74 /* Source Control */; userBookmarkGroup = 215826490B72482B00711663 /* PBXBookmarkGroup */; @@ -2208,11 +2079,11 @@ }; 32CA4F630368D1EE00C91783 /* Notation_Prefix.pch */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {24, 532}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {716, 980}}"; + sepNavSelRange = "{1677, 0}"; + sepNavVisRange = "{530, 1341}"; sepNavVisRect = "{{0, 0}, {736, 617}}"; - sepNavWindowFrame = "{{614, 109}, {775, 746}}"; + sepNavWindowFrame = "{{574, 93}, {775, 762}}"; }; }; 8D1107260486CEB800E47090 /* Notation */ = { diff --git a/NotationController.h b/NotationController.h old mode 100644 new mode 100755 index b531d901..5eeb7119 --- a/NotationController.h +++ b/NotationController.h @@ -41,9 +41,9 @@ typedef struct _NoteCatalogEntry { NoteAttributeColumn* sortColumn; NoteObject **allNotesBuffer; - unsigned int allNotesBufferSize; + unsigned allNotesBufferSize; - unsigned selectedNoteIndex; + NSUInteger selectedNoteIndex; char *currentFilterStr, *manglingString; int lastWordInFilterStr; @@ -76,8 +76,8 @@ typedef struct _NoteCatalogEntry { NSUndoManager *undoManager; } -int compareCatalogEntryName(const void *one, const void *two); -int compareCatalogValueNodeID(id *a, id *b); +NSInteger compareCatalogEntryName(const void *one, const void *two); +NSInteger compareCatalogValueNodeID(id *a, id *b); void NotesDirFNSubscriptionProc(FNMessage message, OptionBits flags, void * refcon, FNSubscriptionRef subscription); - (id)init; @@ -140,12 +140,12 @@ void NotesDirFNSubscriptionProc(FNMessage message, OptionBits flags, void * refc - (void)refilterNotes; - (BOOL)filterNotesFromString:(NSString*)string; - (BOOL)filterNotesFromUTF8String:(const char*)searchString forceUncached:(BOOL)forceUncached; -- (unsigned)preferredSelectedNoteIndex; +- (NSUInteger)preferredSelectedNoteIndex; - (NoteObject*)noteObjectAtFilteredIndex:(int)noteIndex; - (NSArray*)notesAtIndexes:(NSIndexSet*)indexSet; - (NSIndexSet*)indexesOfNotes:(NSArray*)noteSet; -- (unsigned)indexInFilteredListForNoteIdenticalTo:(NoteObject*)note; -- (unsigned int)totalNoteCount; +- (NSUInteger)indexInFilteredListForNoteIdenticalTo:(NoteObject*)note; +- (NSUInteger)totalNoteCount; - (void)scheduleUpdateListForAttribute:(NSString*)attribute; - (NoteAttributeColumn*)sortColumn; diff --git a/NotationController.m b/NotationController.m old mode 100644 new mode 100755 index 0aef9342..791478aa --- a/NotationController.m +++ b/NotationController.m @@ -22,12 +22,12 @@ @implementation NotationController -int compareCatalogEntryName(const void *one, const void *two) { +NSInteger compareCatalogEntryName(const void *one, const void *two) { return (int)CFStringCompare((CFStringRef)((*(NoteCatalogEntry **)one)->filename), (CFStringRef)((*(NoteCatalogEntry **)two)->filename), kCFCompareCaseInsensitive); } -int compareCatalogValueNodeID(id *a, id *b) { +NSInteger compareCatalogValueNodeID(id *a, id *b) { NoteCatalogEntry* aEntry = (NoteCatalogEntry*)[*(id*)a pointerValue]; NoteCatalogEntry* bEntry = (NoteCatalogEntry*)[*(id*)b pointerValue]; @@ -163,11 +163,73 @@ - (void)setDelegate:(id)theDelegate { [self refilterNotes]; CFUUIDBytes bytes = [prefsController UUIDBytesOfLastSelectedNote]; - unsigned noteIndex = [allNotes indexOfNoteWithUUIDBytes:&bytes]; + NSUInteger noteIndex = [allNotes indexOfNoteWithUUIDBytes:&bytes]; if (noteIndex != NSNotFound) [delegate notation:self revealNote:[allNotes objectAtIndex:noteIndex]]; } +//used to ensure a newly-written Notes & Settings file is valid before finalizing the save +//read the file back from disk, deserialize it, decrypt and decompress it, and compare the notes roughly to our current notes +- (NSNumber*)verifyDataAtTemporaryFSRef:(NSValue*)fsRefValue withFinalName:(NSString*)filename { + + NSDate *date = [NSDate date]; + + NSAssert([filename isEqualToString:@"Notes & Settings"], @"attempting to verify something other than the database"); + + FSRef *notesFileRef = [fsRefValue pointerValue]; + UInt64 fileSize = 0; + char *notesData = NULL; + OSStatus err = noErr, result = noErr; + if ((err = FSRefReadData(notesFileRef, BlockSizeForNotation(self), &fileSize, (void**)¬esData, 0)) != noErr) + return [NSNumber numberWithInt:err]; + + FrozenNotation *frozenNotation = nil; + if (fileSize > 0) { + NSData *archivedNotation = [[NSData alloc] initWithBytesNoCopy:notesData length:fileSize freeWhenDone:NO]; + @try { + frozenNotation = [NSKeyedUnarchiver unarchiveObjectWithData:archivedNotation]; + } @catch (NSException *e) { + NSLog(@"(VERIFY) Error unarchiving notes and preferences from data (%@, %@)", [e name], [e reason]); + result = kCoderErr; + goto returnResult; + } + + [archivedNotation autorelease]; + } + NSMutableArray *notesToVerify = nil; + + //unpack notes using the current NotationPrefs instance (not the just-unarchived one), with which we presumably just used to encrypt it + if (!(notesToVerify = [[frozenNotation unpackedNotesWithPrefs:notationPrefs returningError:&err] retain])) { + //notesToVerify has no excuse for being nil here + if (err != noErr) { + result = err; + goto returnResult; + } + } else { + //notes were unpacked--now roughly compare notesToVerify with allNotes, plus deletedNotes and notationPrefs + if ([notesToVerify count] != [allNotes count] || + [[frozenNotation deletedNotes] count] != [deletedNotes count] || + [[frozenNotation notationPrefs] notesStorageFormat] != [notationPrefs notesStorageFormat] || + [[frozenNotation notationPrefs] hashIterationCount] != [notationPrefs hashIterationCount]) { + result = kItemVerifyErr; + goto returnResult; + } + unsigned int i; + for (i=0; i<[notesToVerify count]; i++) { + if ([[[notesToVerify objectAtIndex:i] contentString] length] != [[[allNotes objectAtIndex:i] contentString] length]) { + result = kItemVerifyErr; + goto returnResult; + } + } + } + + NSLog(@"verify time: %g", (float)[[NSDate date] timeIntervalSinceDate:date]); +returnResult: + if (notesData) free(notesData); + return [NSNumber numberWithInt:result]; +} + + - (OSStatus)_readAndInitializeSerializedNotes { OSStatus err = noErr; @@ -183,17 +245,17 @@ - (OSStatus)_readAndInitializeSerializedNotes { if (fileSize > 0) { NSData *archivedNotation = [[NSData alloc] initWithBytesNoCopy:notesData length:fileSize freeWhenDone:NO]; - NS_DURING + @try { frozenNotation = [NSKeyedUnarchiver unarchiveObjectWithData:archivedNotation]; - NS_HANDLER - NSLog(@"Error unarchiving notes and preferences from data (%@, %@)", [localException name], [localException reason]); + } @catch (NSException *e) { + NSLog(@"Error unarchiving notes and preferences from data (%@, %@)", [e name], [e reason]); if (notesData) free(notesData); //perhaps this shouldn't be an error, but the user should instead have the option of overwriting the DB with a new one? - NS_VALUERETURN(kCoderErr, OSStatus); - NS_ENDHANDLER + return kCoderErr; + } [archivedNotation autorelease]; } @@ -252,20 +314,24 @@ - (BOOL)initializeJournaling { WALRecoveryController *walReader = [[[WALRecoveryController alloc] initWithParentFSRep:(char*)convertedPath encryptionKey:walSessionKey] autorelease]; if (walReader) { + BOOL databaseCouldNotBeFlushed = NO; NSDictionary *recoveredNotes = [walReader recoveredNotes]; if ([recoveredNotes count] > 0) { [self processRecoveredNotes:recoveredNotes]; if (![self flushAllNoteChanges]) { //we shouldn't continue because the journal is still the sole record of the unsaved notes, so we can't delete it + //BUT: what if the database can't be verified? We should be able to continue, and just keep adding to the WAL + //in this case the WAL should be destroyed, re-initialized, and the recovered (and de-duped) notes added back NSLog(@"Unable to flush recovered notes back to database"); - goto bail; + databaseCouldNotBeFlushed = YES; + //goto bail; } } //is there a way that recoverNextObject could fail that would indicate a failure with the file as opposed to simple non-recovery? //if so, it perhaps the recoveredNotes method should also return an error condition, to be checked here - //there could be other issues, too + //there could be other issues, too (1) if (![walReader destroyLogFile]) { //couldn't delete the log file, so we can't create a new one @@ -275,16 +341,24 @@ - (BOOL)initializeJournaling { if (!(walWriter = [[WALStorageController alloc] initWithParentFSRep:(char*)convertedPath encryptionKey:walSessionKey])) { //couldn't create a journal after recovering the old one + //if databaseCouldNotBeFlushed is true here, then we've potentially lost notes; perhaps exchangeobjects would be better here? NSLog(@"Unable to create a new write-ahead-log after deleting the old one"); goto bail; } if ([recoveredNotes count] > 0) { + if (databaseCouldNotBeFlushed) { + //re-add the contents of recoveredNotes to walWriter; LSNs should take care of the order; no need to sort + //this allows for an ever-growing journal in the case of broken database serialization + //it should not be an acceptable condition for permanent use; hopefully an update would come soon + //warn the user, perhaps + [walWriter writeNoteObjects:[recoveredNotes allValues]]; + } [self refilterNotes]; } } else { NSLog(@"Unable to recover unsaved notes from write-ahead-log"); - //should we give the user to attempt to remove it without recovery? + //1) should we let the user attempt to remove it without recovery? goto bail; } } @@ -318,7 +392,7 @@ - (void)processRecoveredNotes:(NSDictionary*)dict { CFUUIDBytes *objUUIDBytes = (CFUUIDBytes *)keys[i]; id obj = (id)values[i]; - unsigned int existingNoteIndex = [allNotes indexOfNoteWithUUIDBytes:objUUIDBytes]; + NSUInteger existingNoteIndex = [allNotes indexOfNoteWithUUIDBytes:objUUIDBytes]; if ([obj isKindOfClass:[DeletedNoteObject class]]) { @@ -418,7 +492,8 @@ - (BOOL)flushAllNoteChanges { //we should have all journal records on disk by now - if ([self storeDataAtomicallyInNotesDirectory:serializedData withName:@"Notes & Settings" destinationRef:¬eDatabaseRef] != noErr) + if ([self storeDataAtomicallyInNotesDirectory:serializedData withName:@"Notes & Settings" destinationRef:¬eDatabaseRef + verifyWithSelector:@selector(verifyDataAtTemporaryFSRef:withFinalName:) verificationDelegate:self] != noErr) return NO; [notationPrefs setPreferencesAreStored]; @@ -441,7 +516,7 @@ - (void)handleJournalError { [self flushAllNoteChanges]; - NSRunAlertPanel(NSLocalizedString(@"Unable to create or access the write-ahead log. Is another copy of Notational Velocity currently running?",nil), + NSRunAlertPanel(NSLocalizedString(@"Unable to create or access the Interim Note-Changes file. Is another copy of Notational Velocity currently running?",nil), NSLocalizedString(@"Open Console in /Applications/Utilities/ for more information.",nil), NSLocalizedString(@"Quit",nil), NULL, NULL); @@ -1148,7 +1223,6 @@ - (void)_addNote:(NoteObject*)aNoteObject { notesChanged = YES; } -//TODO: wrap these methods or modify them to allow moving deletion warnings here //the gateway methods must always show warnings, or else flash overlay window if show-warnings-pref is off - (void)removeNotes:(NSArray*)noteArray { NSEnumerator *enumerator = [noteArray objectEnumerator]; @@ -1197,7 +1271,7 @@ - (void)removeNote:(NoteObject*)aNoteObject { } - (void)_registerDeletionUndoForNote:(NoteObject*)aNote { - //TODO: aNote can be released prematurely via successive undo/redos? + //TODO: aNote can be released prematurely via successive undo/redos? cannot reproduce after preventing undo of creation [undoManager registerUndoWithTarget:self selector:@selector(addNewNote:) object:aNote]; if (![undoManager isUndoing] && ![undoManager isRedoing]) [undoManager setActionName:[NSString stringWithFormat:NSLocalizedString(@"Delete quotemark%@quotemark",@"undo action name for deleting a single note"), titleOfNote(aNote)]]; @@ -1301,7 +1375,7 @@ - (BOOL)filterNotesFromUTF8String:(const char*)searchString forceUncached:(BOOL) BOOL stringHasExistingPrefix = YES; BOOL didFilterNotes = NO; size_t oldLen = 0, newLen = 0; - unsigned int i, initialCount = [notesListDataSource count]; + NSUInteger i, initialCount = [notesListDataSource count]; NSAssert(searchString != NULL, @"filterNotesFromUTF8String requires a non-NULL argument"); @@ -1357,7 +1431,7 @@ - (BOOL)filterNotesFromUTF8String:(const char*)searchString forceUncached:(BOOL) } //PHASE 3: reset found pointers in case have been cleared - unsigned int filteredNoteCount = [notesListDataSource count]; + NSUInteger filteredNoteCount = [notesListDataSource count]; NoteObject **notesBuffer = [notesListDataSource immutableObjects]; if (didFilterNotes) { @@ -1398,7 +1472,7 @@ - (BOOL)filterNotesFromUTF8String:(const char*)searchString forceUncached:(BOOL) return didFilterNotes; } -- (unsigned)preferredSelectedNoteIndex { +- (NSUInteger)preferredSelectedNoteIndex { return selectedNoteIndex; } @@ -1420,13 +1494,13 @@ - (NSArray*)notesAtIndexes:(NSIndexSet*)indexSet { - (NSIndexSet*)indexesOfNotes:(NSArray*)noteArray { NSMutableIndexSet *noteIndexes = [[NSMutableIndexSet alloc] init]; - unsigned int i, noteCount = [noteArray count]; + NSUInteger i, noteCount = [noteArray count]; id *notes = (id*)malloc(noteCount * sizeof(id)); [noteArray getObjects:notes]; for (i=0; i +#ifndef MAC_OS_X_VERSION_10_6 +#define MAC_OS_X_VERSION_10_6 1060 +#endif + +#if __OBJC__ +#import +#endif + +#ifndef NSFoundationVersionNumber10_6 +#define NSFoundationVersionNumber10_6 751.00 +#endif +#ifndef NSFoundationVersionNumber10_5 +#define NSFoundationVersionNumber10_5 677.00 +#endif +#ifndef NSAppKitVersionNumber10_3 +#define NSAppKitVersionNumber10_3 743.0 +#endif + +#ifndef NSUIntegerMax +#define NSUInteger unsigned int +#define NSUIntegerMax UINT_MAX +#endif + +#ifndef NSIntegerMax +#define NSInteger int +#define NSIntegerMax INT_MAX +#endif + +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +typedef short FSIORefNum; +typedef float CGFloat; +#endif + #define VAR_STR(x) @#x #define SEL_STR(name) NSStringFromSelector(@selector(name)) @@ -24,14 +58,13 @@ #define kCompressionErr -822 #define kPassCanceledErr -823 #define kDataFormattingErr -824 +#define kItemVerifyErr -825 #define VERIFY_SALT "Salt for verifying master key in a single iteration" #define LOG_SESSION_SALT "Salt for encrypting a write-ahead-log session" -#ifndef NSAppKitVersionNumber10_3 -#define NSAppKitVersionNumber10_3 743 -#endif - #define RunningTigerAppKitOrHigher (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_3) +#define IsLeopardOrLater (floor(NSFoundationVersionNumber) >= NSFoundationVersionNumber10_5) +#define IsSnowLeopardOrLater (floor(NSFoundationVersionNumber) >= NSFoundationVersionNumber10_6) -#define USE_KEYED_ARCHIVING 0 \ No newline at end of file +#define USE_KEYED_ARCHIVING 1 \ No newline at end of file diff --git a/NoteAttributeColumn.h b/NoteAttributeColumn.h old mode 100644 new mode 100755 index 8498c974..b41196f3 --- a/NoteAttributeColumn.h +++ b/NoteAttributeColumn.h @@ -4,8 +4,8 @@ @interface NoteAttributeColumn : NSTableColumn { - int (*sortFunction) (id*, id*); - int (*reverseSortFunction) (id*, id*); + NSInteger (*sortFunction) (id*, id*); + NSInteger (*reverseSortFunction) (id*, id*); id (*objectAttribute) (id); SEL mutateObjectSelector; @@ -18,9 +18,9 @@ SEL columnAttributeMutator(NoteAttributeColumn *col); id columnAttributeForObject(NoteAttributeColumn *col, id object); - (void)updateWidthForHighlight; - (void)setDereferencingFunction:(id (*)(id))attributeFunction; -- (void)setSortingFunction:(int (*)(id*, id*))sortFunction; -- (int (*)(id*, id*))sortFunction; -- (void)setReverseSortingFunction:(int (*)(id*, id*))aFunction; -- (int (*)(id*, id*))reverseSortFunction; +- (void)setSortingFunction:(NSInteger (*)(id*, id*))sortFunction; +- (NSInteger (*)(id*, id*))sortFunction; +- (void)setReverseSortingFunction:(NSInteger (*)(id*, id*))aFunction; +- (NSInteger (*)(id*, id*))reverseSortFunction; @end diff --git a/NoteAttributeColumn.m b/NoteAttributeColumn.m old mode 100644 new mode 100755 index 7eff9129..177d4bac --- a/NoteAttributeColumn.m +++ b/NoteAttributeColumn.m @@ -44,19 +44,19 @@ - (void)setDereferencingFunction:(id (*)(id))attributeFunction { objectAttribute = attributeFunction; } -- (void)setSortingFunction:(int (*)(id *, id *))aFunction { +- (void)setSortingFunction:(NSInteger (*)(id *, id *))aFunction { sortFunction = aFunction; } -- (int (*)(id *, id *))sortFunction { +- (NSInteger (*)(id *, id *))sortFunction { return sortFunction; } -- (void)setReverseSortingFunction:(int (*)(id*, id*))aFunction { +- (void)setReverseSortingFunction:(NSInteger (*)(id*, id*))aFunction { reverseSortFunction = aFunction; } -- (int (*)(id*, id*))reverseSortFunction { +- (NSInteger (*)(id*, id*))reverseSortFunction { return reverseSortFunction; } diff --git a/NoteObject.h b/NoteObject.h old mode 100644 new mode 100755 index b1eb455e..871f90cd --- a/NoteObject.h +++ b/NoteObject.h @@ -62,20 +62,20 @@ typedef struct _NoteFilterContext { } -int compareDateModified(id *a, id *b); -int compareDateCreated(id *a, id *b); -int compareLabelString(id *a, id *b); -int compareTitleString(id *a, id *b); -int compareUniqueNoteIDBytes(id *a, id *b); +NSInteger compareDateModified(id *a, id *b); +NSInteger compareDateCreated(id *a, id *b); +NSInteger compareLabelString(id *a, id *b); +NSInteger compareTitleString(id *a, id *b); +NSInteger compareUniqueNoteIDBytes(id *a, id *b); -int compareDateModifiedReverse(id *a, id *b); -int compareDateCreatedReverse(id *a, id *b); -int compareLabelStringReverse(id *a, id *b); -int compareTitleStringReverse(id *a, id *b); +NSInteger compareDateModifiedReverse(id *a, id *b); +NSInteger compareDateCreatedReverse(id *a, id *b); +NSInteger compareLabelStringReverse(id *a, id *b); +NSInteger compareTitleStringReverse(id *a, id *b); -int compareFilename(id *a, id *b); -int compareNodeID(id *a, id *b); +NSInteger compareFilename(id *a, id *b); +NSInteger compareNodeID(id *a, id *b); //syncing w/ server and from journal - (CFUUIDBytes *)uniqueNoteIDBytes; diff --git a/NoteObject.m b/NoteObject.m old mode 100644 new mode 100755 index 29f8897b..429fc7c8 --- a/NoteObject.m +++ b/NoteObject.m @@ -19,6 +19,16 @@ #define CURRENT_NOTE_ARCHIVING_VERSION 1 +#if __LP64__ +// Needed for compatability with data created by 32bit app +typedef struct NSRange32 { + unsigned int location; + unsigned int length; +} NSRange32; +#else +typedef NSRange NSRange32; +#endif + @implementation NoteObject static NSStringEncoding systemStringEncoding; @@ -45,6 +55,7 @@ - (id)init { modifiedDate = createdDate = 0.0; currentFormatID = SingleDatabaseFormat; nodeID = 0; + //TODO: use UTF-8 instead fileEncoding = systemStringEncoding; contentsWere7Bit = NO; @@ -107,23 +118,23 @@ - (void)setDelegate:(id)theDelegate { return obj->noteFileRef; } -int compareFilename(id *one, id *two) { +NSInteger compareFilename(id *one, id *two) { return (int)CFStringCompare((CFStringRef)((*(NoteObject**)one)->filename), (CFStringRef)((*(NoteObject**)two)->filename), kCFCompareCaseInsensitive); } -int compareDateModified(id *a, id *b) { +NSInteger compareDateModified(id *a, id *b) { return (*(NoteObject**)a)->modifiedDate - (*(NoteObject**)b)->modifiedDate; } -int compareDateCreated(id *a, id *b) { +NSInteger compareDateCreated(id *a, id *b) { return (*(NoteObject**)a)->createdDate - (*(NoteObject**)b)->createdDate; } -int compareLabelString(id *a, id *b) { +NSInteger compareLabelString(id *a, id *b) { return (int)CFStringCompare((CFStringRef)(labelsOfNote(*(NoteObject **)a)), (CFStringRef)(labelsOfNote(*(NoteObject **)b)), kCFCompareCaseInsensitive); } -int compareTitleString(id *a, id *b) { +NSInteger compareTitleString(id *a, id *b) { CFComparisonResult stringResult = CFStringCompare((CFStringRef)(titleOfNote(*(NoteObject**)a)), (CFStringRef)(titleOfNote(*(NoteObject**)b)), kCFCompareCaseInsensitive); @@ -138,22 +149,22 @@ int compareTitleString(id *a, id *b) { return (int)stringResult; } -int compareUniqueNoteIDBytes(id *a, id *b) { +NSInteger compareUniqueNoteIDBytes(id *a, id *b) { return memcmp((&(*(NoteObject**)a)->uniqueNoteIDBytes), (&(*(NoteObject**)b)->uniqueNoteIDBytes), sizeof(CFUUIDBytes)); } -int compareDateModifiedReverse(id *a, id *b) { +NSInteger compareDateModifiedReverse(id *a, id *b) { return (*(NoteObject**)b)->modifiedDate - (*(NoteObject**)a)->modifiedDate; } -int compareDateCreatedReverse(id *a, id *b) { +NSInteger compareDateCreatedReverse(id *a, id *b) { return (*(NoteObject**)b)->createdDate - (*(NoteObject**)a)->createdDate; } -int compareLabelStringReverse(id *a, id *b) { +NSInteger compareLabelStringReverse(id *a, id *b) { return (int)CFStringCompare((CFStringRef)(labelsOfNote(*(NoteObject **)b)), (CFStringRef)(labelsOfNote(*(NoteObject **)a)), kCFCompareCaseInsensitive); } -int compareTitleStringReverse(id *a, id *b) { +NSInteger compareTitleStringReverse(id *a, id *b) { CFComparisonResult stringResult = CFStringCompare((CFStringRef)(titleOfNote(*(NoteObject **)b)), (CFStringRef)(titleOfNote(*(NoteObject **)a)), kCFCompareCaseInsensitive); @@ -168,7 +179,7 @@ int compareTitleStringReverse(id *a, id *b) { return (int)stringResult; } -int compareNodeID(id *a, id *b) { +NSInteger compareNodeID(id *a, id *b) { return (*(NoteObject**)a)->nodeID - (*(NoteObject**)b)->nodeID; } @@ -263,9 +274,9 @@ - (id)initWithCoder:(NSCoder*)decoder { fileModifiedDate.fraction = [decoder decodeInt32ForKey:@"fileModDateFrac"]; fileEncoding = [decoder decodeInt32ForKey:VAR_STR(fileEncoding)]; - unsigned decodedByteCount; + NSUInteger decodedByteCount; const uint8_t *decodedBytes = [decoder decodeBytesForKey:VAR_STR(uniqueNoteIDBytes) returnedLength:&decodedByteCount]; - memcpy(&uniqueNoteIDBytes, decodedBytes, MAX(decodedByteCount, sizeof(CFUUIDBytes))); + memcpy(&uniqueNoteIDBytes, decodedBytes, MIN(decodedByteCount, sizeof(CFUUIDBytes))); serverModifiedTime = [decoder decodeInt32ForKey:VAR_STR(serverModifiedTime)]; titleString = [[decoder decodeObjectForKey:VAR_STR(titleString)] retain]; @@ -284,20 +295,43 @@ - (id)initWithCoder:(NSCoder*)decoder { } DidCheckNoteVersion = YES; } + NSRange32 range32; + #if __LP64__ + unsigned long longTemp; + #endif #if DECODE_INDIVIDUALLY [decoder decodeValueOfObjCType:@encode(CFAbsoluteTime) at:&modifiedDate]; [decoder decodeValueOfObjCType:@encode(CFAbsoluteTime) at:&createdDate]; - [decoder decodeValueOfObjCType:@encode(NSRange) at:&selectedRange]; + #if __LP64__ + [decoder decodeValueOfObjCType:"{_NSRange=II}" at:&range32]; + #else + [decoder decodeValueOfObjCType:@encode(NSRange) at:&range32]; + #endif [decoder decodeValueOfObjCType:@encode(float) at:&scrolledProportion]; [decoder decodeValueOfObjCType:@encode(unsigned int) at:&logSequenceNumber]; [decoder decodeValueOfObjCType:@encode(int) at:¤tFormatID]; + #if __LP64__ + [decoder decodeValueOfObjCType:"L" at:&longTemp]; + nodeID = (UInt32)longTemp; + #else [decoder decodeValueOfObjCType:@encode(UInt32) at:&nodeID]; + #endif [decoder decodeValueOfObjCType:@encode(UInt16) at:&fileModifiedDate.highSeconds]; - [decoder decodeValueOfObjCType:@encode(UInt32) at:&fileModifiedDate.lowSeconds]; + #if __LP64__ + [decoder decodeValueOfObjCType:"L" at:&longTemp]; + fileModifiedDate.lowSeconds = (UInt32)longTemp; + #else + [decoder decodeValueOfObjCType:@encode(UInt32) at:&fileModifiedDate.lowSeconds]; + #endif [decoder decodeValueOfObjCType:@encode(UInt16) at:&fileModifiedDate.fraction]; - [decoder decodeValueOfObjCType:@encode(NSStringEncoding) at:&fileEncoding]; + + #if __LP64__ + [decoder decodeValueOfObjCType:"I" at:&fileEncoding]; + #else + [decoder decodeValueOfObjCType:@encode(NSStringEncoding) at:&fileEncoding]; + #endif [decoder decodeValueOfObjCType:@encode(CFUUIDBytes) at:&uniqueNoteIDBytes]; [decoder decodeValueOfObjCType:@encode(unsigned int) at:&serverModifiedTime]; @@ -307,10 +341,12 @@ - (id)initWithCoder:(NSCoder*)decoder { contentString = [[decoder decodeObject] retain]; filename = [[decoder decodeObject] retain]; #else - [decoder decodeValuesOfObjCTypes: "dd{NSRange=ii}fIiI{UTCDateTime=SIS}I[16C]I@@@@", &modifiedDate, &createdDate, &selectedRange, + [decoder decodeValuesOfObjCTypes: "dd{NSRange=ii}fIiI{UTCDateTime=SIS}I[16C]I@@@@", &modifiedDate, &createdDate, &range32, &scrolledProportion, &logSequenceNumber, ¤tFormatID, &nodeID, &fileModifiedDate, &fileEncoding, &uniqueNoteIDBytes, &serverModifiedTime, &titleString, &labelString, &contentString, &filename]; #endif + selectedRange.location = range32.location; + selectedRange.length = range32.length; } contentsWere7Bit = (*(unsigned int*)&scrolledProportion) != 0; //hacko wacko @@ -336,8 +372,8 @@ - (void)encodeWithCoder:(NSCoder *)coder { [coder encodeDouble:modifiedDate forKey:VAR_STR(modifiedDate)]; [coder encodeDouble:createdDate forKey:VAR_STR(createdDate)]; - [coder encodeInt32:selectedRange.location forKey:@"selectionRangeLocation"]; - [coder encodeInt32:selectedRange.length forKey:@"selectionRangeLength"]; + [coder encodeInt32:(unsigned int)selectedRange.location forKey:@"selectionRangeLocation"]; + [coder encodeInt32:(unsigned int)selectedRange.length forKey:@"selectionRangeLength"]; [coder encodeFloat:scrolledProportion forKey:VAR_STR(scrolledProportion)]; [coder encodeInt32:logSequenceNumber forKey:VAR_STR(logSequenceNumber)]; @@ -359,10 +395,12 @@ - (void)encodeWithCoder:(NSCoder *)coder { [coder encodeObject:filename forKey:VAR_STR(filename)]; } else { +// 64bit encoding would break 32bit reading - keyed archives should be used +#if !__LP64__ #if DECODE_INDIVIDUALLY [coder encodeValueOfObjCType:@encode(CFAbsoluteTime) at:&modifiedDate]; [coder encodeValueOfObjCType:@encode(CFAbsoluteTime) at:&createdDate]; - [coder encodeValueOfObjCType:@encode(NSRange) at:&selectedRange]; + [coder encodeValueOfObjCType:@encode(NSRange) at:&selectedRange]; [coder encodeValueOfObjCType:@encode(float) at:&scrolledProportion]; [coder encodeValueOfObjCType:@encode(unsigned int) at:&logSequenceNumber]; @@ -383,10 +421,11 @@ - (void)encodeWithCoder:(NSCoder *)coder { [coder encodeObject:filename]; #else - [coder encodeValuesOfObjCTypes: "dd{NSRange=ii}fIiI{UTCDateTime=SIS}I[16C]I@@@@", &modifiedDate, &createdDate, &selectedRange, + [coder encodeValuesOfObjCTypes: "dd{NSRange=ii}fIiI{UTCDateTime=SIS}I[16C]I@@@@", &modifiedDate, &createdDate, &range32, &scrolledProportion, &logSequenceNumber, ¤tFormatID, &nodeID, &fileModifiedDate, &fileEncoding, &uniqueNoteIDBytes, &serverModifiedTime, &titleString, &labelString, &contentString, &filename]; #endif +#endif // !__LP64__ } } @@ -451,7 +490,7 @@ - (id)initWithCatalogEntry:(NoteCatalogEntry*)entry delegate:(id)aDelegate { labelString = @""; //I'd like to get labels from getxattr cLabelsFoundPtr = cLabels = strdup(""); - createdDate = modifiedDate = CFAbsoluteTimeGetCurrent(); + createdDate = modifiedDate = CFAbsoluteTimeGetCurrent(); //TODO: use the file's mod/create dates instead dateCreatedString = [dateModifiedString = [[NSString relativeDateStringWithAbsoluteTime:modifiedDate] retain] retain]; contentString = [[NSMutableAttributedString alloc] initWithString:@""]; @@ -891,6 +930,7 @@ - (BOOL)writeUsingCurrentFileFormat { [delegate noteDidNotWrite:self errorCode:err]; return NO; } + //TODO: if writing plaintext set the file encoding with setxattr if (!resetFilename) { NSLog(@"resetting the file name just because."); @@ -945,6 +985,7 @@ - (BOOL)updateFromFile { NSLog(@"Couldn't update note from file on disk"); return NO; } + //TODO: also grab the com.apple.TextEncoding xattr to help getShortLivedStringFromData: in updateFromData: figure out ambiguous cases if ([self updateFromData:data]) { FSCatalogInfo info; diff --git a/NotesTableView.h b/NotesTableView.h old mode 100644 new mode 100755 index 8135c4fa..8ba509a3 --- a/NotesTableView.h +++ b/NotesTableView.h @@ -34,7 +34,7 @@ typedef struct _ViewLocationContext { IBOutlet NSTextField *controlField; NSMutableArray *allColumns; - unsigned firstRowIndexBeforeSplitResize; + NSInteger firstRowIndexBeforeSplitResize; BOOL viewMenusValid; BOOL hadHighlightInForeground, hadHighlightInBackground; @@ -57,8 +57,8 @@ typedef struct _ViewLocationContext { - (ViewLocationContext)viewingLocation; - (void)setViewingLocation:(ViewLocationContext)ctx; -- (void)scrollRowToVisible:(int)rowIndex withVerticalOffset:(float)offset; -- (void)selectRowAndScroll:(int)row; +- (void)scrollRowToVisible:(NSInteger)rowIndex withVerticalOffset:(float)offset; +- (void)selectRowAndScroll:(NSInteger)row; //- (BOOL)clickedOnEmptyRegion; - (void)setShouldUseSecondaryHighlightColor:(BOOL)value; diff --git a/NotesTableView.m b/NotesTableView.m old mode 100644 new mode 100755 index 58b8b7ac..7b42bfbe --- a/NotesTableView.m +++ b/NotesTableView.m @@ -40,8 +40,8 @@ - (id)initWithCoder:(NSCoder *)decoder { NSString *colStrings[] = { NoteTitleColumnString, NoteLabelsColumnString, NoteDateModifiedColumnString, NoteDateCreatedColumnString }; SEL colMutators[] = { @selector(setTitleString:), @selector(setLabelString:), NULL, NULL }; id (*colReferencors[])(id) = { titleOfNote, labelsOfNote, dateModifiedStringOfNote, dateCreatedStringOfNote }; - int (*sortFunctions[])(id*, id*) = { compareTitleString, compareLabelString, compareDateModified, compareDateCreated }; - int (*reverseSortFunctions[])(id*, id*) = { compareTitleStringReverse, compareLabelStringReverse, compareDateModifiedReverse, + NSInteger (*sortFunctions[])(id*, id*) = { compareTitleString, compareLabelString, compareDateModified, compareDateCreated }; + NSInteger (*reverseSortFunctions[])(id*, id*) = { compareTitleStringReverse, compareLabelStringReverse, compareDateModifiedReverse, compareDateCreatedReverse }; unsigned int i; @@ -62,8 +62,10 @@ - (id)initWithCoder:(NSCoder *)decoder { [self addTableColumn:column]; [column updateWidthForHighlight];*/ } - - [self setRowHeight:[font defaultLineHeightForFont] + 1]; + + NSLayoutManager *lm = [[NSLayoutManager alloc] init]; + [self setRowHeight:[lm defaultLineHeightForFont:font] + 1.0f]; + [lm release]; //[self setAutosaveName:@"notesTable"]; //[self setAutosaveTableColumns:YES]; @@ -190,11 +192,13 @@ - (void)settingChangedForSelectorString:(NSString*)selectorString { NSFont *font = [NSFont systemFontOfSize:[globalPrefs tableFontSize]]; - unsigned int i; + NSUInteger i; for (i=0; i<[allColumns count]; i++) [[[allColumns objectAtIndex:i] dataCell] setFont:font]; - [self setRowHeight:[font defaultLineHeightForFont] + 1]; + NSLayoutManager *lm = [[NSLayoutManager alloc] init]; + [self setRowHeight:[lm defaultLineHeightForFont:font] + 1.0f]; + [lm release]; } } @@ -233,11 +237,11 @@ - (ViewLocationContext)viewingLocation { - (void)setViewingLocation:(ViewLocationContext)ctx { if (ctx.nonRetainedPivotObject) { - unsigned int pivotIndex = [(FastListDataSource*)[self dataSource] indexOfObjectIdenticalTo:ctx.nonRetainedPivotObject]; + NSInteger pivotIndex = [(FastListDataSource*)[self dataSource] indexOfObjectIdenticalTo:ctx.nonRetainedPivotObject]; if (pivotIndex != NSNotFound) { //figure out how to determine top/bottom condition: //if pivotRow was 0 or nRows-1, and pivotIndex is not either, then scroll maximally in the nearest direction? - unsigned int lastRow = [self numberOfRows] - 1; + NSInteger lastRow = [self numberOfRows] - 1; if (ctx.pivotRowWasEdge && (pivotIndex != 0 && pivotIndex != lastRow)) { pivotIndex = abs(pivotIndex - 0) < abs(pivotIndex - lastRow) ? 0 : lastRow; @@ -250,7 +254,7 @@ - (void)setViewingLocation:(ViewLocationContext)ctx { } } -- (void)scrollRowToVisible:(int)rowIndex withVerticalOffset:(float)offset { +- (void)scrollRowToVisible:(NSInteger)rowIndex withVerticalOffset:(float)offset { NSRect rowRect = [self rectOfRow:rowIndex]; rowRect.origin.y -= offset; @@ -615,7 +619,7 @@ - (void)keyDown:(NSEvent*)theEvent { return; } - unsigned int modifiers = [theEvent modifierFlags]; + NSUInteger modifiers = [theEvent modifierFlags]; if (modifiers & NSCommandKeyMask) { //replicating up/down with option key @@ -717,7 +721,7 @@ - (void)deselectAll:(id)sender { [self scrollRowToVisible:0]; } -- (void)selectRowAndScroll:(int)row { +- (void)selectRowAndScroll:(NSInteger)row { if (row > -1 && row < [self numberOfRows]) { [self selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO]; @@ -725,7 +729,7 @@ - (void)selectRowAndScroll:(int)row { } } -- (void)editColumn:(int)columnIndex row:(int)rowIndex withEvent:(NSEvent *)theEvent select:(BOOL)flag { +- (void)editColumn:(NSInteger)columnIndex row:(NSInteger)rowIndex withEvent:(NSEvent *)theEvent select:(BOOL)flag { [super editColumn:columnIndex row:rowIndex withEvent:theEvent select:flag]; @@ -770,7 +774,7 @@ - (void)makeFirstPreviouslyVisibleRowVisibleIfNecessary { - (void)noteFirstVisibleRow { firstRowIndexBeforeSplitResize = NSNotFound; - unsigned newFirstRow = [[self selectedRowIndexes] firstIndex]; + NSUInteger newFirstRow = [[self selectedRowIndexes] firstIndex]; NSRange range = [self rowsInRect:[self visibleRect]]; if (NSLocationInRange(newFirstRow, range)) { diff --git a/PTHotKeys/PTHotKey.h b/PTHotKeys/PTHotKey.h old mode 100644 new mode 100755 diff --git a/PTHotKeys/PTHotKey.m b/PTHotKeys/PTHotKey.m old mode 100644 new mode 100755 diff --git a/PTHotKeys/PTHotKeyCenter.h b/PTHotKeys/PTHotKeyCenter.h old mode 100644 new mode 100755 index 67a9fc95..65a3eb05 --- a/PTHotKeys/PTHotKeyCenter.h +++ b/PTHotKeys/PTHotKeyCenter.h @@ -13,6 +13,8 @@ @interface PTHotKeyCenter : NSObject { NSMutableDictionary* mHotKeys; //Keys are NSValue of EventHotKeyRef + NSMutableDictionary* mHotKeyMap; + u_int32_t mNextKeyID; BOOL mEventHandlerInstalled; } diff --git a/PTHotKeys/PTHotKeyCenter.m b/PTHotKeys/PTHotKeyCenter.m old mode 100644 new mode 100755 index da5365b1..24bf6913 --- a/PTHotKeys/PTHotKeyCenter.m +++ b/PTHotKeys/PTHotKeyCenter.m @@ -39,6 +39,8 @@ - (id)init if( self ) { mHotKeys = [[NSMutableDictionary alloc] init]; + mHotKeyMap = [[NSMutableDictionary alloc] init]; + mNextKeyID = 1; } return self; @@ -70,13 +72,14 @@ - (BOOL)registerHotKey: (PTHotKey*)hotKey hotKeyID.signature = UTGetOSTypeFromString(CFSTR("PTHk")); - hotKeyID.id = (long)hotKey; + hotKeyID.id = mNextKeyID; + //NSLog(@"registering..."); err = RegisterEventHotKey( [[hotKey keyCombo] keyCode], [[hotKey keyCombo] modifiers], hotKeyID, GetEventDispatcherTarget(), - nil, + 0, &carbonHotKey ); if( err ) @@ -84,7 +87,11 @@ - (BOOL)registerHotKey: (PTHotKey*)hotKey //NSLog(@"error --"); return NO; } - + + NSNumber *kid = [NSNumber numberWithUnsignedInt:mNextKeyID]; + [mHotKeyMap setObject:hotKey forKey:kid]; + mNextKeyID += 1; + [hotKey setCarbonHotKey:carbonHotKey]; [mHotKeys setObject: hotKey forKey: [hotKey name]]; @@ -210,9 +217,11 @@ - (OSStatus)sendCarbonEvent: (EventRef)event NSAssert( hotKeyID.signature == UTGetOSTypeFromString(CFSTR("PTHk")), @"Invalid hot key id" ); - NSAssert( hotKeyID.id != nil, @"Invalid hot key id" ); - hotKey = (PTHotKey*)hotKeyID.id; + NSNumber *kid = [NSNumber numberWithUnsignedInt:hotKeyID.id]; + hotKey = [mHotKeyMap objectForKey:kid]; + + NSAssert( hotKey != nil, @"Invalid hot key id" ); switch( GetEventKind( event ) ) { diff --git a/PTHotKeys/PTKeyBroadcaster.h b/PTHotKeys/PTKeyBroadcaster.h old mode 100644 new mode 100755 diff --git a/PTHotKeys/PTKeyBroadcaster.m b/PTHotKeys/PTKeyBroadcaster.m old mode 100644 new mode 100755 diff --git a/PTHotKeys/PTKeyCodes.plist b/PTHotKeys/PTKeyCodes.plist old mode 100644 new mode 100755 diff --git a/PTHotKeys/PTKeyCombo.h b/PTHotKeys/PTKeyCombo.h old mode 100644 new mode 100755 diff --git a/PTHotKeys/PTKeyCombo.m b/PTHotKeys/PTKeyCombo.m old mode 100644 new mode 100755 index 40b1d085..ff463ab7 --- a/PTHotKeys/PTKeyCombo.m +++ b/PTHotKeys/PTKeyCombo.m @@ -105,7 +105,7 @@ + (NSDictionary*)_keyCodesDictionary NSString* contents; path = [[NSBundle bundleForClass: self] pathForResource: @"PTKeyCodes" ofType: @"plist"]; - contents = [NSString stringWithContentsOfFile: path]; + contents = [NSString stringWithContentsOfFile: path encoding:NSUTF8StringEncoding error:nil]; keyCodes = [[contents propertyList] retain]; } diff --git a/PTHotKeys/PTKeyComboPanel.h b/PTHotKeys/PTKeyComboPanel.h old mode 100644 new mode 100755 diff --git a/PTHotKeys/PTKeyComboPanel.m b/PTHotKeys/PTKeyComboPanel.m old mode 100644 new mode 100755 diff --git a/PassphraseChanger.h b/PassphraseChanger.h old mode 100644 new mode 100755 diff --git a/PassphraseChanger.m b/PassphraseChanger.m old mode 100644 new mode 100755 diff --git a/PassphrasePicker.h b/PassphrasePicker.h old mode 100644 new mode 100755 diff --git a/PassphrasePicker.m b/PassphrasePicker.m old mode 100644 new mode 100755 diff --git a/PassphraseRetriever.h b/PassphraseRetriever.h old mode 100644 new mode 100755 diff --git a/PassphraseRetriever.m b/PassphraseRetriever.m old mode 100644 new mode 100755 diff --git a/PrefsWindowController.h b/PrefsWindowController.h old mode 100644 new mode 100755 diff --git a/PrefsWindowController.m b/PrefsWindowController.m old mode 100644 new mode 100755 index b7699157..5347b56b --- a/PrefsWindowController.m +++ b/PrefsWindowController.m @@ -100,7 +100,7 @@ - (void)changeFont:(id)sender { } } -- (unsigned int)validModesForFontPanel:(NSFontPanel *)fontPanel { +- (NSUInteger)validModesForFontPanel:(NSFontPanel *)fontPanel { return NSFontPanelSizeModeMask | NSFontPanelCollectionModeMask; } diff --git a/QuickSearchTable.h b/QuickSearchTable.h old mode 100644 new mode 100755 diff --git a/QuickSearchTable.m b/QuickSearchTable.m old mode 100644 new mode 100755 diff --git a/RBSplitView/RBSplitSubview.h b/RBSplitView/RBSplitSubview.h index d0582305..bc98f69f 100644 --- a/RBSplitView/RBSplitSubview.h +++ b/RBSplitView/RBSplitSubview.h @@ -24,9 +24,9 @@ typedef enum { // Most getter methods simply return the corresponding instance variable, so with some care, subclasses // could reference them directly. NSString* identifier; // An identifier string for the subview, default is @"". - int tag; // A tag integer for the subview, default is 0. - float minDimension; // The minimum dimension. Must be 1.0 or any larger integer. - float maxDimension; // The maximum dimension. Must be at least equal to the minDimension. + NSInteger tag; // A tag integer for the subview, default is 0. + CGFloat minDimension; // The minimum dimension. Must be 1.0 or any larger integer. + CGFloat maxDimension; // The maximum dimension. Must be at least equal to the minDimension. // Set to a large number if there's no maximum. double fraction; // A fractional part of the dimension, used for proportional resizing. // Normally varies between -0.999... and 0.999... @@ -35,7 +35,7 @@ typedef enum { NSRect previous; // Holds the frame rect for the last delegate notification. NSSize savedSize; // This holds the size the subview had before it was resized beyond // its minimum or maximum limits. Valid if notInLimits is YES. - unsigned int actDivider; // This is set temporarily while an alternate drag view is being dragged. + NSUInteger actDivider; // This is set temporarily while an alternate drag view is being dragged. BOOL canDragWindow; // This is set temporarily during a mouseDown on a non-opaque subview. BOOL canCollapse; // YES if the subview can be collapsed. BOOL notInLimits; // YES if the subview's dimensions are outside the set limits. @@ -70,11 +70,11 @@ typedef enum { - (BOOL)splitViewIsHorizontal; // Returns the number of subviews. Just a convenience method. -- (unsigned)numberOfSubviews; +- (NSUInteger)numberOfSubviews; // Sets and gets the tag. -- (void)setTag:(int)theTag; -- (int)tag; +- (void)setTag:(NSInteger)theTag; +- (NSInteger)tag; // Sets and gets the identifier string. Will never be nil. - (void)setIdentifier:(NSString*)aString; @@ -84,8 +84,8 @@ typedef enum { // or top to bottom. Setting it will move the subview to another position without changing its size, // status or attributes. Set position to 0 to move it to the start, or to some large number to move it // to the end of the RBSplitView. -- (unsigned)position; -- (void)setPosition:(unsigned)newPosition; +- (NSUInteger)position; +- (void)setPosition:(NSUInteger)newPosition; // Returns YES if the subview is collapsed. Collapsed subviews are squashed down to zero but never // made smaller than the minimum dimension as far as their own subviews are concerned. If the @@ -107,17 +107,17 @@ typedef enum { // Sets and gets the minimum and maximum dimensions. They're set at the same time to make sure values // are consistent. Despite being floats, they'll always have integer values. The minimum value for the // minimum is 1.0. Pass 0.0 for the maximum to set it to some huge number. -- (float)minDimension; -- (float)maxDimension; -- (void)setMinDimension:(float)newMinDimension andMaxDimension:(float)newMaxDimension; +- (CGFloat)minDimension; +- (CGFloat)maxDimension; +- (void)setMinDimension:(CGFloat)newMinDimension andMaxDimension:(CGFloat)newMaxDimension; // Call this to expand a subview programmatically. It will return the subview's dimension after // expansion. -- (float)expand; +- (CGFloat)expand; // Call this to collapse a subview programmatically. It will return the negative // of the subview's dimension _before_ collapsing, or 0.0 if the subview can't be collapsed. -- (float)collapse; +- (CGFloat)collapse; // These calls collapse and expand subviews with animation. They return YES if animation // startup was successful. @@ -131,16 +131,16 @@ typedef enum { - (BOOL)expandWithAnimation:(BOOL)animate withResize:(BOOL)resize; // Returns the current dimension of the subview. -- (float)dimension; +- (CGFloat)dimension; // Sets the current dimension of the subview, subject to the current maximum and minimum. // If the subview is collapsed, this has no immediate effect. -- (void)setDimension:(float)value; +- (void)setDimension:(CGFloat)value; // This method is used internally when a divider is dragged. It tries to change the subview's dimension // and returns the actual change, collapsing or expanding whenever possible. You usually won't need // to call this directly. -- (float)changeDimensionBy:(float)increment mayCollapse:(BOOL)mayCollapse move:(BOOL)move; +- (CGFloat)changeDimensionBy:(CGFloat)increment mayCollapse:(BOOL)mayCollapse move:(BOOL)move; @end diff --git a/RBSplitView/RBSplitSubview.m b/RBSplitView/RBSplitSubview.m index 97748bfa..3085e7ed 100644 --- a/RBSplitView/RBSplitSubview.m +++ b/RBSplitView/RBSplitSubview.m @@ -144,11 +144,11 @@ - (BOOL)splitViewIsHorizontal { // You can use either tags (ints) or identifiers (NSStrings) to identify individual subviews. // We take care not to have nil identifiers. -- (void)setTag:(int)theTag { +- (void)setTag:(NSInteger)theTag { tag = theTag; } -- (int)tag { +- (NSInteger)tag { return tag; } @@ -169,12 +169,12 @@ - (NSString*)description { // This pair of methods allows you to get and change the position of a subview (within the split view); // this counts from zero from the left or top of the split view. -- (unsigned)position { +- (NSUInteger)position { RBSplitView* sv = [self splitView]; return sv?[[sv subviews] indexOfObjectIdenticalTo:self]:0; } -- (void)setPosition:(unsigned)newPosition { +- (void)setPosition:(NSUInteger)newPosition { RBSplitView* sv = [self splitView]; if (sv) { [self retain]; @@ -239,7 +239,7 @@ - (void)setCanCollapse:(BOOL)flag { // As a convenience to other methods, it returns the subview's dimension after expanding (this may be // off by 1 pixel due to rounding) or 0.0 if it couldn't be expanded. // The delegate should not change the subview's frame. -- (float)expand { +- (CGFloat)expand { return [self RB___expandAndSetToMinimum:NO]; } @@ -248,7 +248,7 @@ - (float)expand { // As a convenience to other methods, it returns the negative of the subview's dimension before // collapsing (or 0.0 if it couldn't be collapsed). // The delegate should not change the subview's frame. -- (float)collapse { +- (CGFloat)collapse { return [self RB___collapse]; } @@ -299,21 +299,21 @@ - (BOOL)expandWithAnimation:(BOOL)animate withResize:(BOOL)resize { // The minimum dimension ought to be an integer at least equal to 1.0 but we make sure. // The maximum dimension ought to be an integer at least equal to the minimum. As a convenience, // pass in zero to set it to some huge number. -- (float)minDimension { +- (CGFloat)minDimension { return minDimension; } -- (float)maxDimension { +- (CGFloat)maxDimension { return maxDimension; } -- (void)setMinDimension:(float)newMinDimension andMaxDimension:(float)newMaxDimension { +- (void)setMinDimension:(CGFloat)newMinDimension andMaxDimension:(CGFloat)newMaxDimension { minDimension = MAX(1.0,floorf(newMinDimension)); if (newMaxDimension<1.0) { newMaxDimension = WAYOUT; } maxDimension = MAX(minDimension,floorf(newMaxDimension)); - float dim = [self dimension]; + CGFloat dim = [self dimension]; if ((dimmaxDimension)) { [[self splitView] setMustAdjust]; } @@ -321,8 +321,8 @@ - (void)setMinDimension:(float)newMinDimension andMaxDimension:(float)newMaxDime // This returns the subview's dimension. If it's collapsed, it returns the dimension it would have // after expanding. -- (float)dimension { - float dim = [self RB___visibleDimension]; +- (CGFloat)dimension { + CGFloat dim = [self RB___visibleDimension]; if (dim<=0.0) { dim = [[self splitView] RB___dimensionWithoutDividers]*fraction; if (dim=(anim&&!anim->resizing?anim->dimension:minDimension))&&(dim<=maxDimension)&&(other>=[sv minDimension])&&(other<=[sv maxDimension])) { @@ -413,15 +413,15 @@ - (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize { // This method is used internally when a divider is dragged. It tries to change the subview's dimension // and returns the actual change, collapsing or expanding whenever possible. You usually won't need // to call this directly. -- (float)changeDimensionBy:(float)increment mayCollapse:(BOOL)mayCollapse move:(BOOL)move { +- (CGFloat)changeDimensionBy:(CGFloat)increment mayCollapse:(BOOL)mayCollapse move:(BOOL)move { RBSplitView* sv = [self splitView]; if (!sv||(fabsf(increment)<1.0)) { return 0.0; } BOOL ishor = [sv isHorizontal]; NSRect frame = [self frame]; - float olddim = DIM(frame.size); - float newdim = MAX(0.0,olddim+increment); + CGFloat olddim = DIM(frame.size); + CGFloat newdim = MAX(0.0,olddim+increment); if (newdim=FRAMETIME) { - float dim = DIM(frame.size); - float avg = anim->elapsedTime; + CGFloat avg = anim->elapsedTime; // We try to keep a record of how long it takes, on the average, to resize and adjust // one animation frame. if (anim->stepsDone) { @@ -693,7 +692,7 @@ - (void)RB___stepAnimation { } NSTimeInterval delay = MIN(0.0,FRAMETIME-avg); // We adjust the new dimension proportionally to how much of the designated time has passed. - dim = floorf(anim->dimension*(remain-avg)/anim->totalTime); + CGFloat dim = floorf(anim->dimension*(remain-avg)/anim->totalTime); if (dim>4.0) { if (!anim->collapsing) { dim = anim->dimension-dim; @@ -715,8 +714,8 @@ - (void)RB___stepAnimation { DIM(frame.size) = 0.0; [self RB___finishCollapse:frame withFraction:anim->dimension/[sv RB___dimensionWithoutDividers]]; } else { - float savemin,savemax; - float dim = [self RB___setMinAndMaxTo:anim->dimension savingMin:&savemin andMax:&savemax]; + CGFloat savemin,savemax; + CGFloat dim = [self RB___setMinAndMaxTo:anim->dimension savingMin:&savemin andMax:&savemax]; DIM(frame.size) = dim; [self RB___finishExpand:frame withFraction:0.0]; minDimension = savemin; @@ -740,7 +739,7 @@ - (BOOL)RB___stopAnimation { // This internal method returns the actual visible dimension of the subview. Differs from -dimension in // that it returns 0.0 if the subview is collapsed. -- (float)RB___visibleDimension { +- (CGFloat)RB___visibleDimension { BOOL ishor = [self splitViewIsHorizontal]; NSRect frame = [self frame]; return MAX(0.0,DIM(frame.size)); @@ -756,8 +755,8 @@ - (void)RB___copyIntoCache:(subviewCache*)cache { cache->constrain = NO; } -- (void)RB___updateFromCache:(subviewCache*)cache withTotalDimension:(float)value { - float dim = [self RB___visibleDimension]; +- (void)RB___updateFromCache:(subviewCache*)cache withTotalDimension:(CGFloat)value { + CGFloat dim = [self RB___visibleDimension]; if (cache->size>=1.0) { // New state is not collapsed. if (dim>=1.0) { @@ -782,7 +781,7 @@ - (void)RB___updateFromCache:(subviewCache*)cache withTotalDimension:(float)valu // This internal method sets minimum and maximum values to the same value, saves the old values, // and returns the new value (which will be limited to the old values). -- (float)RB___setMinAndMaxTo:(float)value savingMin:(float*)oldmin andMax:(float*)oldmax { +- (CGFloat)RB___setMinAndMaxTo:(CGFloat)value savingMin:(CGFloat*)oldmin andMax:(CGFloat*)oldmax { *oldmin = [self minDimension]; *oldmax = [self maxDimension]; if (value<*oldmin) { @@ -816,8 +815,8 @@ - (BOOL)RB___clearResponder { // This internal method collapses a subview. // It returns the negative of the size of the subview before collapsing, or 0.0 if it wasn't collapsed. -- (float)RB___collapse { - float result = 0.0; +- (CGFloat)RB___collapse { + CGFloat result = 0.0; if (![self isCollapsed]) { RBSplitView* sv = [self splitView]; if (sv&&[self canCollapse]) { @@ -851,8 +850,8 @@ - (void)RB___finishCollapse:(NSRect)rect withFraction:(double)value { // This internal method expands a subview. setToMinimum will usually be YES during a divider drag. // It returns the size of the subview after expanding, or 0.0 if it wasn't expanded. -- (float)RB___expandAndSetToMinimum:(BOOL)setToMinimum { - float result = 0.0; +- (CGFloat)RB___expandAndSetToMinimum:(BOOL)setToMinimum { + CGFloat result = 0.0; RBSplitView* sv = [self splitView]; if (sv&&[self isCollapsed]) { NSRect frame = [super frame]; @@ -863,7 +862,7 @@ - (float)RB___expandAndSetToMinimum:(BOOL)setToMinimum { } else { result = [sv RB___dimensionWithoutDividers]*frac; // We need to apply a compensation factor for proportional resizing in adjustSubviews. - float newdim = floorf((frac>=1.0)?result:result/(1.0-frac)); + CGFloat newdim = floorf((frac>=1.0)?result:result/(1.0-frac)); DIM(frame.size) = newdim; result = floorf(result); } diff --git a/RBSplitView/RBSplitView.h b/RBSplitView/RBSplitView.h index 0c786c2b..72cf9fc8 100644 --- a/RBSplitView/RBSplitView.h +++ b/RBSplitView/RBSplitView.h @@ -27,7 +27,7 @@ typedef enum { NSColor* background; // The color used to paint the view's background (may be nil). NSImage* divider; // The image used for the divider "dimple". NSRect* dividers; // A C array of NSRects, one for each divider. - float dividerThickness; // Actual divider width; should be an integer and at least 1.0. + CGFloat dividerThickness; // Actual divider width; should be an integer and at least 1.0. BOOL mustAdjust; // Set internally if the subviews need to be adjusted. BOOL mustClearFractions; // Set internally if fractions should be cleared before adjusting. BOOL isHorizontal; // The divider's orientation; default is vertical. @@ -86,7 +86,7 @@ typedef enum { - (id)initWithFrame:(NSRect)frame; // This convenience initializer adds any number of subviews and adjusts them proportionally. -- (id)initWithFrame:(NSRect)frame andSubviews:(unsigned)count; +- (id)initWithFrame:(NSRect)frame andSubviews:(NSUInteger)count; // Sets and gets the delegate. (Delegates aren't retained.) See further down for delegate methods. - (void)setDelegate:(id)anObject; @@ -96,17 +96,17 @@ typedef enum { - (RBSplitSubview*)subviewWithIdentifier:(NSString*)anIdentifier; // Returns the subview at a certain position. Returns nil if the position is invalid. -- (RBSplitSubview*)subviewAtPosition:(unsigned)position; +- (RBSplitSubview*)subviewAtPosition:(NSUInteger)position; // Adds a subview at a certain position. -- (void)addSubview:(NSView*)aView atPosition:(unsigned)position; +- (void)addSubview:(NSView*)aView atPosition:(NSUInteger)position; // Sets and gets the divider thickness, which should be a positive integer or zero. // Setting the divider image also resets this automatically, so you would call this // only if you want the divider to be larger or smaller than the image. Zero means that // the image dimensions will be used. -- (void)setDividerThickness:(float)thickness; -- (float)dividerThickness; +- (void)setDividerThickness:(CGFloat)thickness; +- (CGFloat)dividerThickness; // Sets and gets the divider image. The default image can also be set in Interface Builder, so usually // there's no need to call this. Passing in nil means that the default divider thickness will be zero, @@ -181,7 +181,7 @@ typedef enum { // This method will be called after a RBSplitView is resized with setFrameSize: but before // adjustSubviews is called on it. -- (void)splitView:(RBSplitView*)sender wasResizedFrom:(float)oldDimension to:(float)newDimension; +- (void)splitView:(RBSplitView*)sender wasResizedFrom:(CGFloat)oldDimension to:(CGFloat)newDimension; // This method will be called when a divider is double-clicked and both leading and trailing // subviews can be collapsed. Return either of the parameters to collapse that subview, or nil @@ -192,16 +192,16 @@ typedef enum { // proposed rect is passed in. Return the actual rect, or NSZeroRect to suppress cursor setting // for this divider. This won't be called for two-axis thumbs, however. The rects are in // sender's local coordinates. -- (NSRect)splitView:(RBSplitView*)sender cursorRect:(NSRect)rect forDivider:(unsigned int)divider; +- (NSRect)splitView:(RBSplitView*)sender cursorRect:(NSRect)rect forDivider:(NSUInteger)divider; // This method will be called whenever a mouse-down event is received in a divider. Return YES to have // the event handled by the split view, NO if you wish to ignore it or handle it in the delegate. -- (BOOL)splitView:(RBSplitView*)sender shouldHandleEvent:(NSEvent*)theEvent inDivider:(unsigned int)divider betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing; +- (BOOL)splitView:(RBSplitView*)sender shouldHandleEvent:(NSEvent*)theEvent inDivider:(NSUInteger)divider betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing; // This method will be called just before a subview will be collapsed or expanded with animation. // Return the approximate time the animation should take, or 0.0 to disallow animation. // If not implemented, it will use the default of 0.2 seconds per 150 pixels. -- (NSTimeInterval)splitView:(RBSplitView*)sender willAnimateSubview:(RBSplitSubview*)subview withDimension:(float)dimension; +- (NSTimeInterval)splitView:(RBSplitView*)sender willAnimateSubview:(RBSplitSubview*)subview withDimension:(CGFloat)dimension; // This method will be called whenever a subview's frame is changed, usually from inside adjustSubviews' final loop. // You'd normally use this to move some auxiliary view to keep it aligned with the subview. @@ -211,11 +211,11 @@ typedef enum { // should act as an alternate drag view. Usually, the delegate will check the point (which is in sender's // local coordinates) against the frame of one or several auxiliary views, and return a valid divider number. // Returning NSNotFound means the point is not valid. -- (unsigned int)splitView:(RBSplitView*)sender dividerForPoint:(NSPoint)point inSubview:(RBSplitSubview*)subview; +- (NSUInteger)splitView:(RBSplitView*)sender dividerForPoint:(NSPoint)point inSubview:(RBSplitSubview*)subview; // This method is called continuously while a divider is dragged, just before the leading subview is resized. // Return NO to resize the trailing view by the same amount, YES to resize the containing window by the same amount. -- (BOOL)splitView:(RBSplitView*)sender shouldResizeWindowForDivider:(unsigned int)divider betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing willGrow:(BOOL)grow; +- (BOOL)splitView:(RBSplitView*)sender shouldResizeWindowForDivider:(NSUInteger)divider betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing willGrow:(BOOL)grow; // This method is called by each subview's drawRect: method, just after filling it with the background color but // before the contained subviews are drawn. Usually you would use this to draw a frame inside the subview. diff --git a/RBSplitView/RBSplitView.m b/RBSplitView/RBSplitView.m index ba025ed3..5f223857 100644 --- a/RBSplitView/RBSplitView.m +++ b/RBSplitView/RBSplitView.m @@ -12,6 +12,7 @@ #import "AppController.h" + // Please don't remove this copyright notice! static const unsigned char RBSplitView_Copyright[] __attribute__ ((used)) = "RBSplitView 1.1.4 Copyright(c)2004-2006 by Rainer Brockerhoff ."; @@ -20,11 +21,11 @@ static NSCursor* cursors[RBSVCursorTypeCount] = {nil}; // Our own fMIN and fMAX -static inline float fMIN(float a,float b) { +static inline CGFloat fMIN(CGFloat a,CGFloat b) { return ab?a:b; } @@ -96,8 +97,8 @@ - (void)setAutosaveName:(NSString*)aString recursively:(BOOL)flag { autosaveName = [aString retain]; if (flag) { NSArray* subviews = [self subviews]; - int subcount = [subviews count]; - int i; + NSInteger subcount = [subviews count]; + NSInteger i; for (i=0;i1)&&([[parts objectAtIndex:0] intValue]==subcount)&&(k==subcount)) { - int i; + NSInteger subcount = [subviews count]; + NSInteger k = [parts count]; + if ((k-->1)&&((NSInteger)[[parts objectAtIndex:0] intValue]==subcount)&&(k==subcount)) { + NSInteger i; NSRect frame = [self frame]; BOOL ishor = [self isHorizontal]; for (i=0;i0) { @@ -436,9 +437,9 @@ - (RBSplitSubview*)subviewWithIdentifier:(NSString*)anIdentifier { } // Returns the subview at a given position -- (RBSplitSubview*)subviewAtPosition:(unsigned)position { +- (RBSplitSubview*)subviewAtPosition:(NSUInteger)position { NSArray* subviews = [super subviews]; - unsigned int subcount = [subviews count]; + NSUInteger subcount = [subviews count]; if (position0.0) { return dividerThickness; } @@ -495,9 +496,9 @@ - (float)dividerThickness { return 0.0; } -- (void)setDividerThickness:(float)thickness { - float t = fMAX(0.0,floorf(thickness)); - if ((int)dividerThickness!=(int)t) { +- (void)setDividerThickness:(CGFloat)thickness { + CGFloat t = fMAX(0.0,floorf(thickness)); + if ((NSInteger)dividerThickness!=(NSInteger)t) { dividerThickness = t; [self setMustAdjust]; } @@ -532,7 +533,7 @@ - (void)addSubview:(NSView*)aView positioned:(NSWindowOrderingMode)place relativ [self setMustAdjust]; } -- (void)addSubview:(NSView*)aView atPosition:(unsigned)position { +- (void)addSubview:(NSView*)aView atPosition:(NSUInteger)position { RBSplitSubview* suv = [self subviewAtPosition:position]; if (suv) { [self addSubview:aView positioned:NSWindowBelow relativeTo:suv]; @@ -570,10 +571,10 @@ - (void)setFrameSize:(NSSize)size { [self setMustAdjust]; if ([delegate respondsToSelector:@selector(splitView:wasResizedFrom:to:)]) { BOOL ishor = [self isHorizontal]; - float olddim = DIM(oldsize); - float newdim = DIM(size); + CGFloat olddim = DIM(oldsize); + CGFloat newdim = DIM(size); // The delegate is not called if the dimension hasn't changed. - if (((int)newdim!=(int)olddim)) { + if (((NSInteger)newdim!=(NSInteger)olddim)) { [delegate splitView:self wasResizedFrom:olddim to:newdim]; } } @@ -591,7 +592,7 @@ - (void)mouseDown:(NSEvent*)theEvent { return; } NSArray* subviews = [self RB___subviews]; - int subcount = [subviews count]; + NSInteger subcount = [subviews count]; if (subcount<2) { return; } @@ -602,7 +603,7 @@ - (void)mouseDown:(NSEvent*)theEvent { } NSPoint where = [self convertPoint:[theEvent locationInWindow] fromView:nil]; BOOL ishor = [self isHorizontal]; - int i; + NSInteger i; --subcount; // Loop over the divider rectangles. for (i=0;iorigin); + CGFloat divt = [self dividerThickness]; + CGFloat offset = DIM(where)-DIM(divdr->origin); // Check if the leading subview is nested and if yes, if one of its two-axis thumbs was hit. - int ldivdr = NSNotFound; - float loffset = 0.0; + NSInteger ldivdr = NSNotFound; + CGFloat loffset = 0.0; NSPoint lwhere = where; NSRect lrect = NSZeroRect; if ((leading = [leading coupledSplitView])) { @@ -678,8 +679,8 @@ - (void)mouseDown:(NSEvent*)theEvent { } } // Check if the trailing subview is nested and if yes, if one of its two-axis thumbs was hit. - int tdivdr = NSNotFound; - float toffset = 0.0; + NSInteger tdivdr = NSNotFound; + CGFloat toffset = 0.0; NSPoint twhere = where; NSRect trect = NSZeroRect; if ((trailing = [trailing coupledSplitView])) { @@ -753,10 +754,11 @@ - (void)awakeFromNib { } //called from //if (![self splitView]) { - //[self restoreState:YES]; + //[self restoreState:YES]; //} outletObjectAwoke(self); + } // We check if subviews must be adjusted before redisplaying programmatically. @@ -774,16 +776,16 @@ - (void)drawRect:(NSRect)rect { return; } NSArray* subviews = [self RB___subviews]; - int subcount = [subviews count]; + NSInteger subcount = [subviews count]; // Return if there are no dividers to draw. if (subcount<2) { return; } --subcount; - int i; + NSInteger i; // Cache the divider image. NSImage* divdr = [self divider]; - float divt = [self dividerThickness]; + CGFloat divt = [self dividerThickness]; // Loop over the divider rectangles. for (i=0;i=0;i--) { RBSplitSubview* view = [result objectAtIndex:i]; if ([view isHidden]) { @@ -1009,12 +1011,12 @@ - (NSArray*)RB___subviews { } // This returns the actual value set in dividerThickness. -- (float)RB___dividerThickness { +- (CGFloat)RB___dividerThickness { return dividerThickness; } // This method returns the actual dimension occupied by the subviews; that is, without dividers. -- (float)RB___dimensionWithoutDividers { +- (CGFloat)RB___dimensionWithoutDividers { BOOL ishor = [self isHorizontal]; NSSize size = [self frame].size; return fMAX(1.0,DIM(size)-[self dividerThickness]*([self RB___numberOfSubviews]-1)); @@ -1023,7 +1025,7 @@ - (float)RB___dimensionWithoutDividers { // This method returns one of the divider rectangles, or NSZeroRect if the index is invalid. // If view is non-nil, the rect will be expressed in that view's coordinates. We assume // that view is a superview of self. -- (NSRect)RB___dividerRect:(unsigned)indx relativeToView:(RBSplitView*)view { +- (NSRect)RB___dividerRect:(NSUInteger)indx relativeToView:(RBSplitView*)view { if (dividers&&(indx<[self RB___numberOfSubviews]-1)) { NSRect result = dividers[indx]; if (view&&(view!=self)) { @@ -1037,15 +1039,15 @@ - (NSRect)RB___dividerRect:(unsigned)indx relativeToView:(RBSplitView*)view { // Returns the index of the divider hit by the point, or NSNotFound if none. // point is in coordinates relative to view. delta is the divider thickness added // to both ends of the divider rect, to accomodate two-axis thumbs. -- (unsigned)RB___dividerHitBy:(NSPoint)point relativeToView:(RBSplitView*)view thickness:(float)delta { +- (NSUInteger)RB___dividerHitBy:(NSPoint)point relativeToView:(RBSplitView*)view thickness:(CGFloat)delta { if (!dividers) { return NSNotFound; } - int divcount = [self RB___numberOfSubviews]-1; + NSInteger divcount = [self RB___numberOfSubviews]-1; if (divcount<1) { return NSNotFound; } - int i; + NSInteger i; BOOL ishor = [self isHorizontal]; point = [self convertPoint:point fromView:view]; for (i=0;idimension) { return; } @@ -1303,11 +1305,11 @@ - (void)RB___tryToExpandTrailing:(RBSplitSubview*)trailing leading:(RBSplitSubvi // and expressed in local coordinates. // base is an offset (x,y) applied to the mouse location (usually will be zero) // indx is the number of the divider that's being dragged. -- (void)RB___trackMouseEvent:(NSEvent*)theEvent from:(NSPoint)where withBase:(NSPoint)base inDivider:(unsigned)indx { +- (void)RB___trackMouseEvent:(NSEvent*)theEvent from:(NSPoint)where withBase:(NSPoint)base inDivider:(NSUInteger)indx { NSPoint result; NSArray* subviews = [self RB___subviews]; - int subcount = [subviews count]; - int k; + NSInteger subcount = [subviews count]; + NSInteger k; // leading and trailing point at the subviews immediately leading and trailing the divider being tracked RBSplitSubview* leading = [subviews objectAtIndex:indx]; RBSplitSubview* trailing = [subviews objectAtIndex:indx+1]; @@ -1319,7 +1321,7 @@ - (void)RB___trackMouseEvent:(NSEvent*)theEvent from:(NSPoint)where withBase:(NS result.y = mouse.y-where.y; // delta is the actual amount the mouse has moved in the relevant coordinate since the last event. BOOL ishor = [self isHorizontal]; - float delta = DIM(result); + CGFloat delta = DIM(result); if (delta<0.0) { // Negative delta means the mouse is being moved left or upwards. // firstLeading will point at the first expanded subview to the left (or upwards) of the divider. @@ -1369,14 +1371,14 @@ - (void)RB___trackMouseEvent:(NSEvent*)theEvent from:(NSPoint)where withBase:(NS } // This is called for nested RBSplitViews, to add the cursor rects for the two-axis thumbs. -- (void)RB___addCursorRectsTo:(RBSplitView*)masterView forDividerRect:(NSRect)rect thickness:(float)delta { +- (void)RB___addCursorRectsTo:(RBSplitView*)masterView forDividerRect:(NSRect)rect thickness:(CGFloat)delta { if (dividers&&[self divider]) { NSArray* subviews = [self RB___subviews]; - int divcount = [subviews count]-1; + NSInteger divcount = [subviews count]-1; if (divcount<1) { return; } - int i; + NSInteger i; NSCursor* cursor = [RBSplitView cursor:RBSV2WayCursor]; BOOL ishor = [self isHorizontal]; // Loop over the divider rectangles, intersect them with the view's own, and add the thumb rectangle @@ -1395,16 +1397,16 @@ - (void)RB___addCursorRectsTo:(RBSplitView*)masterView forDividerRect:(NSRect)re } // This is called for nested RBSplitViews, to draw the two-axis thumbs. -- (void)RB___drawDividersIn:(RBSplitView*)masterView forDividerRect:(NSRect)rect thickness:(float)delta { +- (void)RB___drawDividersIn:(RBSplitView*)masterView forDividerRect:(NSRect)rect thickness:(CGFloat)delta { if (!dividers) { return; } NSArray* subviews = [self RB___subviews]; - int divcount = [subviews count]-1; + NSInteger divcount = [subviews count]-1; if (divcount<1) { return; } - int i; + NSInteger i; BOOL ishor = [self isHorizontal]; // Get the outer split view's divider image. NSImage* image = [masterView divider]; @@ -1442,7 +1444,7 @@ - (void)RB___adjustOutermostIfNeeded { - (void)RB___adjustSubviewsExcepting:(RBSplitSubview*)excepting { mustAdjust = NO; NSArray* subviews = [self RB___subviews]; - unsigned subcount = [subviews count]; + NSUInteger subcount = [subviews count]; if (subcount<1) { return; } @@ -1461,7 +1463,7 @@ - (void)RB___adjustSubviewsExcepting:(RBSplitSubview*)excepting { [delegate willAdjustSubviews:self]; bounds = [self bounds]; } - unsigned divcount = subcount-1; + NSUInteger divcount = subcount-1; if (divcount<1) { // No dividers at all. if (dividers) { @@ -1470,7 +1472,7 @@ - (void)RB___adjustSubviewsExcepting:(RBSplitSubview*)excepting { } } else { // Try to allocate or resize if we already have a dividers array. - unsigned long divsiz = sizeof(NSRect)*divcount; + NSUInteger divsiz = sizeof(NSRect)*divcount; dividers = dividers?reallocf(dividers,divsiz):malloc(divsiz); if (!dividers) { return; @@ -1480,20 +1482,20 @@ - (void)RB___adjustSubviewsExcepting:(RBSplitSubview*)excepting { subviewCache* caches = malloc(sizeof(subviewCache)*subcount); double realsize = 0.0; double expsize = 0.0; - float newsize = 0.0; - float effsize = 0.0; - float limit; + CGFloat newsize = 0.0; + CGFloat effsize = 0.0; + CGFloat limit; subviewCache* curr; - unsigned int i; + NSUInteger i; BOOL ishor = [self isHorizontal]; - float divt = [self dividerThickness]; + CGFloat divt = [self dividerThickness]; // First we loop over subviews and cache their information. for (i=0;iconstrain) { // Check non-constrained subviews only; calculate the proposed new size. - float cursize = (curr->size+curr->fraction)*scale; + CGFloat cursize = (curr->size+curr->fraction)*scale; // Check if we hit a limit. limit will contain either the max or min dimension, whichever was hit. if (([curr->sub RB___animationData:NO resize:NO]&&((limit = curr->size)>=0.0))|| ((curr->sub==excepting)&&((limit = [curr->sub dimension])>0.0))|| @@ -1653,8 +1655,7 @@ - (void)RB___adjustSubviewsExcepting:(RBSplitSubview*)excepting { // divider rectangles as we go along, and collapsing and expanding subviews whenever requested. RBSplitSubview* last = nil; // And we make a note if there's any nested RBSplitView. - int nested = NSNotFound; - newsize = DIM(bounds.size)-divcount*divt; + NSInteger nested = NSNotFound; for (i=0;i0.0)) { // We'll resize the last expanded subview to whatever it takes to squeeze within the frame. // Normally the change should be at most one pixel, but if too many subviews were constrained, diff --git a/RBSplitView/RBSplitViewPrivateDefines.h b/RBSplitView/RBSplitViewPrivateDefines.h index 601f9ee9..b348d075 100644 --- a/RBSplitView/RBSplitViewPrivateDefines.h +++ b/RBSplitView/RBSplitViewPrivateDefines.h @@ -15,10 +15,10 @@ // This selects the main horizontal or vertical coordinate according to the split view's orientation. // It can be used as an lvalue, too. You need to have BOOL ishor declared to use it. -#define DIM(x) (((float*)&(x))[ishor]) +#define DIM(x) (((CGFloat *)&(x))[ishor]) // This selects the other coordinate. -#define OTHER(x) (((float*)&(x))[!ishor]) +#define OTHER(x) (((CGFloat *)&(x))[!ishor]) // This value for the view offsets is guaranteed to be out of view for quite some time and is used // to mark the view as collapsed. @@ -32,15 +32,15 @@ typedef struct subviewCache { NSRect rect; // the subview's frame double fraction; // fractional extra RBSplitSubview* sub; // points at the subview - float size; // current dimension (integer) + CGFloat size; // current dimension (integer) BOOL constrain; // set if constrained } subviewCache; // This struct is used internally for doing collapse/expand animation. typedef struct animationData { RBSplitSubview* owner; // the subview being animated - float dimension; // the subview's starting or ending dimension - int stepsDone; // counts already done animation steps + CGFloat dimension; // the subview's starting or ending dimension + NSInteger stepsDone; // counts already done animation steps NSTimeInterval elapsedTime; // time already spent in resizing and adjusting subviews NSTimeInterval finishTime; // the animation should be finished at this time NSTimeInterval totalTime; // total time the animation should take @@ -57,17 +57,17 @@ typedef struct animationData { - (animationData*)RB___animationData:(BOOL)start resize:(BOOL)resize; - (void)RB___stepAnimation; - (BOOL)RB___stopAnimation; -- (float)RB___visibleDimension; -- (float)RB___setMinAndMaxTo:(float)value savingMin:(float*)oldmin andMax:(float*)oldmax; -- (float)RB___collapse; -- (float)RB___expandAndSetToMinimum:(BOOL)setToMinimum; +- (CGFloat)RB___visibleDimension; +- (CGFloat)RB___setMinAndMaxTo:(CGFloat)value savingMin:(CGFloat*)oldmin andMax:(CGFloat*)oldmax; +- (CGFloat)RB___collapse; +- (CGFloat)RB___expandAndSetToMinimum:(BOOL)setToMinimum; - (void)RB___finishCollapse:(NSRect)rect withFraction:(double)value; - (void)RB___finishExpand:(NSRect)rect withFraction:(double)value; - (void)RB___setFrameSize:(NSSize)size withFraction:(double)value; - (void)RB___setFrame:(NSRect)rect withFraction:(double)value notify:(BOOL)notify; - (double)RB___fraction; - (void)RB___copyIntoCache:(subviewCache*)cache; -- (void)RB___updateFromCache:(subviewCache*)cache withTotalDimension:(float)value; +- (void)RB___updateFromCache:(subviewCache*)cache withTotalDimension:(CGFloat)value; - (BOOL)RB___clearResponder; @end @@ -76,23 +76,23 @@ typedef struct animationData { - (void)RB___adjustOutermostIfNeeded; - (void)RB___setDragging:(BOOL)flag; -- (float)RB___dividerOrigin:(int)indx; +- (CGFloat)RB___dividerOrigin:(NSInteger)indx; - (NSArray*)RB___subviews; -- (unsigned int)RB___numberOfSubviews; +- (NSUInteger)RB___numberOfSubviews; - (void)RB___adjustSubviewsExcepting:(RBSplitSubview*)excepting; -- (float)RB___dimensionWithoutDividers; -- (float)RB___dividerThickness; -- (NSRect)RB___dividerRect:(unsigned)indx relativeToView:(RBSplitView*)view; +- (CGFloat)RB___dimensionWithoutDividers; +- (CGFloat)RB___dividerThickness; +- (NSRect)RB___dividerRect:(NSUInteger)indx relativeToView:(RBSplitView*)view; - (void)RB___setMustClearFractions; -- (BOOL)RB___shouldResizeWindowForDivider:(unsigned int)indx betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing willGrow:(BOOL)grow; -- (void)RB___tryToExpandLeading:(RBSplitSubview*)leading divider:(unsigned int)indx trailing:(RBSplitSubview*)trailing delta:(float)delta; -- (void)RB___tryToShortenLeading:(RBSplitSubview*)leading divider:(unsigned int)indx trailing:(RBSplitSubview*)trailing delta:(float)delta always:(BOOL)always; -- (void)RB___tryToExpandTrailing:(RBSplitSubview*)trailing leading:(RBSplitSubview*)leading delta:(float)delta; -- (void)RB___tryToShortenTrailing:(RBSplitSubview*)trailing divider:(unsigned int)indx leading:(RBSplitSubview*)leading delta:(float)delta always:(BOOL)always; -- (void)RB___trackMouseEvent:(NSEvent*)theEvent from:(NSPoint)where withBase:(NSPoint)base inDivider:(unsigned)indx; -- (void)RB___addCursorRectsTo:(RBSplitView*)masterView forDividerRect:(NSRect)rect thickness:(float)delta; -- (unsigned)RB___dividerHitBy:(NSPoint)point relativeToView:(RBSplitView*)view thickness:(float)delta; -- (void)RB___drawDividersIn:(RBSplitView*)masterView forDividerRect:(NSRect)rect thickness:(float)delta; +- (BOOL)RB___shouldResizeWindowForDivider:(NSUInteger)indx betweenView:(RBSplitSubview*)leading andView:(RBSplitSubview*)trailing willGrow:(BOOL)grow; +- (void)RB___tryToExpandLeading:(RBSplitSubview*)leading divider:(NSUInteger)indx trailing:(RBSplitSubview*)trailing delta:(CGFloat)delta; +- (void)RB___tryToShortenLeading:(RBSplitSubview*)leading divider:(NSUInteger)indx trailing:(RBSplitSubview*)trailing delta:(CGFloat)delta always:(BOOL)always; +- (void)RB___tryToExpandTrailing:(RBSplitSubview*)trailing leading:(RBSplitSubview*)leading delta:(CGFloat)delta; +- (void)RB___tryToShortenTrailing:(RBSplitSubview*)trailing divider:(NSUInteger)indx leading:(RBSplitSubview*)leading delta:(CGFloat)delta always:(BOOL)always; +- (void)RB___trackMouseEvent:(NSEvent*)theEvent from:(NSPoint)where withBase:(NSPoint)base inDivider:(NSUInteger)indx; +- (void)RB___addCursorRectsTo:(RBSplitView*)masterView forDividerRect:(NSRect)rect thickness:(CGFloat)delta; +- (NSUInteger)RB___dividerHitBy:(NSPoint)point relativeToView:(RBSplitView*)view thickness:(CGFloat)delta; +- (void)RB___drawDividersIn:(RBSplitView*)masterView forDividerRect:(NSRect)rect thickness:(CGFloat)delta; @end diff --git a/SFPasswordAssistantInspectorController.h b/SFPasswordAssistantInspectorController.h old mode 100644 new mode 100755 diff --git a/SavedSearchesController.m b/SavedSearchesController.m old mode 100644 new mode 100755 diff --git a/Sparkle.framework/Versions/A/Headers/NSApplication+AppCopies.h b/Sparkle.framework/Versions/A/Headers/NSApplication+AppCopies.h deleted file mode 100644 index ee901e68..00000000 --- a/Sparkle.framework/Versions/A/Headers/NSApplication+AppCopies.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// NSApplication+AppCopies.h -// Sparkle -// -// Created by Andy Matuschak on 3/16/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#import - -@interface NSApplication (SUAppCopies) -- (int)copiesRunning; -@end diff --git a/Sparkle.framework/Versions/A/Headers/NSFileManager+Authentication.h b/Sparkle.framework/Versions/A/Headers/NSFileManager+Authentication.h deleted file mode 100644 index c995911c..00000000 --- a/Sparkle.framework/Versions/A/Headers/NSFileManager+Authentication.h +++ /dev/null @@ -1,11 +0,0 @@ -// -// NSFileManager+Authentication.m -// Sparkle -// -// Created by Andy Matuschak on 3/9/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -@interface NSFileManager (SUAuthenticationAdditions) -- (BOOL)movePathWithAuthentication:(NSString *)src toPath:(NSString *)dst; -@end diff --git a/Sparkle.framework/Versions/A/Headers/NSFileManager+Verification.h b/Sparkle.framework/Versions/A/Headers/NSFileManager+Verification.h deleted file mode 100644 index f0ce7c20..00000000 --- a/Sparkle.framework/Versions/A/Headers/NSFileManager+Verification.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// NSFileManager+Verification.h -// Sparkle -// -// Created by Andy Matuschak on 3/16/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#import - -// For the paranoid folks! -@interface NSFileManager (SUVerification) -- (BOOL)validatePath:(NSString *)path withMD5Hash:(NSString *)hash; -- (BOOL)validatePath:(NSString *)path withEncodedDSASignature:(NSString *)encodedSignature; -@end diff --git a/Sparkle.framework/Versions/A/Headers/NSString+extras.h b/Sparkle.framework/Versions/A/Headers/NSString+extras.h deleted file mode 100755 index 498e4d01..00000000 --- a/Sparkle.framework/Versions/A/Headers/NSString+extras.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - -BSD License - -Copyright (c) 2002, Brent Simmons -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -* Neither the name of ranchero.com or Brent Simmons nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -*/ - - -/* - NSString+extras.h - NetNewsWire - - Created by Brent Simmons on Fri Jun 14 2002. - Copyright (c) 2002 Brent Simmons. All rights reserved. -*/ - - -#import -#import - - -@interface NSString (extras) - -- (NSString *)stringWithSubstitute:(NSString *)subs forCharactersFromSet:(NSCharacterSet *)set; - -- (NSString *) trimWhiteSpace; - -- (NSString *) stripHTML; - -- (NSString *) ellipsizeAfterNWords: (int) n; - -+ (BOOL) stringIsEmpty: (NSString *) s; - - -@end diff --git a/Sparkle.framework/Versions/A/Headers/RSS.h b/Sparkle.framework/Versions/A/Headers/RSS.h deleted file mode 100755 index 82da04a4..00000000 --- a/Sparkle.framework/Versions/A/Headers/RSS.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - -BSD License - -Copyright (c) 2002, Brent Simmons -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -* Neither the name of ranchero.com or Brent Simmons nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -*/ - -/* - RSS.h - A class for reading RSS feeds. - - Created by Brent Simmons on Wed Apr 17 2002. - Copyright (c) 2002 Brent Simmons. All rights reserved. -*/ - - -#import -#import -#import "NSString+extras.h" - - -@interface RSS : NSObject { - - NSDictionary *headerItems; - NSMutableArray *newsItems; - NSString *version; - - BOOL flRdf; - BOOL normalize; - } - - -/*Public*/ - -- (RSS *) initWithTitle: (NSString *) title andDescription: (NSString *) description; - -- (RSS *) initWithData: (NSData *) rssData normalize: (BOOL) fl; - -- (RSS *) initWithURL: (NSURL *) url normalize: (BOOL) fl; -- (RSS *) initWithURL: (NSURL *) url normalize: (BOOL) fl userAgent:(NSString *)userAgent; - -- (NSDictionary *) headerItems; - -- (NSMutableArray *) newsItems; - -- (NSString *) version; - -// AMM's extensions for Sparkle -- (NSDictionary *)newestItem; - - -/*Private*/ - -- (void) createheaderdictionary: (CFXMLTreeRef) tree; - -- (void) createitemsarray: (CFXMLTreeRef) tree; - -- (void) setversionstring: (CFXMLTreeRef) tree; - -- (void) flattenimagechildren: (CFXMLTreeRef) tree into: (NSMutableDictionary *) dictionary; - -- (void) flattensourceattributes: (CFXMLNodeRef) node into: (NSMutableDictionary *) dictionary; - -- (CFXMLTreeRef) getchanneltree: (CFXMLTreeRef) tree; - -- (CFXMLTreeRef) getnamedtree: (CFXMLTreeRef) currentTree name: (NSString *) name; - -- (void) normalizeRSSItem: (NSMutableDictionary *) rssItem; - -- (NSString *) getelementvalue: (CFXMLTreeRef) tree; - -@end diff --git a/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/Sparkle.framework/Versions/A/Headers/SUAppcast.h index 209fe206..171148a4 100644 --- a/Sparkle.framework/Versions/A/Headers/SUAppcast.h +++ b/Sparkle.framework/Versions/A/Headers/SUAppcast.h @@ -6,22 +6,28 @@ // Copyright 2006 Andy Matuschak. All rights reserved. // -#import +#ifndef SUAPPCAST_H +#define SUAPPCAST_H -@class RSS, SUAppcastItem; +@class SUAppcastItem; @interface SUAppcast : NSObject { NSArray *items; + NSString *userAgentString; id delegate; + NSMutableData *incrementalData; } - (void)fetchAppcastFromURL:(NSURL *)url; - (void)setDelegate:delegate; +- (void)setUserAgentString:(NSString *)userAgentString; -- (SUAppcastItem *)newestItem; - (NSArray *)items; @end @interface NSObject (SUAppcastDelegate) -- appcastDidFinishLoading:(SUAppcast *)appcast; -@end \ No newline at end of file +- (void)appcastDidFinishLoading:(SUAppcast *)appcast; +- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error; +@end + +#endif diff --git a/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h index c0202e3d..7f1ca65c 100644 --- a/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h +++ b/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h @@ -6,52 +6,42 @@ // Copyright 2006 Andy Matuschak. All rights reserved. // -#import - +#ifndef SUAPPCASTITEM_H +#define SUAPPCASTITEM_H @interface SUAppcastItem : NSObject { NSString *title; NSDate *date; - NSString *description; + NSString *itemDescription; NSURL *releaseNotesURL; - NSString *DSASignature; - NSString *MD5Sum; + NSString *DSASignature; + NSString *minimumSystemVersion; NSURL *fileURL; - NSString *fileVersion; NSString *versionString; + NSString *displayVersionString; + + NSDictionary *propertiesDictionary; } // Initializes with data from a dictionary provided by the RSS class. - initWithDictionary:(NSDictionary *)dict; - (NSString *)title; -- (void)setTitle:(NSString *)aTitle; - +- (NSString *)versionString; +- (NSString *)displayVersionString; - (NSDate *)date; -- (void)setDate:(NSDate *)aDate; - -- (NSString *)description; -- (void)setDescription:(NSString *)aDescription; - +- (NSString *)itemDescription; - (NSURL *)releaseNotesURL; -- (void)setReleaseNotesURL:(NSURL *)aReleaseNotesURL; - -- (NSString *)DSASignature; -- (void)setDSASignature:(NSString *)aDSASignature; - -- (NSString *)MD5Sum; -- (void)setMD5Sum:(NSString *)aMd5Sum; - - (NSURL *)fileURL; -- (void)setFileURL:(NSURL *)aFileURL; - -- (NSString *)fileVersion; -- (void)setFileVersion:(NSString *)aFileVersion; +- (NSString *)DSASignature; +- (NSString *)minimumSystemVersion; -- (NSString *)versionString; -- (void)setVersionString:(NSString *)versionString; +// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions. +- (NSDictionary *)propertiesDictionary; @end + +#endif diff --git a/Sparkle.framework/Versions/A/Headers/SUAutomaticUpdateAlert.h b/Sparkle.framework/Versions/A/Headers/SUAutomaticUpdateAlert.h deleted file mode 100644 index fc0ac9fd..00000000 --- a/Sparkle.framework/Versions/A/Headers/SUAutomaticUpdateAlert.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// SUAutomaticUpdateAlert.h -// Sparkle -// -// Created by Andy Matuschak on 3/18/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#import - -@class SUAppcastItem; -@interface SUAutomaticUpdateAlert : NSWindowController { - SUAppcastItem *updateItem; -} - -- initWithAppcastItem:(SUAppcastItem *)item; - -- (IBAction)relaunchNow:sender; -- (IBAction)relaunchLater:sender; - -@end diff --git a/Sparkle.framework/Versions/A/Headers/SUConstants.h b/Sparkle.framework/Versions/A/Headers/SUConstants.h deleted file mode 100644 index bfbe625b..00000000 --- a/Sparkle.framework/Versions/A/Headers/SUConstants.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// SUConstants.h -// Sparkle -// -// Created by Andy Matuschak on 3/16/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -extern NSString *SUUpdaterWillRestartNotification; - -extern NSString *SUCheckAtStartupKey; -extern NSString *SUFeedURLKey; -extern NSString *SUShowReleaseNotesKey; -extern NSString *SUSkippedVersionKey; -extern NSString *SUScheduledCheckIntervalKey; -extern NSString *SULastCheckTimeKey; -extern NSString *SUExpectsDSASignatureKey; -extern NSString *SUPublicDSAKeyKey; -extern NSString *SUAutomaticallyUpdateKey; -extern NSString *SUAllowsAutomaticUpdatesKey; \ No newline at end of file diff --git a/Sparkle.framework/Versions/A/Headers/SUStatusChecker.h b/Sparkle.framework/Versions/A/Headers/SUStatusChecker.h deleted file mode 100644 index e83d1520..00000000 --- a/Sparkle.framework/Versions/A/Headers/SUStatusChecker.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// SUStatusChecker.h -// Sparkle -// -// Created by Evan Schoenberg on 7/6/06. -// - -#import -#import - -@class SUStatusChecker; - -@protocol SUStatusCheckerDelegate -//versionString will be nil and isNewVersion will be NO if version checking fails. -- (void)statusChecker:(SUStatusChecker *)statusChecker foundVersion:(NSString *)versionString isNewVersion:(BOOL)isNewVersion; -@end - -@interface SUStatusChecker : SUUpdater { - id scDelegate; -} - -// Create a status checker which will notifiy delegate once the appcast version is determined. -// Notification occurs via the method defined in the SUStatusCheckerDelegate informal protocol. -+ (SUStatusChecker *)statusCheckerForDelegate:(id)delegate; - -@end diff --git a/Sparkle.framework/Versions/A/Headers/SUStatusController.h b/Sparkle.framework/Versions/A/Headers/SUStatusController.h deleted file mode 100644 index 19a3f89e..00000000 --- a/Sparkle.framework/Versions/A/Headers/SUStatusController.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// SUStatusController.h -// Sparkle -// -// Created by Andy Matuschak on 3/14/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#import - - -@interface SUStatusController : NSWindowController { - double progressValue, maxProgressValue; - NSString *title, *statusText, *buttonTitle; - IBOutlet NSButton *actionButton; -} - -// Pass 0 for the max progress value to get an indeterminate progress bar. -// Pass nil for the status text to not show it. -- (void)beginActionWithTitle:(NSString *)title maxProgressValue:(double)maxProgressValue statusText:(NSString *)statusText; - -// If isDefault is YES, the button's key equivalent will be \r. -- (void)setButtonTitle:(NSString *)buttonTitle target:target action:(SEL)action isDefault:(BOOL)isDefault; -- (void)setButtonEnabled:(BOOL)enabled; - -- (double)progressValue; -- (void)setProgressValue:(double)value; -- (double)maxProgressValue; -- (void)setMaxProgressValue:(double)value; - -- (void)setStatusText:(NSString *)statusText; - -@end diff --git a/Sparkle.framework/Versions/A/Headers/SUUnarchiver.h b/Sparkle.framework/Versions/A/Headers/SUUnarchiver.h deleted file mode 100644 index da111c15..00000000 --- a/Sparkle.framework/Versions/A/Headers/SUUnarchiver.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// SUUnarchiver.h -// Sparkle -// -// Created by Andy Matuschak on 3/16/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#import - - -@interface SUUnarchiver : NSObject { - id delegate; -} - -- (void)unarchivePath:(NSString *)path; -- (void)setDelegate:delegate; - -@end - -@interface NSObject (SUUnarchiverDelegate) -- (void)unarchiver:(SUUnarchiver *)unarchiver extractedLength:(long)length; -- (void)unarchiverDidFinish:(SUUnarchiver *)unarchiver; -- (void)unarchiverDidFail:(SUUnarchiver *)unarchiver; -@end \ No newline at end of file diff --git a/Sparkle.framework/Versions/A/Headers/SUUpdateAlert.h b/Sparkle.framework/Versions/A/Headers/SUUpdateAlert.h deleted file mode 100644 index 69c28174..00000000 --- a/Sparkle.framework/Versions/A/Headers/SUUpdateAlert.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// SUUpdateAlert.h -// Sparkle -// -// Created by Andy Matuschak on 3/12/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#import - -typedef enum -{ - SUInstallUpdateChoice, - SURemindMeLaterChoice, - SUSkipThisVersionChoice -} SUUpdateAlertChoice; - -@class WebView, SUAppcastItem; -@interface SUUpdateAlert : NSWindowController { - SUAppcastItem *updateItem; - id delegate; - - IBOutlet WebView *releaseNotesView; - IBOutlet NSTextField *description; - NSProgressIndicator *releaseNotesSpinner; - BOOL webViewFinishedLoading; -} - -- initWithAppcastItem:(SUAppcastItem *)item; -- (void)setDelegate:delegate; - -- (IBAction)installUpdate:sender; -- (IBAction)skipThisVersion:sender; -- (IBAction)remindMeLater:sender; - -@end - -@interface NSObject (SUUpdateAlertDelegate) -- (void)updateAlert:(SUUpdateAlert *)updateAlert finishedWithChoice:(SUUpdateAlertChoice)updateChoice; -@end diff --git a/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/Sparkle.framework/Versions/A/Headers/SUUpdater.h index 5f82914b..e78c4d35 100644 --- a/Sparkle.framework/Versions/A/Headers/SUUpdater.h +++ b/Sparkle.framework/Versions/A/Headers/SUUpdater.h @@ -6,50 +6,113 @@ // Copyright 2006 Andy Matuschak. All rights reserved. // -#import +#ifndef SUUPDATER_H +#define SUUPDATER_H -// Before you use Sparkle in your app, you must set SUFeedURL in Info.plist to the -// address of the appcast on your webserver. If you don't already have an -// appcast, please see the Sparkle documentation to learn about how to set one up. +#import -// .zip, .dmg, .tar, .tbz, .tgz archives are supported at this time. - -// By default, Sparkle offers to show the user the release notes of the build they'll be -// getting, which it assumes are in the description (or body) field of the relevant RSS item. -// Set SUShowReleaseNotes to in Info.plist to hide the button. - -@class SUAppcastItem, SUUpdateAlert, SUStatusController; +@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast; @interface SUUpdater : NSObject { - SUAppcastItem *updateItem; - - SUStatusController *statusController; - SUUpdateAlert *updateAlert; - - NSURLDownload *downloader; - NSString *downloadPath; - NSTimer *checkTimer; - NSTimeInterval checkInterval; + SUUpdateDriver *driver; - BOOL verbose; - BOOL updateInProgress; + SUHost *host; + IBOutlet id delegate; } ++ (SUUpdater *)sharedUpdater; ++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; +- (NSBundle *)hostBundle; + +- (void)setDelegate:(id)delegate; +- delegate; + +- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks; +- (BOOL)automaticallyChecksForUpdates; + +- (void)setUpdateCheckInterval:(NSTimeInterval)interval; +- (NSTimeInterval)updateCheckInterval; + +- (void)setFeedURL:(NSURL *)feedURL; +- (NSURL *)feedURL; + +- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile; +- (BOOL)sendsSystemProfile; + +- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates; +- (BOOL)automaticallyDownloadsUpdates; + // This IBAction is meant for a main menu item. Hook up any menu item to this action, // and Sparkle will check for updates and report back its findings verbosely. - (IBAction)checkForUpdates:sender; -// This method is similar to the above, but it's intended for updates initiated by -// the computer instead of by the user. It does not alert the user when he is up to date, -// and it remains silent about network errors in fetching the feed. This is what you -// want to call to update programmatically; only use checkForUpdates: with buttons and menu items. +// This kicks off an update meant to be programmatically initiated. That is, it will display no UI unless it actually finds an update, +// in which case it proceeds as usual. If the fully automated updating is turned on, however, this will invoke that behavior, and if an +// update is found, it will be downloaded and prepped for installation. - (void)checkForUpdatesInBackground; -// This method allows you to schedule a check to run every time interval. You can -// pass 0 to this method to cancel a previously scheduled timer. You probably don't want -// to call this directly: if you set a SUScheduledCheckInterval key in Info.plist or -// the user defaults, Sparkle will set this up for you automatically on startup. You might -// just want to call this every time the user changes the setting in the preferences. -- (void)scheduleCheckWithInterval:(NSTimeInterval)interval; +// Date of last update check. Returns null if no check has been performed. +- (NSDate*)lastUpdateCheckDate; + +// This begins a "probing" check for updates which will not actually offer to update to that version. The delegate methods, though, +// (up to updater:didFindValidUpdate: and updaterDidNotFindUpdate:), are called, so you can use that information in your UI. +- (void)checkForUpdateInformation; + +// Call this to appropriately schedule or cancel the update checking timer according to the preferences for time interval and automatic checks. This call does not change the date of the next check, but only the internal NSTimer. +- (void)resetUpdateCycle; + +- (BOOL)updateInProgress; +@end + +@interface NSObject (SUUpdaterDelegateInformalProtocol) +// This method allows you to add extra parameters to the appcast URL, potentially based on whether or not Sparkle will also be sending along the system profile. This method should return an array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. +- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; + +// Use this to override the default behavior for Sparkle prompting the user about automatic update checks. +- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)bundle; + +// Implement this if you want to do some special handling with the appcast once it finishes loading. +- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; + +// If you're using special logic or extensions in your appcast, implement this to use your own logic for finding +// a valid update, if any, in the given appcast. +- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle; + +// Sent when a valid update is found by the update driver. +- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update; + +// Sent when a valid update is not found. +- (void)updaterDidNotFindUpdate:(SUUpdater *)update; + +// Sent immediately before installing the specified update. +- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update; + +// Return YES to delay the relaunch until you do some processing; invoke the given NSInvocation to continue. +- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation; + +// Called immediately before relaunching. +- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; + +// This method allows you to provide a custom version comparator. +// If you don't implement this method or return nil, the standard version comparator will be used. +- (id )versionComparatorForUpdater:(SUUpdater *)updater; + +// Returns the path which is used to relaunch the client after the update is installed. By default, the path of the host bundle. +- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; + +@end + +// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds. +#ifdef DEBUG +#define SU_MIN_CHECK_INTERVAL 60 +#else +#define SU_MIN_CHECK_INTERVAL 60*60 +#endif + +#ifdef DEBUG +#define SU_DEFAULT_CHECK_INTERVAL 60 +#else +#define SU_DEFAULT_CHECK_INTERVAL 60*60*24 +#endif -@end \ No newline at end of file +#endif diff --git a/Sparkle.framework/Versions/A/Headers/SUUtilities.h b/Sparkle.framework/Versions/A/Headers/SUUtilities.h deleted file mode 100644 index 5af35508..00000000 --- a/Sparkle.framework/Versions/A/Headers/SUUtilities.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// SUUtilities.h -// Sparkle -// -// Created by Andy Matuschak on 3/12/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#import - -id SUInfoValueForKey(NSString *key); -NSString *SUHostAppName(); -NSString *SUHostAppDisplayName(); -NSString *SUHostAppVersion(); -NSString *SUHostAppVersionString(); - -NSComparisonResult SUStandardVersionComparison(NSString * versionA, NSString * versionB); - -// If running make localizable-strings for genstrings, ignore the error on this line. -NSString *SULocalizedString(NSString *key, NSString *comment); diff --git a/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h new file mode 100644 index 00000000..3d11ae87 --- /dev/null +++ b/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h @@ -0,0 +1,27 @@ +// +// SUVersionComparisonProtocol.h +// Sparkle +// +// Created by Andy Matuschak on 12/21/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// + +#ifndef SUVERSIONCOMPARISONPROTOCOL_H +#define SUVERSIONCOMPARISONPROTOCOL_H + +/*! + @protocol + @abstract Implement this protocol to provide version comparison facilities for Sparkle. +*/ +@protocol SUVersionComparison + +/*! + @method + @abstract An abstract method to compare two version strings. + @discussion Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, and NSOrderedSame if they are equivalent. +*/ +- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; + +@end + +#endif diff --git a/Sparkle.framework/Versions/A/Headers/Sparkle.h b/Sparkle.framework/Versions/A/Headers/Sparkle.h index 13e9b215..08dd5777 100644 --- a/Sparkle.framework/Versions/A/Headers/Sparkle.h +++ b/Sparkle.framework/Versions/A/Headers/Sparkle.h @@ -2,21 +2,20 @@ // Sparkle.h // Sparkle // -// Created by Andy Matuschak on 3/16/06. +// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07) // Copyright 2006 Andy Matuschak. All rights reserved. // -#import "SUUpdater.h" -#import "SUUtilities.h" -#import "SUConstants.h" -#import "SUAppcast.h" -#import "SUAppcastItem.h" -#import "SUUpdateAlert.h" -#import "SUAutomaticUpdateAlert.h" -#import "SUStatusController.h" -#import "SUUnarchiver.h" -#import "SUStatusChecker.h" +#ifndef SPARKLE_H +#define SPARKLE_H -#import "NSApplication+AppCopies.h" -#import "NSFileManager+Authentication.h" -#import "NSFileManager+Verification.h" \ No newline at end of file +// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless +// there are name-space collisions) so we can list all of them to start with: + +#import + +#import +#import +#import + +#endif diff --git a/Sparkle.framework/Versions/A/Resources/Info.plist b/Sparkle.framework/Versions/A/Resources/Info.plist index c154cb61..c7f277d0 100644 --- a/Sparkle.framework/Versions/A/Resources/Info.plist +++ b/Sparkle.framework/Versions/A/Resources/Info.plist @@ -1,9 +1,9 @@ - + CFBundleDevelopmentRegion - English + en CFBundleExecutable Sparkle CFBundleIdentifier @@ -14,9 +14,11 @@ Sparkle CFBundlePackageType FMWK + CFBundleShortVersionString + 1.5 Beta 6 CFBundleSignature ???? CFBundleVersion - 1.1 + 313 diff --git a/Sparkle.framework/Versions/A/Resources/License.txt b/Sparkle.framework/Versions/A/Resources/License.txt new file mode 100644 index 00000000..20466c41 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/License.txt @@ -0,0 +1,7 @@ +Copyright (c) 2006 Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist b/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist new file mode 100644 index 00000000..92ef9471 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist @@ -0,0 +1,174 @@ + + + + + ADP2,1 + Developer Transition Kit + MacBook1,1 + MacBook (Core Duo) + MacBook2,1 + MacBook (Core 2 Duo) + MacBook4,1 + MacBook (Core 2 Duo Feb 2008) + MacBookAir1,1 + MacBook Air (January 2008) + MacBookPro1,1 + MacBook Pro Core Duo (15-inch) + MacBookPro1,2 + MacBook Pro Core Duo (17-inch) + MacBookPro2,1 + MacBook Pro Core 2 Duo (17-inch) + MacBookPro2,2 + MacBook Pro Core 2 Duo (15-inch) + MacBookPro3,1 + MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo) + MacBookPro3,2 + MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo) + MacBookPro4,1 + MacBook Pro (Core 2 Duo Feb 2008) + MacPro1,1 + Mac Pro (four-core) + MacPro2,1 + Mac Pro (eight-core) + MacPro3,1 + Mac Pro (January 2008 4- or 8- core "Harpertown") + Macmini1,1 + Mac Mini (Core Solo/Duo) + PowerBook1,1 + PowerBook G3 + PowerBook2,1 + iBook G3 + PowerBook2,2 + iBook G3 (FireWire) + PowerBook2,3 + iBook G3 + PowerBook2,4 + iBook G3 + PowerBook3,1 + PowerBook G3 (FireWire) + PowerBook3,2 + PowerBook G4 + PowerBook3,3 + PowerBook G4 (Gigabit Ethernet) + PowerBook3,4 + PowerBook G4 (DVI) + PowerBook3,5 + PowerBook G4 (1GHz / 867MHz) + PowerBook4,1 + iBook G3 (Dual USB, Late 2001) + PowerBook4,2 + iBook G3 (16MB VRAM) + PowerBook4,3 + iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003) + PowerBook5,1 + PowerBook G4 (17 inch) + PowerBook5,2 + PowerBook G4 (15 inch FW 800) + PowerBook5,3 + PowerBook G4 (17-inch 1.33GHz) + PowerBook5,4 + PowerBook G4 (15 inch 1.5/1.33GHz) + PowerBook5,5 + PowerBook G4 (17-inch 1.5GHz) + PowerBook5,6 + PowerBook G4 (15 inch 1.67GHz/1.5GHz) + PowerBook5,7 + PowerBook G4 (17-inch 1.67GHz) + PowerBook5,8 + PowerBook G4 (Double layer SD, 15 inch) + PowerBook5,9 + PowerBook G4 (Double layer SD, 17 inch) + PowerBook6,1 + PowerBook G4 (12 inch) + PowerBook6,2 + PowerBook G4 (12 inch, DVI) + PowerBook6,3 + iBook G4 + PowerBook6,4 + PowerBook G4 (12 inch 1.33GHz) + PowerBook6,5 + iBook G4 (Early-Late 2004) + PowerBook6,7 + iBook G4 (Mid 2005) + PowerBook6,8 + PowerBook G4 (12 inch 1.5GHz) + PowerMac1,1 + Power Macintosh G3 (Blue & White) + PowerMac1,2 + Power Macintosh G4 (PCI Graphics) + PowerMac10,1 + Mac Mini G4 + PowerMac10,2 + Mac Mini (Late 2005) + PowerMac11,2 + Power Macintosh G5 (Late 2005) + PowerMac12,1 + iMac G5 (iSight) + PowerMac2,1 + iMac G3 (Slot-loading CD-ROM) + PowerMac2,2 + iMac G3 (Summer 2000) + PowerMac3,1 + Power Macintosh G4 (AGP Graphics) + PowerMac3,2 + Power Macintosh G4 (AGP Graphics) + PowerMac3,3 + Power Macintosh G4 (Gigabit Ethernet) + PowerMac3,4 + Power Macintosh G4 (Digital Audio) + PowerMac3,5 + Power Macintosh G4 (Quick Silver) + PowerMac3,6 + Power Macintosh G4 (Mirrored Drive Door) + PowerMac4,1 + iMac G3 (Early/Summer 2001) + PowerMac4,2 + iMac G4 (Flat Panel) + PowerMac4,4 + eMac + PowerMac4,5 + iMac G4 (17-inch Flat Panel) + PowerMac5,1 + Power Macintosh G4 Cube + PowerMac6,1 + iMac G4 (USB 2.0) + PowerMac6,3 + iMac G4 (20-inch Flat Panel) + PowerMac6,4 + eMac (USB 2.0, 2005) + PowerMac7,2 + Power Macintosh G5 + PowerMac7,3 + Power Macintosh G5 + PowerMac8,1 + iMac G5 + PowerMac8,2 + iMac G5 (Ambient Light Sensor) + PowerMac9,1 + Power Macintosh G5 (Late 2005) + RackMac1,1 + Xserve G4 + RackMac1,2 + Xserve G4 (slot-loading, cluster node) + RackMac3,1 + Xserve G5 + Xserve1,1 + Xserve (Intel Xeon) + Xserve2,1 + Xserve (January 2008 quad-core) + iMac1,1 + iMac G3 (Rev A-D) + iMac4,1 + iMac (Core Duo) + iMac4,2 + iMac for Education (17-inch, Core Duo) + iMac5,1 + iMac (Core 2 Duo, 17 or 20 inch, SuperDrive) + iMac5,2 + iMac (Core 2 Duo, 17 inch, Combo Drive) + iMac6,1 + iMac (Core 2 Duo, 24 inch, SuperDrive) + iMac8,1 + iMac (April 2008) + + diff --git a/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib index ff40c9dd..22f13f8b 100644 --- a/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib +++ b/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib @@ -1,12 +1,56 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - CLASS = SUStatusController; - LANGUAGE = ObjC; - OUTLETS = {actionButton = id; }; - SUPERCLASS = NSWindowController; - } - ); - IBVersion = 1; -} \ No newline at end of file + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + CLASS + SUStatusController + LANGUAGE + ObjC + OUTLETS + + actionButton + NSButton + progressBar + NSProgressIndicator + + SUPERCLASS + SUWindowController + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib b/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib index 99183444..a9ac8673 100644 --- a/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib +++ b/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib @@ -1,16 +1,20 @@ - + - IBDocumentLocation - 69 10 356 240 0 0 1280 832 IBFramework Version - 443.0 + 670 + IBLastKnownRelativeProjectPath + Sparkle.xcodeproj + IBOldestOS + 5 IBOpenObjects - 5 + 6 IBSystem Version - 8H14 + 10A96 + targetFramework + IBCocoaFramework diff --git a/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib index 378b22f2..4f1d5981 100644 Binary files a/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib and b/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..4b1ab30e --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 00000000..2e04cfa0 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..6b926302 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..994d4c36 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 00000000..2e04cfa0 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..b4353d2f Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 00000000..5220a221 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 00000000..2e04cfa0 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 00000000..b403a3e4 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings new file mode 100644 index 00000000..b31f928f Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings differ diff --git a/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib index 3e65b1ff..4b1ab30e 100644 --- a/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ b/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -1,12 +1,50 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {relaunchLater = id; relaunchNow = id; }; - CLASS = SUAutomaticUpdateAlert; - LANGUAGE = ObjC; - SUPERCLASS = NSWindowController; - } - ); - IBVersion = 1; -} \ No newline at end of file + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib index 2f65f2f4..ab36d310 100644 --- a/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ b/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -1,16 +1,20 @@ - + - IBDocumentLocation - 188 142 356 240 0 0 1280 1002 IBFramework Version - 443.0 + 658 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 IBOpenObjects - 5 + 6 IBSystem Version - 8H14 + 9C7010 + targetFramework + IBCocoaFramework diff --git a/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib index c4201cf2..7630390c 100644 Binary files a/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and b/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib index 0071ac07..994d4c36 100644 --- a/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib +++ b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib @@ -1,21 +1,67 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = NSObject; LANGUAGE = ObjC; }, - { - ACTIONS = {installUpdate = id; remindMeLater = id; skipThisVersion = id; }; - CLASS = SUUpdateAlert; - LANGUAGE = ObjC; - OUTLETS = {description = NSTextField; releaseNotesView = WebView; }; - SUPERCLASS = NSWindowController; - }, - { - ACTIONS = {installUpdate = id; remindMeLater = id; skipThisVersion = id; }; - CLASS = SUUpdateAlertController; - LANGUAGE = ObjC; - OUTLETS = {releaseNotesView = id; }; - SUPERCLASS = NSWindowController; - } - ); - IBVersion = 1; -} \ No newline at end of file + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib index 2b25ad03..2fb8a837 100644 --- a/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib +++ b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib @@ -1,16 +1,20 @@ - + - IBDocumentLocation - 425 40 356 240 0 0 1280 832 IBFramework Version - 446.1 + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 IBOpenObjects - 5 + 18 IBSystem Version - 8I127 + 10A96 + targetFramework + IBCocoaFramework diff --git a/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib index be3dbd90..e7e7497d 100644 Binary files a/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib and b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 00000000..5220a221 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 00000000..b1cd28ed --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,21 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + 41 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 00000000..e8dc5b88 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings b/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings index 6bf42f79..16e0787b 100644 Binary files a/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings and b/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings differ diff --git a/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..4b1ab30e --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 00000000..2e04cfa0 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..6b2f938f Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..994d4c36 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 00000000..2e04cfa0 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..c9b1e7d8 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 00000000..5220a221 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 00000000..3eb7f818 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 00000000..8c54c217 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings new file mode 100644 index 00000000..f83ea23c Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings differ diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..4b1ab30e --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 00000000..33a60200 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..4cd529a5 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..994d4c36 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 00000000..d2586ea2 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..65dfc95e Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 00000000..5220a221 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 00000000..d2586ea2 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 00000000..4b7cc905 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings new file mode 100644 index 00000000..ea175ae7 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings differ diff --git a/Sparkle.framework/Versions/A/Resources/fr.lproj/fr.lproj b/Sparkle.framework/Versions/A/Resources/fr.lproj/fr.lproj new file mode 120000 index 00000000..88614fe2 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/fr.lproj/fr.lproj @@ -0,0 +1 @@ +/Users/andym/Development/Build Products/Release/Sparkle.framework/Resources/fr.lproj \ No newline at end of file diff --git a/Sparkle.framework/Versions/A/Resources/fr_CA.lproj b/Sparkle.framework/Versions/A/Resources/fr_CA.lproj new file mode 120000 index 00000000..88614fe2 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/fr_CA.lproj @@ -0,0 +1 @@ +/Users/andym/Development/Build Products/Release/Sparkle.framework/Resources/fr.lproj \ No newline at end of file diff --git a/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..4b1ab30e --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 00000000..2e04cfa0 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..15ba8f4c Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..994d4c36 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 00000000..2e04cfa0 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..29840645 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 00000000..5220a221 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 00000000..c4934850 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 5 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 00000000..55cc2c27 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings new file mode 100644 index 00000000..5c410d07 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings differ diff --git a/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..4b1ab30e --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 00000000..3f097908 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,18 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..aa38f86b Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..994d4c36 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 00000000..d2586ea2 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..c82d3581 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 00000000..5220a221 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 00000000..d2586ea2 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 00000000..ac298ce7 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings new file mode 100644 index 00000000..67cf535e Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings differ diff --git a/Sparkle.framework/Versions/A/Resources/relaunch b/Sparkle.framework/Versions/A/Resources/relaunch new file mode 100755 index 00000000..e7b96d61 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/relaunch differ diff --git a/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..4b1ab30e --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 00000000..2b3d4257 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..1d4655c5 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..994d4c36 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 00000000..2b3d4257 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..103b1cf8 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 00000000..0f776c89 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + NSObject + LANGUAGE + ObjC + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 00000000..5132e29f --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,18 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 00000000..c09d9e70 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings new file mode 100644 index 00000000..f3ff9d86 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings differ diff --git a/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..4b1ab30e --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 00000000..c5a067e8 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..53cb91a9 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 00000000..018710af --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,39 @@ +{ + IBClasses = ( + { + CLASS = FirstResponder; + LANGUAGE = ObjC; + SUPERCLASS = NSObject; + }, + { + CLASS = NSApplication; + LANGUAGE = ObjC; + SUPERCLASS = NSResponder; + }, + { + CLASS = NSObject; + LANGUAGE = ObjC; + }, + { + ACTIONS = { + installUpdate = id; + remindMeLater = id; + skipThisVersion = id; + }; + CLASS = SUUpdateAlert; + LANGUAGE = ObjC; + OUTLETS = { + delegate = id; + description = NSTextField; + releaseNotesView = WebView; + }; + SUPERCLASS = SUWindowController; + }, + { + CLASS = SUWindowController; + LANGUAGE = ObjC; + SUPERCLASS = NSWindowController; + } + ); + IBVersion = 1; +} \ No newline at end of file diff --git a/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 00000000..6b787d4b --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,18 @@ + + + + + IBDocumentLocation + 69 14 356 240 0 0 1280 778 + IBFramework Version + 489.0 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 00000000..7e6d490e Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 00000000..5220a221 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 00000000..c5a067e8 --- /dev/null +++ b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 00000000..64babac1 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings new file mode 100644 index 00000000..b676a4f5 Binary files /dev/null and b/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings differ diff --git a/Sparkle.framework/Versions/A/Sparkle b/Sparkle.framework/Versions/A/Sparkle index 9dbf9e7f..0db0a8f0 100755 Binary files a/Sparkle.framework/Versions/A/Sparkle and b/Sparkle.framework/Versions/A/Sparkle differ diff --git a/StickiesDocument.h b/StickiesDocument.h old mode 100644 new mode 100755 diff --git a/StickiesDocument.m b/StickiesDocument.m old mode 100644 new mode 100755 diff --git a/SynchronizedNoteProtocol.h b/SynchronizedNoteProtocol.h old mode 100644 new mode 100755 diff --git a/TemporaryFileCache.h b/TemporaryFileCache.h old mode 100644 new mode 100755 diff --git a/TemporaryFileCache.m b/TemporaryFileCache.m old mode 100644 new mode 100755 diff --git a/URLGetter.h b/URLGetter.h old mode 100644 new mode 100755 diff --git a/URLGetter.m b/URLGetter.m old mode 100644 new mode 100755 index 7bbbfa9c..1ef64f10 --- a/URLGetter.m +++ b/URLGetter.m @@ -95,7 +95,7 @@ - (void)download:(NSURLDownload *)download didReceiveResponse:(NSURLResponse *)r [self updateProgress]; } -- (void)download:(NSURLDownload *)download didReceiveDataOfLength:(unsigned)length { +- (void)download:(NSURLDownload *)download didReceiveDataOfLength:(NSUInteger)length { totalReceivedByteCount += length; [self updateProgress]; diff --git a/WALController.h b/WALController.h old mode 100644 new mode 100755 index d5ad9e38..e095f215 --- a/WALController.h +++ b/WALController.h @@ -47,6 +47,8 @@ typedef union { - (id)initWithParentFSRep:(const char*)path encryptionKey:(NSData*)key; - (BOOL)writeEstablishedNote:(id)aNoteObject; - (BOOL)writeRemovalForNote:(id)aNoteObject; +- (BOOL)writeNoteObject:(id)aNoteObject; +- (void)writeNoteObjects:(NSArray*)notes; - (BOOL)_attemptToWriteUnwrittenData; - (BOOL)_encryptAndWriteData:(NSMutableData*)data; - (BOOL)synchronize; diff --git a/WALController.m b/WALController.m old mode 100644 new mode 100755 index e32d40fd..406f1eb2 --- a/WALController.m +++ b/WALController.m @@ -31,7 +31,7 @@ - (id)initWithParentFSRep:(const char*)path encryptionKey:(NSData*)key { if ([super init]) { logFD = -1; - char filename[] = ".Notational_Write_Ahead_Log"; + char filename[] = "Interim Note-Changes"; size_t newPathLength = sizeof(filename) + strlen(path) + 2; journalFile = (char*)malloc(newPathLength); @@ -73,7 +73,7 @@ - (BOOL)logFileStillExists { - (BOOL)destroyLogFile { journalFile = (char*)realloc(journalFile, 4096 * sizeof(char)); - int pathIntPtr = (int)journalFile; + intptr_t pathIntPtr = (intptr_t)journalFile; //get current path of file descriptor in case the directory was moved if (fcntl(logFD, F_GETPATH, pathIntPtr) < 0) { @@ -122,7 +122,7 @@ - (id)initWithParentFSRep:(const char*)path encryptionKey:(NSData*)key { //attempt to open/create the file exclusively with write-only and append access - if ((logFD = open(journalFile, O_CREAT | O_EXCL | O_WRONLY | O_APPEND, S_IRWXU)) < 0) { + if ((logFD = open(journalFile, O_CREAT | O_EXCL | O_WRONLY | O_APPEND, S_IRUSR | S_IWUSR)) < 0) { //if this fails, the file probably still exists, or we don't have write permission //either way, we shouldn't continue @@ -154,18 +154,12 @@ - (id)initWithParentFSRep:(const char*)path encryptionKey:(NSData*)key { return self; } -- (BOOL)writeEstablishedNote:(id)aNoteObject { - [aNoteObject incrementLSN]; - - NSMutableData *noteData = [NSMutableData data]; -#if USE_KEYED_ARCHIVING +- (BOOL)writeNoteObject:(id)aNoteObject { + //this method serializes a note object, encrypts it, and writes it to the log + NSMutableData *noteData = [NSMutableData data]; NSKeyedArchiver *archiver = [[[NSKeyedArchiver alloc] initForWritingWithMutableData:noteData] autorelease]; - [archiver encodeObject:aNoteObject forKey:VAR_STR(aNoteObject)]; + [archiver encodeObject:aNoteObject forKey:@"aNote"]; [archiver finishEncoding]; -#else - NSArchiver *archiver = [[[NSArchiver alloc] initForWritingWithMutableData:noteData] autorelease]; - [archiver encodeRootObject:aNoteObject]; -#endif if ([noteData length]) return [self _encryptAndWriteData:noteData]; @@ -173,27 +167,28 @@ - (BOOL)writeEstablishedNote:(id)aNoteObject { return NO; } +- (BOOL)writeEstablishedNote:(id)aNoteObject { + [aNoteObject incrementLSN]; + + return [self writeNoteObject:aNoteObject]; +} + - (BOOL)writeRemovalForNote:(id)aNoteObject { - + //increment the original note's LSN to ensure it's stored in the final DB [aNoteObject incrementLSN]; //construct a "removal object" for this note with some identifying information - DeletedNoteObject *removedNote = [[DeletedNoteObject alloc] initWithExistingObject:aNoteObject]; + DeletedNoteObject *removedNote = [[[DeletedNoteObject alloc] initWithExistingObject:aNoteObject] autorelease]; - NSMutableData *removedData = [NSMutableData data]; -#if USE_KEYED_ARCHIVING - NSKeyedArchiver *archiver = [[[NSKeyedArchiver alloc] initForWritingWithMutableData:removedData] autorelease]; - [archiver encodeObject:removedNote forKey:VAR_STR(removedNote)]; - [archiver finishEncoding]; -#else - NSArchiver *archiver = [[[NSArchiver alloc] initForWritingWithMutableData:removedData] autorelease]; - [archiver encodeRootObject:removedNote]; -#endif - - if ([removedData length]) - return [self _encryptAndWriteData:removedData]; - - return NO; + return [self writeNoteObject:removedNote]; +} + +- (void)writeNoteObjects:(NSArray*)notes { + //assume that the LSNs have been incremented already if they needed to be + NSUInteger i; + for (i=0; i<[notes count]; i++) { + [self writeNoteObject:[notes objectAtIndex:i]]; + } } - (BOOL)_attemptToWriteUnwrittenData { @@ -343,7 +338,7 @@ - (id)initWithParentFSRep:(const char*)path encryptionKey:(NSData*)key { chmod(journalFile, S_IRUSR); //attempt to open file read-only - if ((logFD = open(journalFile, O_EXCL | O_RDONLY, S_IRWXU)) < 0) { + if ((logFD = open(journalFile, O_EXCL | O_RDONLY)) < 0) { NSLog(@"WALRecoveryController: open error for file %s: %s", journalFile, strerror(errno)); return nil; } @@ -467,15 +462,14 @@ - (id)initWithParentFSRep:(const char*)path encryptionKey:(NSData*)key { id object = nil; - NS_DURING -#if USE_KEYED_ARCHIVING - object = [NSKeyedUnarchiver unarchiveObjectWithData:presumablySerializedData]; -#else - object = [NSUnarchiver unarchiveObjectWithData:presumablySerializedData]; -#endif - NS_HANDLER - NSLog(@"recoverNextObject got an exception while unarchiving object: %@", [localException reason]); - NS_ENDHANDLER + @try { + NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:presumablySerializedData]; + object = [unarchiver decodeObjectForKey:@"aNote"]; + [unarchiver release]; + } @catch (NSException *e) { + NSLog(@"recoverNextObject got an exception while unarchiving object: %@; returning NSNull to skip", [e reason]); + object = (id)[NSNull null]; + } [presumablySerializedData release]; @@ -531,7 +525,7 @@ - (NSDictionary*)recoveredNotes { NSLog(@"object of class %@ recovered that doesn't conform to SynchronizedNote protocol", [(NSObject*)obj className]); } } - } while (obj); + } while (obj); //|| this note failed because of a deserialization problem, but everything else was fine return [(NSDictionary*)recoveredNotes autorelease]; diff --git a/broken_md5.c b/broken_md5.c old mode 100644 new mode 100755 diff --git a/broken_md5.h b/broken_md5.h old mode 100644 new mode 100755 diff --git a/gen_sectorderfiles b/gen_sectorderfiles old mode 100644 new mode 100755 diff --git a/hashcash/libsha1.c b/hashcash/libsha1.c old mode 100644 new mode 100755 diff --git a/hashcash/sha1.h b/hashcash/sha1.h old mode 100644 new mode 100755 diff --git a/hmacsha1.c b/hmacsha1.c old mode 100644 new mode 100755 diff --git a/hmacsha1.h b/hmacsha1.h old mode 100644 new mode 100755 diff --git a/idea_ossl.c b/idea_ossl.c old mode 100644 new mode 100755 diff --git a/idea_ossl.h b/idea_ossl.h old mode 100644 new mode 100755 diff --git a/main.m b/main.m old mode 100644 new mode 100755 diff --git a/pbkdf2.c b/pbkdf2.c old mode 100644 new mode 100755 diff --git a/pbkdf2.h b/pbkdf2.h old mode 100644 new mode 100755