@@ -22,6 +22,7 @@ NSString *externalDisplayName; NSAppleEventDescriptor *externalSender; NSAppleEventDescriptor *externalToken; + NSString *lastKnownTextContentsOnDisk; } #pragma mark Document Defaults Repository @@ -51,8 +52,8 @@ - (IBAction)showUnsavedChanges:(id)sender; @property(readonly) BOOL fromCloud; @property(readonly) NSString *cloudID; -@property(readonly) NSString *documentDataAsText; -- (void)checkForModificationOfFileOnDisk; +- (NSString *)savedTextContents:(NSError **)error; +@property(retain) NSString *textContents; @end BDocument.h @@ -10,8 +10,8 @@ #import "BDocuments.h" #import "BDocumentWindowController.h" #import "BDocumentCloudDelegate.h" -//#import "BDocumentDifferencesWindowController.h" -//#import "BCloudDocumentsService.h" +#import "DiffMatchPatch.h" +#import "BDocumentDifferencesWindowController.h" @implementation BDocument @@ -25,6 +25,12 @@ static NSMutableArray *documentUserDefautlsArchive = nil; + +- (void)updateChangeCount:(NSDocumentChangeType)changeType { + [super updateChangeCount:changeType]; +} + + + (NSString *)documentUserDefaultsArchivePath { return [[[NSFileManager defaultManager] processesApplicationSupportFolder] stringByAppendingPathComponent:@"DocumentsUserDefaults.archive"]; } @@ -203,25 +209,27 @@ static NSMutableArray *documentUserDefautlsArchive = nil; NSWindow *window = [windowController window]; NSURL *fileURL = [self fileURL]; NSString *messageText = nil; - NSString *informativeTextText = @""; + NSString *informativeText = @""; if (fileURL) { - NSString *unsavedText = [self documentDataAsText]; - NSString *savedText = [NSString stringWithContentsOfFile:[fileURL path] encoding:NSUTF8StringEncoding error:nil]; + NSString *unsavedText = [self textContents]; + NSString *savedText = [self savedTextContents:nil]; if ([savedText isEqualToString:unsavedText]) { - messageText = BLocalizedString(@"There are no differences between your document and the version saved on disk", nil); + messageText = BLocalizedString(@"Your document has no unsaved changes.", nil); + informativeText = BLocalizedString(@"The content of your open document is exactly the same as the content that is saved on disk.", nil); } else { -// BDocumentDifferencesWindowController *differencesWindowController = [[BDocumentDifferencesWindowController alloc] initWithText1:savedText text2:unsavedText]; -// [NSApp beginSheet:[differencesWindowController window] modalForWindow:window modalDelegate:self didEndSelector:@selector(showUnsavedChangesSheetDidEnd:returnCode:contextInfo:) contextInfo:nil]; - NSBeep(); + BDocumentDifferencesWindowController *differencesWindowController = [[BDocumentDifferencesWindowController alloc] initWithText1:savedText text2:unsavedText]; + [differencesWindowController setMessageText:BLocalizedString(@"These are your unsaved changes.", nil)]; + [NSApp beginSheet:[differencesWindowController window] modalForWindow:window modalDelegate:self didEndSelector:@selector(showUnsavedChangesSheetDidEnd:returnCode:contextInfo:) contextInfo:nil]; return; } } else { - messageText = BLocalizedString(@"Your document has not been saved yet", nil); + messageText = BLocalizedString(@"Your document has not been saved.", nil); + informativeText = BLocalizedString(@"You must first save your document before you can compare it to the content that is saved on disk.", nil); } - NSAlert *alert = [NSAlert alertWithMessageText:messageText defaultButton:BLocalizedString(@"OK", nil) alternateButton:nil otherButton:nil informativeTextWithFormat:informativeTextText]; + NSAlert *alert = [NSAlert alertWithMessageText:messageText defaultButton:BLocalizedString(@"OK", nil) alternateButton:nil otherButton:nil informativeTextWithFormat:informativeText]; [alert beginSheetModalForWindow:window modalDelegate:nil didEndSelector:nil contextInfo:nil]; } @@ -229,10 +237,53 @@ static NSMutableArray *documentUserDefautlsArchive = nil; [sheet orderOut:self]; } -- (NSString *)documentDataAsText { +- (NSString *)textContentsFromData:(NSData *)data ofType:(NSString *)typeName error:(NSError **)outError { + NSMutableString *string = [[NSMutableString alloc] initWithData:data encoding:NSUTF8StringEncoding]; + if (string) { + NSString *windowsLineEnding = [[NSString alloc] initWithFormat:@"%C%C", 0x000D, 0x000A]; + NSString *macLineEnding = [[NSString alloc] initWithFormat:@"%C", 0x000D]; + [string replaceOccurrencesOfString:windowsLineEnding withString:@"\n" options:NSLiteralSearch range:NSMakeRange(0, [string length])]; + [string replaceOccurrencesOfString:macLineEnding withString:@"\n" options:NSLiteralSearch range:NSMakeRange(0, [string length])]; + return string; + } else { + NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys: + BLocalizedString(@"The file is not in the right format.", nil), NSLocalizedDescriptionKey, + BLocalizedString(@"The file might be corrupted, truncated, or in a different format than you expect.", nil), NSLocalizedRecoverySuggestionErrorKey, + BLocalizedString(@"The file is not in the right format.", nil), NSLocalizedFailureReasonErrorKey, + nil]; + + *outError = [[NSError alloc] initWithDomain:@"com.hogbaysoftware.taskpaper.TPDocument" code:1 userInfo:userInfo]; // Why does none of this error info get displayed? + + return nil; + } +} + +- (NSString *)savedTextContents:(NSError **)error { + return [self textContentsFromData:[NSData dataWithContentsOfURL:[self fileURL]] ofType:[self fileType] error:error]; +} + +- (NSString *)textContents { return nil; } +- (void)setTextContents:(NSString *)newString { +} + +- (BOOL)readFromData:(NSData *)data ofType:(NSString *)typeName error:(NSError **)outError { + NSString *string = [self textContentsFromData:data ofType:typeName error:outError]; + + if (string) { + [[self undoManager] disableUndoRegistration]; + [self setTextContents:string]; + [[self undoManager] enableUndoRegistration]; + [self addDocumentUserDefaultsFromDictionary:[BDocument loadDocumentUserDefaultsForDocumentURL:[self fileURL]]]; + lastKnownTextContentsOnDisk = string; + return YES; + } else { + return NO; + } +} + - (void)setFileURL:(NSURL *)absoluteURL { [super setFileURL:absoluteURL]; fromCloud = [BDocumentCloudDelegate isCloudDocumentURL:[self fileURL]]; @@ -261,72 +312,71 @@ static NSMutableArray *documentUserDefautlsArchive = nil; return [[[[self fileURL] path] stringByDeletingLastPathComponent] lastPathComponent]; } -- (BOOL)writeToURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSError **)outError { - [BDocument storeDocumentUserDefaults:[self documentUserDefaults] forDocumentURL:[self fileURL]]; - return [[self documentDataAsText] writeToURL:absoluteURL atomically:YES encoding:NSUTF8StringEncoding error:outError]; -} +- (BOOL)writeToURL:(NSURL *)absoluteURL ofType:(NSString *)typeName forSaveOperation:(NSSaveOperationType)saveOperation originalContentsURL:(NSURL *)absoluteOriginalContentsURL error:(NSError **)outError { + NSString *textContents = [self textContents]; -- (void)readModifiedFileFromDisk:(NSDate *)newModificationDate { - NSError *error = nil; - if (![self revertToContentsOfURL:[self fileURL] ofType:[self fileType] error:&error]) { - BLogError(@"failed revertToSavedFromURL:ofType:"); - [self presentError:error]; - } else { - [self setFileModificationDate:newModificationDate]; - } - [[self undoManager] removeAllActions]; - [self updateChangeCount:NSChangeCleared]; -} - -- (void)fileWasModifiedExternallyByAnotherApplication:(NSDate *)newModificationDate { - if ([self isDocumentEdited]) { - NSString *processName = [[NSProcessInfo processInfo] processName]; - NSString *message = BLocalizedString(@"Warning", nil); - NSString *informativeText = BLocalizedString(@"The file for this document has been modified by another application. There are also unsaved changes in %@. Do you want to keep the %@ version or revert to the version on disk?", nil); - NSString *defaultButton = BLocalizedString(@"Keep %@ Version", nil); - NSString *alternateButton = BLocalizedString(@"Revert", nil); - NSAlert *alert = [NSAlert alertWithMessageText:message defaultButton:[NSString stringWithFormat:defaultButton, processName] alternateButton:alternateButton otherButton:nil informativeTextWithFormat:informativeText, processName, processName]; - [alert beginSheetModalForWindow:[[NSApp currentDocumentWindowController] window] modalDelegate:self didEndSelector:@selector(fileWasModifiedExternallyAlertDidEnd:returnCode:contextInfo:) contextInfo:newModificationDate]; - } else { - [self readModifiedFileFromDisk:newModificationDate]; + if ([textContents writeToURL:absoluteURL atomically:YES encoding:NSUTF8StringEncoding error:outError]) { + if (saveOperation == NSSaveOperation || saveOperation == NSSaveAsOperation) { + [BDocument storeDocumentUserDefaults:[self documentUserDefaults] forDocumentURL:[self fileURL]]; + lastKnownTextContentsOnDisk = textContents; + } + return YES; } - for (NSWindowController *each in [self windowControllers]) { - [each synchronizeWindowTitleWithDocumentName]; - } + return NO; } -- (void)checkForModificationOfFileOnDisk { +- (void)BDocument_checkForModificationOfFileOnDisk { NSDate *knownFileModificationDate = [self fileModificationDate]; if (knownFileModificationDate) { NSDate *actualFileModificationDate = [[[NSFileManager defaultManager] fileAttributesAtPath:[[self fileURL] path] traverseLink:YES] fileModificationDate]; + if ([knownFileModificationDate isLessThan:actualFileModificationDate]) { - [self performSelector:@selector(fileWasModifiedExternallyByAnotherApplication:) withObject:actualFileModificationDate]; + NSError *error = nil; + NSString *savedTextContents = [self savedTextContents:&error]; + if (savedTextContents) { + DiffMatchPatch *dmp = [[DiffMatchPatch alloc] init]; + NSMutableArray *patches = [dmp patchMakeText1:lastKnownTextContentsOnDisk text2:savedTextContents]; + if ([patches count] > 0) { + NSArray *patchResults = [dmp patchApply:patches text:[self textContents]]; + NSString *patchedDocumentText = [patchResults objectAtIndex:0]; + [self setTextContents:patchedDocumentText]; + + NSUInteger index = 0; + NSMutableArray *failedDiffs = [NSMutableArray array]; + for (NSNumber *each in [patchResults objectAtIndex:1]) { + if ([each boolValue] == NO) { + [failedDiffs addObjectsFromArray:[[patches objectAtIndex:index] diffs]]; + } + index++; + } + + if ([failedDiffs count] > 0) { + NSWindow *window = [[[self windowControllers] lastObject] window]; + BDocumentDifferencesWindowController *differencesWindowController = [[BDocumentDifferencesWindowController alloc] initWithDiffs:failedDiffs]; + [differencesWindowController setMessageText:BLocalizedString(@"This document's file has been changed by another application. These changes could not be merged back into your open document.", nil)]; + [NSApp beginSheet:[differencesWindowController window] modalForWindow:window modalDelegate:self didEndSelector:@selector(showMergeFailuresSheetDidEnd:returnCode:contextInfo:) contextInfo:nil]; + } + } + + [self setFileModificationDate:actualFileModificationDate]; + } } } } -- (void)fileWasModifiedExternallyAlertDidEnd:(NSAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo { - if (returnCode == NSAlertDefaultReturn) { // keep current version - [self setFileModificationDate:contextInfo]; - } else { // revert - [self readModifiedFileFromDisk:contextInfo]; - } -} +- (void)showMergeFailuresSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { + [sheet orderOut:self]; +} + @end @implementation NSDocument (BDocumentAdditions) - (void)checkForModificationOfFileOnDisk { - if ([self respondsToSelector:@selector(fileWasModifiedExternallyByAnotherApplication:)]) { - NSDate *knownFileModificationDate = [self fileModificationDate]; - if (knownFileModificationDate) { - NSDate *actualFileModificationDate = [[[NSFileManager defaultManager] fileAttributesAtPath:[[self fileURL] path] traverseLink:YES] fileModificationDate]; - if ([knownFileModificationDate isLessThan:actualFileModificationDate]) { - [self performSelector:@selector(fileWasModifiedExternallyByAnotherApplication:) withObject:actualFileModificationDate]; - } - } + if ([self respondsToSelector:@selector(BDocument_checkForModificationOfFileOnDisk)]) { + [self performSelector:@selector(BDocument_checkForModificationOfFileOnDisk)]; } } BDocument.m @@ -30,7 +30,8 @@ } + (NSString *)displayNameForCloudDocument:(NSURL *)url { - return [[[[url path] lastPathComponent] stringByDeletingPathExtension] stringByAppendingFormat:@" (Sync)"]; + return [[[url path] lastPathComponent] stringByDeletingPathExtension]; +// return [[[[url path] lastPathComponent] stringByDeletingPathExtension] stringByAppendingString:BLocalizedString(@" (Synced)", nil)]; } #pragma mark Init @@ -45,8 +46,9 @@ #pragma mark Lifecycle Callback - (void)applicationDidFinishLaunching { - [[NSMenu menuItemForMenuItemExtensionPoint:@"com.blocks.BUserInterface.menus.main.cloudDocumentsService.browseCloudDocumentsOnline"] setTitle:[[Cloud sharedInstance] serviceLabel]]; [[NSMenu menuForMenuExtensionPoint:@"com.blocks.BUserInterface.menus.main.cloudDocumentsService"] setDelegate:self]; + NSMenuItem *menuItem = [NSMenu menuItemForMenuItemExtensionPoint:@"com.blocks.BUserInterface.menus.main.cloudDocumentsService.openCloudDocumentsWebsite"]; + [menuItem setTitle:[[menuItem title] stringByAppendingFormat:@" (%@)", [[Cloud sharedInstance] serviceLabel]]]; [[Cloud sharedInstance] setDelegate:self]; } @@ -78,7 +80,12 @@ } NSError *error = nil; - NSString *name = nameWindowController.name; + NSString *name = [nameWindowController.name stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; + + if ([name length] == 0) { + name = BLocalizedString(@"Untitled", nil); + } + NSString *newDocumentPath = [newDocumentIDPath stringByAppendingPathComponent:name]; if (![fileManager copyItemAtPath:[[NSBundle mainBundle] pathForResource:@"CloudWelcomeText" ofType:@"txt"] toPath:newDocumentPath error:&error]) { @@ -141,14 +148,11 @@ } } -- (IBAction)browseCloudDocumentsOnline:(NSMenuItem *)sender { +- (IBAction)openCloudDocumentsWebsite:(NSMenuItem *)sender { [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[[[Cloud sharedInstance] serviceRootURLString] stringByAppendingString:@"/documents/"]]]; } -- (IBAction)browseCloudDocumentsOnlineAboutPage:(NSMenuItem *)sender { -} - -- (IBAction)toggleDocumentsServiceAuthentication:(id)sender { +- (IBAction)toggleCloudDocumentsAuthentication:(id)sender { [[Cloud sharedInstance] toggleAuthentication:sender]; } @@ -156,7 +160,7 @@ SEL action = [menuItem action]; Cloud *cloud = [Cloud sharedInstance]; - if (action == @selector(toggleDocumentsServiceAuthentication:)) { + if (action == @selector(toggleCloudDocumentsAuthentication:)) { if (cloud.serviceUsername != nil) { [menuItem setTitle:[NSString stringWithFormat:BLocalizedString(@"Sign Out (%@)", nil), cloud.serviceUsername]]; } else { @@ -168,9 +172,10 @@ return cloud.serviceUsername != nil; } else if (action == @selector(deleteCloudDocument:)) { return cloud.serviceUsername != nil && [[NSApp currentDocument] fromCloud]; - } else if (action == @selector(browseCloudDocumentsOnline:)) { + } else if (action == @selector(openCloudDocumentsWebsite:)) { return cloud.serviceUsername != nil; } + return YES; } @@ -200,7 +205,6 @@ NSURL *eachURL = [NSURL fileURLWithPath:eachFileSystemPath]; NSMenuItem *eachMenuItem = [[NSMenuItem alloc] initWithTitle:[BDocumentCloudDelegate displayNameForCloudDocument:eachURL] action:@selector(openCloudDocument:) keyEquivalent:@""]; [eachMenuItem setRepresentedObject:eachURL]; - [eachMenuItem setIndentationLevel:1]; NSImage *icon = [workspace iconForFile:eachFileSystemPath]; [icon setSize:NSMakeSize(16, 16)]; [eachMenuItem setImage:icon]; @@ -305,6 +309,14 @@ [[BCloudSyncWindowController sharedInstance] showWindow:nil]; [BCloudSyncWindowController sharedInstance].progress = 0.5; + for (NSDocument *eachDocument in [[NSDocumentController sharedDocumentController] documents]) { + if ([eachDocument isKindOfClass:[BDocument class]]) { + if ([(BDocument *)eachDocument fromCloud]) { + [eachDocument saveDocument:nil]; + } + } + } + NSError *error = nil; NSFileManager *fileManager = [NSFileManager defaultManager]; NSArray *cloudCacheDocuments = [self cloudCacheDocuments:&error]; @@ -364,6 +376,7 @@ NSError *error = nil; BCloudCacheDocument *cloudCacheDocument = [self cloudCacheDocumentForID:originalDocumentID error:&error]; NSString *originalName = nil; + NSDocument *document = nil; if (!cloudCacheDocument) { if (error) { @@ -375,6 +388,7 @@ originalName = aCloudDocument.localName; } else { originalName = cloudCacheDocument.localName; + document = [[NSDocumentController sharedDocumentController] documentForURL:[NSURL fileURLWithPath:[cloudCacheDocument fileSystemPath]]]; } cloudCacheDocument.documentID = aCloudDocument.documentID; @@ -413,6 +427,13 @@ if (![fileManager setAttributes:[self localFileAttributes] ofItemAtPath:newFilePath error:&error]) { BLogError([error description]); } + + [document setFileURL:[NSURL fileURLWithPath:newFilePath]]; + if ([document respondsToSelector:@selector(_resetMoveAndRenameSensing)]) { + [document performSelector:@selector(_resetMoveAndRenameSensing)]; + } + [document checkForModificationOfFileOnDisk]; // bring in changes from disk. + [document saveDocument:nil]; // do final sync save. return YES; } @@ -423,9 +444,17 @@ NSFileManager *fileManager = [NSFileManager defaultManager]; NSString *deletedFilePath = [cloudCacheDocument fileSystemPath]; + + NSDocument *document = [[NSDocumentController sharedDocumentController] documentForURL:[NSURL fileURLWithPath:deletedFilePath]]; + if (document) { + [document saveDocument:nil]; + [document close]; + } - if (![fileManager removeItemAtPath:[deletedFilePath stringByDeletingLastPathComponent] error:&error]) { - BLogError([error description]); + if ([fileManager fileExistsAtPath:[deletedFilePath stringByDeletingLastPathComponent]]) { + if (![fileManager removeItemAtPath:[deletedFilePath stringByDeletingLastPathComponent] error:&error]) { + BLogError([error description]); + } } [managedObjectContext deleteObject:cloudCacheDocument]; @@ -470,9 +499,9 @@ if ([conflicts length] > 0) { NSString *serviceLabel = [[Cloud sharedInstance] serviceLabel]; - NSString *messageText = [NSString stringWithFormat:BLocalizedString(@"%@ Syncing Conflicts", nil), serviceLabel]; - NSString *informativeTextText = [NSString stringWithFormat:BLocalizedString(@"Some of your edits could not be synced with %@ because they conflict with other recent edits on %@. Please go to the %@ website to resolve these conflicts.", nil), serviceLabel, serviceLabel, serviceLabel]; - NSAlert *alert = [NSAlert alertWithMessageText:messageText defaultButton:BLocalizedString(@"Resolve Conflicts", nil) alternateButton:BLocalizedString(@"Close", nil) otherButton:nil informativeTextWithFormat:informativeTextText]; + NSString *messageText = [NSString stringWithFormat:BLocalizedString(@"%@ Conflicts", nil), serviceLabel]; + NSString *informativeTextText = [NSString stringWithFormat:BLocalizedString(@"Some of your edits conflict with recent changes made on %@. Please go to the website to resolve these conflicts.", nil), serviceLabel]; + NSAlert *alert = [NSAlert alertWithMessageText:messageText defaultButton:BLocalizedString(@"Resolve", nil) alternateButton:BLocalizedString(@"Close", nil) otherButton:nil informativeTextWithFormat:informativeTextText]; if ([alert runModal] == NSOKButton) { [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[[[Cloud sharedInstance] serviceRootURLString] stringByAppendingString:@"/documents/#conflicts"]]]; } @@ -615,7 +644,7 @@ } - (IBAction)learnMore:(id)sender { - // [[BCloudDocumentsService sharedInstance] browseCloudDocumentsOnlineAboutPage:sender]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[[Cloud sharedInstance] serviceRootURLString]]]; } - (IBAction)ok:(id)sender { BDocumentCloudDelegate.m @@ -7,20 +7,20 @@ // #import <Cocoa/Cocoa.h> +#import <WebKit/WebKit.h> @interface BDocumentDifferencesWindowController : NSWindowController { - IBOutlet NSTextView *textView; - NSString *text1; - NSString *text2; + IBOutlet NSTextField *messageTextField; + IBOutlet WebView *webView; + NSMutableArray *diffs; } +- (id)initWithDiffs:(NSMutableArray *)diffs; - (id)initWithText1:(NSString *)text1 text2:(NSString *)text2; -- (IBAction)nextChange:(id)sender; -- (IBAction)previousChange:(id)sender; -- (IBAction)acceptChange:(id)sender; -- (IBAction)rejectChange:(id)sender; +- (void)setMessageText:(NSString *)messageText; + - (IBAction)close:(id)sender; @end BDocumentDifferencesWindowController.h @@ -7,7 +7,7 @@ // #import "BDocumentDifferencesWindowController.h" -#import "BDiffMatchPatch.h" +#import "DiffMatchPatch.h" @implementation BDocumentDifferencesWindowController @@ -17,85 +17,28 @@ return self; } -- (id)initWithText1:(NSString *)aText1 text2:(NSString *)aText2 { +- (id)initWithDiffs:(NSMutableArray *)aDiffs { if (self = [self init]) { - text1 = aText1; - text2 = aText2; + diffs = aDiffs; } return self; } -- (void)awakeFromNib { - BDiffMatchPatch *dmp = [[BDiffMatchPatch alloc] init]; - NSMutableArray *diffs = [dmp diffMainText1:text1 text2:text2]; - [dmp diffCleanupSemantic:diffs]; - NSAttributedString *prettyAttributedString = [dmp diffPrettyAttributedString:diffs]; - [[textView textStorage] replaceCharactersInRange:NSMakeRange(0, 0) withAttributedString:prettyAttributedString]; -} - -- (IBAction)nextChange:(id)sender { - NSTextStorage *textStorage = [textView textStorage]; - NSRange selectedRange = [textView selectedRange]; - NSRange limitRange = NSMakeRange(NSMaxRange(selectedRange), [textStorage length] - NSMaxRange(selectedRange)); - NSRange effectiveRange; - NSNumber *changetype; - BOOL firstPass = NO; - - while (limitRange.length > 0) { - changetype = [textStorage attribute:BDocumentDiffTypeAttributeName atIndex:limitRange.location longestEffectiveRange:&effectiveRange inRange:limitRange]; - if (firstPass) { - firstPass = NO; - } else if ([changetype integerValue] != BDiffEqual) { - [textView scrollRangeToVisible:effectiveRange]; - [textView setSelectedRange:effectiveRange]; - [textView showFindIndicatorForRange:effectiveRange]; - break; - } - limitRange = NSMakeRange(NSMaxRange(effectiveRange), NSMaxRange(limitRange) - NSMaxRange(effectiveRange)); - if (limitRange.length == 0) { - limitRange = NSMakeRange(0, [textStorage length]); - } - } -} - -- (void)processChanges:(BOOL)acceptingChanges { - NSTextStorage *textStorage = [textView textStorage]; - NSRange selectedRange = [textView selectedRange]; - NSRange limitRange = NSMakeRange(NSMaxRange(selectedRange), [textStorage length] - NSMaxRange(selectedRange)); - NSRange effectiveRange; - NSNumber *changetype; - - while (limitRange.length > 0) { - changetype = [textStorage attribute:BDocumentDiffTypeAttributeName atIndex:limitRange.location longestEffectiveRange:&effectiveRange inRange:limitRange]; - if ([changetype integerValue] == BDiffDelete) { - if (acceptingChanges) { - [textStorage replaceCharactersInRange:effectiveRange withString:@""]; - } else { - [textStorage removeAttribute:BDocumentDiffTypeAttributeName range:effectiveRange]; - [textStorage removeAttribute:NSBackgroundColorAttributeName range:effectiveRange]; - } - } else if ([changetype integerValue] == BDiffInsert) { - if (acceptingChanges) { - [textStorage removeAttribute:BDocumentDiffTypeAttributeName range:effectiveRange]; - [textStorage removeAttribute:NSBackgroundColorAttributeName range:effectiveRange]; - } else { - [textStorage replaceCharactersInRange:effectiveRange withString:@""]; - } - } - limitRange = NSMakeRange(NSMaxRange(effectiveRange), NSMaxRange(limitRange) - NSMaxRange(effectiveRange)); - } -} - -- (IBAction)previousChange:(id)sender { - +- (id)initWithText1:(NSString *)aText1 text2:(NSString *)aText2 { + return [self initWithDiffs:[[[DiffMatchPatch alloc] init] diffMainText1:aText1 text2:aText2]]; } -- (IBAction)acceptChange:(id)sender { - +- (void)awakeFromNib { + WebFrame *frame = [webView mainFrame]; + DiffMatchPatch *dmp = [[DiffMatchPatch alloc] init]; + [dmp diffCleanupSemantic:diffs]; + NSString *prettyHTML = [dmp diffPrettyHTML:diffs]; + [frame loadHTMLString:prettyHTML baseURL:nil]; } -- (IBAction)rejectChange:(id)sender { - +- (void)setMessageText:(NSString *)messageText { + [self window]; + [messageTextField setStringValue:messageText]; } - (IBAction)close:(id)sender { BDocumentDifferencesWindowController.m @@ -48,11 +48,11 @@ } - (NSString *)windowTitleForDocumentDisplayName:(NSString *)displayName { - if ([[self window] isDocumentEdited]) { - return [[NSString stringWithFormat:@"%C ", 0x25C6, nil] stringByAppendingString:[super windowTitleForDocumentDisplayName:displayName]]; - } else { +// if ([[self window] isDocumentEdited]) { +// return [[NSString stringWithFormat:@"%C ", 0x25C6, nil] stringByAppendingString:[super windowTitleForDocumentDisplayName:displayName]]; +// } else { return [super windowTitleForDocumentDisplayName:displayName]; - } +// } } - (void)setDocumentEdited:(BOOL)newDocumentEditied { BDocumentWindowController.m @@ -49,6 +49,8 @@ 88F596260F8FB51E00DFBB69 /* HTTPFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F596240F8FB51E00DFBB69 /* HTTPFetcher.m */; }; 88F596300F8FB52600DFBB69 /* DiffMatchPatch.h in Headers */ = {isa = PBXBuildFile; fileRef = 88F5962E0F8FB52600DFBB69 /* DiffMatchPatch.h */; }; 88F596310F8FB52600DFBB69 /* DiffMatchPatch.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F5962F0F8FB52600DFBB69 /* DiffMatchPatch.m */; }; + 88FFAE0F0F9778D700D7A3B5 /* BDocumentDifferencesWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 88A36C840F14FBCE00EAA3FD /* BDocumentDifferencesWindowController.h */; }; + 88FFAE100F9778D700D7A3B5 /* BDocumentDifferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A36C850F14FBCE00EAA3FD /* BDocumentDifferencesWindowController.m */; }; 8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ @@ -199,6 +201,8 @@ 431A0C3D0CC5149E00DE7BAE /* BDocument.m */, 431A0C420CC514B900DE7BAE /* BDocumentWindowController.h */, 431A0C430CC514B900DE7BAE /* BDocumentWindowController.m */, + 88A36C840F14FBCE00EAA3FD /* BDocumentDifferencesWindowController.h */, + 88A36C850F14FBCE00EAA3FD /* BDocumentDifferencesWindowController.m */, 88243E8A0F9400290057A08D /* BDocumentCloudDelegate.h */, 88243E8B0F9400290057A08D /* BDocumentCloudDelegate.m */, 883B60A70F324DC9005D5B3A /* DiffMatchPatch OLD */, @@ -258,8 +262,6 @@ 889EAE220F007874003D8453 /* BDiffMatchPatch.m */, 889EAE230F007874003D8453 /* BDiffMatchPatchTest.h */, 889EAE200F007874003D8453 /* BDiffMatchPatchTest.m */, - 88A36C840F14FBCE00EAA3FD /* BDocumentDifferencesWindowController.h */, - 88A36C850F14FBCE00EAA3FD /* BDocumentDifferencesWindowController.m */, ); name = "DiffMatchPatch OLD"; sourceTree = "<group>"; @@ -341,6 +343,7 @@ 88F596250F8FB51E00DFBB69 /* HTTPFetcher.h in Headers */, 88F596300F8FB52600DFBB69 /* DiffMatchPatch.h in Headers */, 88243E8C0F9400290057A08D /* BDocumentCloudDelegate.h in Headers */, + 88FFAE0F0F9778D700D7A3B5 /* BDocumentDifferencesWindowController.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -458,6 +461,7 @@ 88F596310F8FB52600DFBB69 /* DiffMatchPatch.m in Sources */, 88243E8D0F9400290057A08D /* BDocumentCloudDelegate.m in Sources */, 88243F4D0F9494310057A08D /* BDocumentCloudCache.xcdatamodel in Sources */, + 88FFAE100F9778D700D7A3B5 /* BDocumentDifferencesWindowController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; BDocuments.xcodeproj/project.pbxproj @@ -99,10 +99,15 @@ return nil; } } else if (self.isScheduledForDeleteOnClient) { - if ([self hasServerEdits]) { - return [cloud GETServerDocument:self]; + if (self.isScheduledForInsertOnClient) { + [cloud.delegate cloudSyncDeleteLocalDocument:self.documentID]; + return nil; } else { - return [cloud DELETEServerDocument:self]; + if ([self hasServerEdits]) { + return [cloud GETServerDocument:self]; + } else { + return [cloud DELETEServerDocument:self]; + } } } CloudDocument.m @@ -54,7 +54,6 @@ typedef NSUInteger BDiffOperation; - (void)diffCleanupMerge:(NSMutableArray *)diffs; - (NSInteger)diffXIndex:(NSArray *)diffs location:(NSInteger)location; - (NSString *)diffPrettyHTML:(NSArray *)diffs; -//- (NSAttributedString *)diffPrettyAttributedString:(NSArray *)diffs; - (NSString *)diffText1:(NSArray *)diffs; - (NSString *)diffText2:(NSArray *)diffs; - (NSString *)diffToDelta:(NSArray *)diffs; DiffMatchPatch.h @@ -823,37 +823,6 @@ return html; } -/* -- (NSAttributedString *)diffPrettyAttributedString:(NSArray *)diffs { - NSColor *insertBackgroundColor = [NSColor colorWithDeviceRed:0.9 green:1.0 blue:0.9 alpha:1.0]; - NSColor *deleteBackgroundColor = [NSColor colorWithDeviceRed:1.0 green:0.9 blue:0.9 alpha:1.0]; - NSMutableAttributedString *attributedString = [[[NSMutableAttributedString alloc] init] autorelease]; - NSInteger i = 0; - for (BDiff *aDiff in diffs) { - NSDictionary *attributes = nil; - switch (aDiff.operation) { - case BDiffInsert: - attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSColor greenColor], NSForegroundColorAttributeName, [NSNumber numberWithInteger:BDiffInsert], DiffTypeAttributeName, insertBackgroundColor, NSBackgroundColorAttributeName, [NSNumber numberWithInteger:NSUnderlineStyleSingle], NSUnderlineStyleAttributeName, nil]; - break; - case BDiffDelete: - attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSColor redColor], NSForegroundColorAttributeName, [NSNumber numberWithInteger:BDiffDelete], DiffTypeAttributeName, deleteBackgroundColor, NSBackgroundColorAttributeName, [NSNumber numberWithInteger:NSUnderlineStyleSingle], NSStrikethroughStyleAttributeName, nil]; - break; - case BDiffEqual: - attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInteger:BDiffEqual], DiffTypeAttributeName, nil]; - break; - } - if (aDiff.operation != BDiffDelete) { - i += [aDiff.text length]; - } - [attributedString appendAttributedString:[[[NSAttributedString alloc] initWithString:aDiff.text attributes:attributes] autorelease]]; - } - - [attributedString addAttribute:NSFontAttributeName value:[NSFont userFixedPitchFontOfSize:10] range:NSMakeRange(0, [attributedString length])]; - - return attributedString; -} -*/ - - (NSString *)diffText1:(NSArray *)diffs { NSMutableString *text = [NSMutableString string]; for (BDiff *aDiff in diffs) { DiffMatchPatch.m @@ -37,7 +37,7 @@ <object class="NSWindowTemplate" id="1005"> <int key="NSWindowStyleMask">1</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 102}, {570, 408}}</string> + <string key="NSWindowRect">{{196, 122}, {570, 388}}</string> <int key="NSWTFlags">536872960</int> <string key="NSWindowTitle"/> <string key="NSWindowClass">NSWindow</string> @@ -95,7 +95,7 @@ <object class="NSButton" id="933215211"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{115, 262}, {168, 32}}</string> + <string key="NSFrame">{{115, 242}, {168, 32}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="118615869"> @@ -147,7 +147,7 @@ <string>NeXT TIFF v4.0 pasteboard type</string> </object> </object> - <string key="NSFrame">{{20, 324}, {64, 64}}</string> + <string key="NSFrame">{{20, 304}, {64, 64}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="643518106"> @@ -167,7 +167,7 @@ <object class="NSTextField" id="193733619"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{101, 370}, {436, 18}}</string> + <string key="NSFrame">{{101, 350}, {436, 18}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="744379958"> @@ -203,13 +203,13 @@ <object class="NSTextField" id="643820309"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{101, 202}, {452, 34}}</string> + <string key="NSFrame">{{101, 202}, {452, 14}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1054029013"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">272760832</int> - <string key="NSContents">If you have a Google Account (from Gmail.com, for example), enter your Google ID and password.</string> + <string key="NSContents">Enter your Google ID (from Gmail.com, for example) and password.</string> <object class="NSFont" key="NSSupport" id="26"> <string key="NSName">LucidaGrande</string> <double key="NSSize">1.100000e+01</double> @@ -236,7 +236,7 @@ <object class="NSTextField" id="352736134"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{101, 306}, {452, 56}}</string> + <string key="NSFrame">{{101, 286}, {452, 56}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="411442516"> @@ -402,7 +402,7 @@ YSBHb29nbGUgQWNjb3VudCwgY2xpY2sgQ3JlYXRlIE5ldyBBY2NvdW50Lg</string> <object class="NSBox" id="402977194"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">12</int> - <string key="NSFrame">{{104, 247}, {446, 5}}</string> + <string key="NSFrame">{{104, 227}, {446, 5}}</string> <reference key="NSSuperview" ref="1006"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -422,7 +422,7 @@ YSBHb29nbGUgQWNjb3VudCwgY2xpY2sgQ3JlYXRlIE5ldyBBY2NvdW50Lg</string> <bool key="NSTransparent">NO</bool> </object> </object> - <string key="NSFrameSize">{570, 408}</string> + <string key="NSFrameSize">{570, 388}</string> <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> @@ -613,13 +613,13 @@ YSBHb29nbGUgQWNjb3VudCwgY2xpY2sgQ3JlYXRlIE5ldyBBY2NvdW50Lg</string> <reference ref="352736134"/> <reference ref="193733619"/> <reference ref="495406592"/> + <reference ref="933215211"/> + <reference ref="643820309"/> + <reference ref="402977194"/> <reference ref="381814035"/> <reference ref="515949864"/> - <reference ref="933215211"/> <reference ref="884675655"/> - <reference ref="643820309"/> <reference ref="83923639"/> - <reference ref="402977194"/> </object> <reference key="parent" ref="1005"/> </object> @@ -898,9 +898,9 @@ YSBHb29nbGUgQWNjb3VudCwgY2xpY2sgQ3JlYXRlIE5ldyBBY2NvdW50Lg</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{289, 657}, {570, 408}}</string> + <string>{{237, 677}, {570, 388}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{289, 657}, {570, 408}}</string> + <string>{{237, 677}, {570, 388}}</string> <boolean value="NO"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> @@ -1001,7 +1001,7 @@ YSBHb29nbGUgQWNjb3VudCwgY2xpY2sgQ3JlYXRlIE5ldyBBY2NvdW50Lg</string> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BCloudAuthenticationWindowController.h</string> + <string key="minorKey">BDocumentCloudDelegate.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1023,7 +1023,14 @@ YSBHb29nbGUgQWNjb3VudCwgY2xpY2sgQ3JlYXRlIE5ldyBBY2NvdW50Lg</string> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BCloudHTTPFetcher.h</string> + <string key="minorKey">Cloud.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">HTTPFetcher.h</string> </object> </object> <object class="IBPartialClassDescription"> English.lproj/BCloudAuthenticationWindow.xib @@ -12,6 +12,7 @@ </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.WebKitIBPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> @@ -37,170 +38,29 @@ <object class="NSWindowTemplate" id="1005"> <int key="NSWindowStyleMask">15</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 200}, {450, 300}}</string> + <string key="NSWindowRect">{{196, 167}, {600, 333}}</string> <int key="NSWTFlags">536872960</int> <string key="NSWindowTitle">Window</string> <string key="NSWindowClass">NSWindow</string> <nil key="NSViewClass"/> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> - <string key="NSWindowContentMinSize">{450, 300}</string> + <string key="NSWindowContentMinSize">{600, 333}</string> <object class="NSView" key="NSWindowView" id="1006"> <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSScrollView" id="1069072197"> - <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="879279249"> - <reference key="NSNextResponder" ref="1069072197"/> - <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="945938713"> - <reference key="NSNextResponder" ref="879279249"/> - <int key="NSvFlags">2322</int> - <string key="NSFrameSize">{450, 14}</string> - <reference key="NSSuperview" ref="879279249"/> - <object class="NSTextContainer" key="NSTextContainer" id="578611119"> - <object class="NSLayoutManager" key="NSLayoutManager"> - <object class="NSTextStorage" key="NSTextStorage"> - <object class="NSMutableString" key="NSString"> - <characters key="NS.bytes"/> - </object> - <nil key="NSDelegate"/> - </object> - <object class="NSMutableArray" key="NSTextContainers"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="578611119"/> - </object> - <int key="NSLMFlags">6</int> - <nil key="NSDelegate"/> - </object> - <reference key="NSTextView" ref="945938713"/> - <double key="NSWidth">4.500000e+02</double> - <int key="NSTCFlags">1</int> - </object> - <object class="NSTextViewSharedData" key="NSSharedData"> - <int key="NSFlags">10977</int> - <object class="NSColor" key="NSBackgroundColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - </object> - <object class="NSColor" key="NSInsertionColor" id="863363789"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MAA</bytes> - </object> - <object class="NSDictionary" key="NSSelectedAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSBackgroundColor</string> - <string>NSColor</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">selectedTextBackgroundColor</string> - <object class="NSColor" key="NSColor" id="788635061"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> - </object> - </object> - <object class="NSColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">selectedTextColor</string> - <reference key="NSColor" ref="863363789"/> - </object> - </object> - </object> - <nil key="NSMarkedAttributes"/> - <object class="NSDictionary" key="NSLinkAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor</string> - <string>NSUnderline</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MCAwIDEAA</bytes> - </object> - <integer value="1"/> - </object> - </object> - <nil key="NSDefaultParagraphStyle"/> - </object> - <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{1102, 1e+07}</string> - <string key="NSMinize">{223, 0}</string> - <nil key="NSDelegate"/> - </object> - </object> - <string key="NSFrame">{{1, 1}, {450, 148}}</string> - <reference key="NSSuperview" ref="1069072197"/> - <reference key="NSNextKeyView" ref="945938713"/> - <reference key="NSDocView" ref="945938713"/> - <object class="NSColor" key="NSBGColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - <object class="NSColorSpace" key="NSCustomColorSpace"> - <int key="NSID">2</int> - </object> - </object> - <object class="NSCursor" key="NSCursor"> - <string key="NSHotSpot">{4, -5}</string> - <int key="NSCursorType">1</int> - </object> - <int key="NScvFlags">6</int> - </object> - <object class="NSScroller" id="428839600"> - <reference key="NSNextResponder" ref="1069072197"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{472, 1}, {15, 228}}</string> - <reference key="NSSuperview" ref="1069072197"/> - <reference key="NSTarget" ref="1069072197"/> - <string key="NSAction">_doScroller:</string> - <double key="NSPercent">9.936306e-01</double> - </object> - <object class="NSScroller" id="215731438"> - <reference key="NSNextResponder" ref="1069072197"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{-100, -100}, {471, 15}}</string> - <reference key="NSSuperview" ref="1069072197"/> - <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="1069072197"/> - <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1.000000e+00</double> - <double key="NSPercent">9.456522e-01</double> - </object> - </object> - <string key="NSFrame">{{-1, 60}, {452, 150}}</string> - <reference key="NSSuperview" ref="1006"/> - <reference key="NSNextKeyView" ref="879279249"/> - <int key="NSsFlags">530</int> - <reference key="NSVScroller" ref="428839600"/> - <reference key="NSHScroller" ref="215731438"/> - <reference key="NSContentView" ref="879279249"/> - </object> <object class="NSButton" id="988553034"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{340, 12}, {96, 32}}</string> + <string key="NSFrame">{{490, 12}, {96, 32}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="51422068"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Close</string> - <object class="NSFont" key="NSSupport" id="973672543"> + <object class="NSFont" key="NSSupport" id="1025432678"> <string key="NSName">LucidaGrande</string> <double key="NSSize">1.300000e+01</double> <int key="NSfFlags">1044</int> @@ -217,13 +77,13 @@ <object class="NSTextField" id="975059056"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{97, 268}, {336, 17}}</string> + <string key="NSFrame">{{97, 284}, {486, 34}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="376316034"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">These are your unsaved changes</string> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">272629760</int> + <string key="NSContents">DO NOT LOCALIZE</string> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande-Bold</string> <double key="NSSize">1.300000e+01</double> @@ -234,26 +94,32 @@ <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">controlColor</string> - <reference key="NSColor" ref="788635061"/> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + </object> </object> <object class="NSColor" key="NSTextColor" id="486214698"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">controlTextColor</string> - <reference key="NSColor" ref="863363789"/> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MAA</bytes> + </object> </object> </object> </object> <object class="NSTextField" id="502565893"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{97, 218}, {336, 42}}</string> + <string key="NSFrame">{{97, 248}, {486, 28}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="660509856"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">272629760</int> - <string key="NSContents">This view shows the differences between your unsaved document and the document data that is saved on your hard disk.</string> + <string key="NSContents">Green background text is text has been added, red background text is text that has been deleted, normal text is unchanged.</string> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> <double key="NSSize">1.100000e+01</double> @@ -279,7 +145,7 @@ <string>NeXT TIFF v4.0 pasteboard type</string> </object> </object> - <string key="NSFrame">{{20, 221}, {64, 64}}</string> + <string key="NSFrame">{{20, 254}, {64, 64}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="777138268"> @@ -296,72 +162,113 @@ </object> <bool key="NSEditable">YES</bool> </object> - <object class="NSButton" id="284853919"> + <object class="WebView" id="334130229"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{110, 12}, {96, 32}}</string> + <int key="NSvFlags">274</int> + <object class="NSMutableSet" key="NSDragTypes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="set.sortedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>Apple HTML pasteboard type</string> + <string>Apple PICT pasteboard type</string> + <string>Apple URL pasteboard type</string> + <string>Apple Web Archive pasteboard type</string> + <string>NSColor pasteboard type</string> + <string>NSFilenamesPboardType</string> + <string>NSStringPboardType</string> + <string>NeXT RTFD pasteboard type</string> + <string>NeXT Rich Text Format v1.0 pasteboard type</string> + <string>NeXT TIFF v4.0 pasteboard type</string> + <string>WebURLsWithTitlesPboardType</string> + <string>public.png</string> + <string>public.url</string> + <string>public.url-name</string> + </object> + </object> + <string key="NSFrame">{{0, 60}, {600, 175}}</string> <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="133749147"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Reject</string> - <reference key="NSSupport" ref="973672543"/> - <reference key="NSControlView" ref="284853919"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> + <reference key="NSNextKeyView"/> + <string key="FrameName"/> + <string key="GroupName"/> + <object class="WebPreferences" key="Preferences"> + <string key="Identifier"/> + <object class="NSMutableDictionary" key="Values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>WebKitDefaultFixedFontSize</string> + <string>WebKitDefaultFontSize</string> + <string>WebKitMinimumFontSize</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="12" id="197635525"/> + <reference ref="197635525"/> + <integer value="1"/> + </object> + </object> </object> + <bool key="UseBackForwardList">YES</bool> + <bool key="AllowsUndo">YES</bool> </object> - <object class="NSButton" id="495901369"> + <object class="NSBox" id="279522312"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{206, 12}, {96, 32}}</string> + <int key="NSvFlags">10</int> + <string key="NSFrame">{{0, 232}, {600, 5}}</string> <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="576953587"> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Next</string> - <reference key="NSSupport" ref="973672543"/> - <reference key="NSControlView" ref="495901369"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Box</string> + <reference key="NSSupport" ref="1025432678"/> + <object class="NSColor" key="NSBackgroundColor" id="559110636"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textBackgroundColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> + </object> </object> + <int key="NSBorderType">3</int> + <int key="NSBoxType">2</int> + <int key="NSTitlePosition">0</int> + <bool key="NSTransparent">NO</bool> </object> - <object class="NSButton" id="955971770"> + <object class="NSBox" id="842676505"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{14, 12}, {96, 32}}</string> + <int key="NSvFlags">34</int> + <string key="NSFrame">{{0, 58}, {600, 5}}</string> <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="150195816"> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Accept</string> - <reference key="NSSupport" ref="973672543"/> - <reference key="NSControlView" ref="955971770"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Box</string> + <reference key="NSSupport" ref="1025432678"/> + <reference key="NSBackgroundColor" ref="559110636"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> + </object> </object> + <int key="NSBorderType">3</int> + <int key="NSBoxType">2</int> + <int key="NSTitlePosition">0</int> + <bool key="NSTransparent">NO</bool> </object> </object> - <string key="NSFrameSize">{450, 300}</string> + <string key="NSFrameSize">{600, 333}</string> <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> - <string key="NSMinSize">{450, 322}</string> + <string key="NSMinSize">{600, 355}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> </object> @@ -385,22 +292,6 @@ <int key="connectionID">4</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">textView</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="945938713"/> - </object> - <int key="connectionID">9</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="945938713"/> - <reference key="destination" ref="1001"/> - </object> - <int key="connectionID">10</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">close:</string> <reference key="source" ref="1001"/> @@ -417,28 +308,20 @@ <int key="connectionID">15</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">nextChange:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="495901369"/> - </object> - <int key="connectionID">42</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">acceptChange:</string> + <object class="IBOutletConnection" key="connection"> + <string key="label">webView</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="955971770"/> + <reference key="destination" ref="334130229"/> </object> - <int key="connectionID">43</int> + <int key="connectionID">47</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">rejectChange:</string> + <object class="IBOutletConnection" key="connection"> + <string key="label">messageTextField</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="284853919"/> + <reference key="destination" ref="975059056"/> </object> - <int key="connectionID">44</int> + <int key="connectionID">50</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -486,42 +369,15 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="75050636"/> <reference ref="975059056"/> - <reference ref="502565893"/> - <reference ref="1069072197"/> <reference ref="988553034"/> - <reference ref="284853919"/> - <reference ref="955971770"/> - <reference ref="495901369"/> + <reference ref="334130229"/> + <reference ref="842676505"/> + <reference ref="502565893"/> + <reference ref="279522312"/> </object> <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="1069072197"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="428839600"/> - <reference ref="215731438"/> - <reference ref="945938713"/> - </object> - <reference key="parent" ref="1006"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6</int> - <reference key="object" ref="428839600"/> - <reference key="parent" ref="1069072197"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7</int> - <reference key="object" ref="215731438"/> - <reference key="parent" ref="1069072197"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">8</int> - <reference key="object" ref="945938713"/> - <reference key="parent" ref="1069072197"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">11</int> <reference key="object" ref="988553034"/> <object class="NSMutableArray" key="children"> @@ -578,47 +434,20 @@ <reference key="parent" ref="75050636"/> </object> <object class="IBObjectRecord"> - <int key="objectID">36</int> - <reference key="object" ref="284853919"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="133749147"/> - </object> + <int key="objectID">46</int> + <reference key="object" ref="334130229"/> <reference key="parent" ref="1006"/> </object> <object class="IBObjectRecord"> - <int key="objectID">37</int> - <reference key="object" ref="133749147"/> - <reference key="parent" ref="284853919"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">38</int> - <reference key="object" ref="955971770"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="150195816"/> - </object> + <int key="objectID">48</int> + <reference key="object" ref="279522312"/> <reference key="parent" ref="1006"/> </object> <object class="IBObjectRecord"> - <int key="objectID">39</int> - <reference key="object" ref="150195816"/> - <reference key="parent" ref="955971770"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">40</int> - <reference key="object" ref="495901369"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="576953587"/> - </object> + <int key="objectID">49</int> + <reference key="object" ref="842676505"/> <reference key="parent" ref="1006"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">41</int> - <reference key="object" ref="576953587"/> - <reference key="parent" ref="495901369"/> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -645,38 +474,23 @@ <string>31.IBPluginDependency</string> <string>32.IBPluginDependency</string> <string>33.IBPluginDependency</string> - <string>36.IBPluginDependency</string> - <string>37.IBPluginDependency</string> - <string>38.IBPluginDependency</string> - <string>39.IBPluginDependency</string> - <string>40.IBPluginDependency</string> - <string>41.IBPluginDependency</string> - <string>5.IBPluginDependency</string> - <string>6.IBPluginDependency</string> - <string>7.IBPluginDependency</string> - <string>8.IBPluginDependency</string> + <string>46.IBPluginDependency</string> + <string>48.IBPluginDependency</string> + <string>49.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{168, 177}, {450, 300}}</string> + <string>{{211, 515}, {600, 333}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{168, 177}, {450, 300}}</string> + <string>{{211, 515}, {600, 333}}</string> <boolean value="NO"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> <boolean value="YES"/> - <string>{450, 300}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{600, 333}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -686,6 +500,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.WebKitIBPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> @@ -710,7 +525,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">44</int> + <int key="maxID">50</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -719,28 +534,22 @@ <string key="className">BDocumentDifferencesWindowController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">close:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>acceptChange:</string> - <string>close:</string> - <string>nextChange:</string> - <string>previousChange:</string> - <string>rejectChange:</string> + <string>messageTextField</string> + <string>webView</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> + <string>NSTextField</string> + <string>WebView</string> </object> </object> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">textView</string> - <string key="NS.object.0">NSTextView</string> - </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">BDocumentDifferencesWindowController.h</string> @@ -757,6 +566,20 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Cloud.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">HTTPFetcher.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> <string key="minorKey">NSObject+SBJSON.h</string> </object> </object> English.lproj/BDocumentDifferencesWindow.xib @@ -35,11 +35,11 @@ </menu> <menu id="com.blocks.BUserInterface.menus.main.cloudDocumentsService"> - <menuitem title="CloudServiceLabel" id="browseCloudDocumentsOnline" action="browseCloudDocumentsOnline:" target="BDocumentCloudDelegate sharedInstance" /> - <menuitem title="%Sync" id="syncSharedDocuments" action="beginSync:" target="BDocumentCloudDelegate sharedInstance" indentationLevel="1" keyEquivalent="s" keyEquivalentModifierMask="NSControlKeyMask|NSCommandKeyMask" /> - <menuitem title="%New Document" id="newCloudDocument" action="newCloudDocument:" target="BDocumentCloudDelegate sharedInstance" indentationLevel="1" /> - <menuitem title="%Delete Document" id="deleteCloudDocument" action="deleteCloudDocument:" target="BDocumentCloudDelegate sharedInstance" indentationLevel="1" /> - <menuitem title="%Sign In..." id="toggleDocumentsServiceAuthentication" action="toggleDocumentsServiceAuthentication:" target="BDocumentCloudDelegate sharedInstance" indentationLevel="1" /> + <menuitem title="%Sync" id="beginSync" action="beginSync:" target="BDocumentCloudDelegate sharedInstance" keyEquivalent="s" keyEquivalentModifierMask="NSControlKeyMask|NSCommandKeyMask" /> + <menuitem title="%New Document" id="newCloudDocument" action="newCloudDocument:" target="BDocumentCloudDelegate sharedInstance" /> + <menuitem title="%Delete Document" id="deleteCloudDocument" action="deleteCloudDocument:" target="BDocumentCloudDelegate sharedInstance" /> + <menuitem title="%Show Documents" id="openCloudDocumentsWebsite" action="openCloudDocumentsWebsite:" target="BDocumentCloudDelegate sharedInstance" /> + <menuitem title="%Sign In..." id="toggleCloudDocumentsAuthentication" action="toggleCloudDocumentsAuthentication:" target="BDocumentCloudDelegate sharedInstance" /> </menu> </extension> </plugin> \ No newline at end of file Plugin.xml 297bf9f8624403b6ccacf903db06a5d2149c6d5c Jesse Grosjean jesse@hogbaysoftware.com http://github.com/jessegrosjean/bdocuments/commit/98bcc9bba75b3f68de05b77b0440160bce352d3f 98bcc9bba75b3f68de05b77b0440160bce352d3f 2009-04-16T13:26:05-07:00 2009-04-16T13:26:05-07:00 almost done 1251e7e8d29d862523b016888dbfafb15d765ef9 Jesse Grosjean jesse@hogbaysoftware.com