Mavericks changes

Import Mac OS X 10.9 TextEdit Version 1.9 source code.

Author: jjgod

English.lproj/DocumentProperties.nib/designable.nib renamed to Base.lproj/DocumentProperties.nib/designable.nib

@@ -4,7 +4,7 @@
  Abstract: Central controller object for TextEdit, for implementing app functionality (services) as well
  as few tidbits for which there are no dedicated controllers.
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following

Base.lproj/DocumentProperties.nib/keyedobjects.nib

@@ -4,7 +4,7 @@
  Abstract: Central controller object for TextEdit, for implementing app functionality (services) as well
  as few tidbits for which there are no dedicated controllers.
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following

English.lproj/Edit.nib/designable.nib renamed to Base.lproj/Edit.nib/designable.nib

@@ -3,7 +3,7 @@
      File: Document.h
  Abstract: Document object for TextEdit. 
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following
@@ -84,7 +84,6 @@
     NSStringEncoding documentEncodingForSaving;	    /* NSStringEncoding for saving the document */
     NSSaveOperationType currentSaveOperation;          /* So we can know whether to use documentEncodingForSaving or documentEncoding
                                                         in -fileWrapperOfType:error: */
-    NSLock *saveOperationTypeLock;                  /* so we can atomically set the save operation type and do the save */
 
 
     // Temporary information about document's desired file type
@@ -150,7 +149,6 @@
 /* Action methods */
 - (IBAction)toggleReadOnly:(id)sender;
 - (IBAction)togglePageBreaks:(id)sender;
-- (IBAction)saveDocumentAsPDFTo:(id)sender;
 
 /* Whether conversion to rich/plain be done without loss of information */
 - (BOOL)toggleRichWillLoseInformation;

English.lproj/Edit.nib/keyedobjects.nib renamed to Base.lproj/Edit.nib/keyedobjects.nib

@@ -3,7 +3,7 @@
      File: Document.m
  Abstract: Document object for TextEdit. 
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following
@@ -112,7 +112,6 @@ - (id)init {
 	[self setScaleFactor:1.0];
 	[self setDocumentPropertiesToDefaults];
 	inDuplicate = NO;
-	saveOperationTypeLock = [[NSLock alloc] init];
 
 	// Assume the default file type for now, since -initWithType:error: does not currently get called when creating documents using AppleScript. (4165700)
 	[self setFileType:[[NSDocumentController sharedDocumentController] defaultType]];
@@ -207,7 +206,7 @@ - (BOOL)readFromURL:(NSURL *)absoluteURL ofType:(NSString *)typeName encoding:(N
 	[text beginEditing];
 	success = [text readFromURL:absoluteURL options:options documentAttributes:&docAttrs error:outError];
 
-    if (!success) {
+        if (!success) {
 	    [text endEditing];
 	    layoutMgrEnum = [layoutMgrs objectEnumerator]; // rewind
 	    while ((layoutMgr = [layoutMgrEnum nextObject])) [text addLayoutManager:layoutMgr];   // Add the layout managers back
@@ -332,13 +331,9 @@ - (NSDictionary *)defaultTextAttributes:(BOOL)forRichText {
 	[textAttributes setObject:defaultRichParaStyle forKey:NSParagraphStyleAttributeName];
     } else {
 	NSFont *plainFont = [NSFont userFixedPitchFontOfSize:0.0];
-        NSFont *charWidthFont = plainFont;
+        NSFont *charWidthFont = [plainFont screenFontWithRenderingMode:NSFontDefaultRenderingMode];
 	NSInteger tabWidth = [[NSUserDefaults standardUserDefaults] integerForKey:TabWidth];
-	CGFloat charWidth;
-
-        if ([self usesScreenFonts]) charWidthFont = [plainFont screenFontWithRenderingMode:NSFontDefaultRenderingMode];
-
-        charWidth = [@" " sizeWithAttributes:[NSDictionary dictionaryWithObject:charWidthFont forKey:NSFontAttributeName]].width;
+	CGFloat charWidth = [@" " sizeWithAttributes:[NSDictionary dictionaryWithObject:charWidthFont forKey:NSFontAttributeName]].width;
         if (charWidth == 0) charWidth = [charWidthFont maximumAdvancement].width;
 
 	// Now use a default paragraph style, but with the tab width adjusted
@@ -398,11 +393,11 @@ - (void)dealloc {
     [title release];
     [keywords release];
     [copyright release];
+    [company release];
 
     [fileTypeToSet release];
 
     [originalOrientationSections release];
-    [saveOperationTypeLock release];
     [super dealloc];
 }
 
@@ -567,14 +562,17 @@ - (BOOL)isRichText {
 */
 - (NSDictionary *)documentPropertyToAttributeNameMappings {
     static NSDictionary *dict = nil;
-    if (!dict) dict = [[NSDictionary alloc] initWithObjectsAndKeys:
-	NSCompanyDocumentAttribute, @"company", 
-	NSAuthorDocumentAttribute, @"author", 
-	NSKeywordsDocumentAttribute, @"keywords", 
-  	NSCopyrightDocumentAttribute, @"copyright", 
-	NSTitleDocumentAttribute, @"title", 
-	NSSubjectDocumentAttribute, @"subject", 
-	NSCommentDocumentAttribute, @"comment", nil];
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        dict = [[NSDictionary alloc] initWithObjectsAndKeys:
+	    NSCompanyDocumentAttribute, @"company",
+	    NSAuthorDocumentAttribute, @"author",
+	    NSKeywordsDocumentAttribute, @"keywords",
+	    NSCopyrightDocumentAttribute, @"copyright",
+	    NSTitleDocumentAttribute, @"title",
+	    NSSubjectDocumentAttribute, @"subject",
+	    NSCommentDocumentAttribute, @"comment", nil];
+    });
     return dict;
 }
 
@@ -816,12 +814,6 @@ - (BOOL)revertToContentsOfURL:(NSURL *)url ofType:(NSString *)type error:(NSErro
     return success;
 }
 
-/* Target/action method for saving as (actually "saving to") PDF. Note that this approach of omitting the path will not work on Leopard; see TextEdit's README.rtf
-*/
-- (IBAction)saveDocumentAsPDFTo:(id)sender {
-    [self printDocumentWithSettings:[NSDictionary dictionaryWithObjectsAndKeys:NSPrintSaveJob, NSPrintJobDisposition, nil] showPrintPanel:NO delegate:nil didPrintSelector:NULL contextInfo:NULL];
-}
-
 @end
 
 
@@ -895,13 +887,13 @@ - (NSString *)fileNameExtensionForType:(NSString *)inTypeName saveOperation:(NSS
 - (void)saveToURL:(NSURL *)absoluteURL ofType:(NSString *)typeName forSaveOperation:(NSSaveOperationType)saveOperation completionHandler:(void (^)(NSError *error))handler {
     // Note that we do the breakUndoCoalescing call even during autosave, which means the user's undo of long typing will take them back to the last spot an autosave occured. This might seem confusing, and a more elaborate solution may be possible (cause an autosave without having to breakUndoCoalescing), but since this change is coming late in Leopard, we decided to go with the lower risk fix.
     [[self windowControllers] makeObjectsPerformSelector:@selector(breakUndoCoalescing)];
-	[saveOperationTypeLock lock];
-    currentSaveOperation = saveOperation;
-	handler = [Block_copy(handler) autorelease];
-    [super saveToURL:absoluteURL ofType:typeName forSaveOperation:saveOperation completionHandler:^(NSError *error) {
+    [self performAsynchronousFileAccessUsingBlock:^(void (^fileAccessCompletionHandler)(void) ) {
+        currentSaveOperation = saveOperation;
+        [super saveToURL:absoluteURL ofType:typeName forSaveOperation:saveOperation completionHandler:^(NSError *error) {
             [self setEncodingForSaving:NoStringEncoding];   // This is set during prepareSavePanel:, but should be cleared for future save operation without save panel
-        [saveOperationTypeLock unlock];
-        handler(error);
+            fileAccessCompletionHandler();
+            handler(error);
+        }];
     }];
 
 }
@@ -1286,7 +1278,9 @@ - (BOOL)prepareSavePanel:(NSSavePanel *)savePanel {
 	string = [textStorage string];
 	NSStringEncoding enc = [self encoding];
 	[self setEncodingForSaving:(enc == NoStringEncoding || ![string canBeConvertedToEncoding:enc]) ? [self suggestedDocumentEncoding] : enc];
-	[savePanel setAccessoryView:[[[NSDocumentController sharedDocumentController] class] encodingAccessory:[self encodingForSaving] includeDefaultEntry:NO encodingPopUp:&encodingPopup checkBox:&extCheckbox]];
+        NSView *accessoryView = [[[NSDocumentController sharedDocumentController] class] encodingAccessory:[self encodingForSaving] includeDefaultEntry:NO encodingPopUp:&encodingPopup checkBox:&extCheckbox];
+        accessoryView.translatesAutoresizingMaskIntoConstraints = NO;
+	[savePanel setAccessoryView:accessoryView];
 
 	// Set up the checkbox
 	[extCheckbox setTitle:NSLocalizedString(@"If no extension is provided, use \\U201c.txt\\U201d.", @"Checkbox indicating that if the user does not specify an extension when saving a plain text file, .txt will be used")];

English.lproj/Preferences.nib/designable.nib renamed to Base.lproj/Preferences.nib/designable.nib

@@ -4,7 +4,7 @@
  Abstract: NSDocumentController subclass for TextEdit.
  Required to support transient documents and customized Open panel.
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following

Base.lproj/Preferences.nib/keyedobjects.nib

@@ -4,7 +4,7 @@
  Abstract: NSDocumentController subclass for TextEdit.
  Required to support transient documents and customized Open panel.
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following
@@ -281,14 +281,14 @@ - (void)addDocument:(NSDocument *)newDoc {
 + (NSView *)encodingAccessory:(NSStringEncoding)encoding includeDefaultEntry:(BOOL)includeDefaultItem encodingPopUp:(NSPopUpButton **)popup checkBox:(NSButton **)button {
     OpenSaveAccessoryOwner *owner = [[[OpenSaveAccessoryOwner alloc] init] autorelease];
     // Rather than caching, load the accessory view everytime, as it might appear in multiple panels simultaneously.
-    if (![NSBundle loadNibNamed:@"EncodingAccessory" owner:owner])  {
+    if (![[NSBundle mainBundle] loadNibNamed:@"EncodingAccessory" owner:owner topLevelObjects:NULL])  {
         NSLog(@"Failed to load EncodingAccessory.nib");
         return nil;
     }
     if (popup) *popup = owner->encodingPopUp;
     if (button) *button = owner->checkBox;
     [[EncodingManager sharedInstance] setupPopUpCell:[owner->encodingPopUp cell] selectedEncoding:encoding withDefaultEntry:includeDefaultItem];
-    return [owner->accessoryView autorelease];
+    return owner->accessoryView;
 }
 
 /* Overridden to add an accessory view to the open panel. This method is called for both modal and non-modal invocations.
@@ -299,7 +299,9 @@ - (void)beginOpenPanel:(NSOpenPanel *)openPanel forTypes:(NSArray *)types comple
 
     BOOL ignoreHTMLOrig = [[NSUserDefaults standardUserDefaults] boolForKey:IgnoreHTML];
     BOOL ignoreRichOrig = [[NSUserDefaults standardUserDefaults] boolForKey:IgnoreRichText];
-    [openPanel setAccessoryView:[[self class] encodingAccessory:[[[NSUserDefaults standardUserDefaults] objectForKey:PlainTextEncodingForRead] unsignedIntegerValue] includeDefaultEntry:YES encodingPopUp:&encodingPopUp checkBox:&ignoreRichTextButton]];
+    NSView *accessoryView = [[self class] encodingAccessory:[[[NSUserDefaults standardUserDefaults] objectForKey:PlainTextEncodingForRead] unsignedIntegerValue] includeDefaultEntry:YES encodingPopUp:&encodingPopUp checkBox:&ignoreRichTextButton];
+    accessoryView.translatesAutoresizingMaskIntoConstraints = NO;
+    [openPanel setAccessoryView:accessoryView];
     [ignoreRichTextButton setTitle:NSLocalizedString(@"Ignore rich text commands", @"Checkbox indicating that when opening a rich text file, the rich text should be ignored (causing the file to be loaded as plain text)")];
     [ignoreRichTextButton setToolTip:NSLocalizedString(@"If selected, HTML and RTF files will be loaded as plain text, allowing you to see and edit the HTML or RTF directives.", @"Tooltip for checkbox indicating that when opening a rich text file, the rich text should be ignored (causing the file to be loaded as plain text)")];
     if (ignoreRichOrig != ignoreHTMLOrig) {
@@ -352,4 +354,3 @@ - (NSString *)defaultType {
 }
 
 @end
-

English.lproj/PrintPanelAccessory.nib/designable.nib renamed to Base.lproj/PrintPanelAccessory.nib/designable.nib

@@ -8,7 +8,7 @@
  
  This class is mostly reusable, except with the assumption that commitEditing always succeeds.
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following

Base.lproj/PrintPanelAccessory.nib/keyedobjects.nib

@@ -8,7 +8,7 @@
  
  This class is mostly reusable, except with the assumption that commitEditing always succeeds.
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following

Base.lproj/SelectEncodingsPanel.nib/designable.nib

@@ -3,7 +3,7 @@
      File: DocumentWindowController.h
  Abstract: Document's main window controller object for TextEdit.
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following

Base.lproj/SelectEncodingsPanel.nib/keyedobjects.nib

@@ -3,7 +3,7 @@
      File: DocumentWindowController.m
  Abstract: Document's main window controller object for TextEdit.
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following
@@ -758,7 +758,7 @@ - (void)toggleRichWithNewFileType:(NSString *)type {
     [undoManager beginUndoGrouping];
 
     NSString *undoType = (NSString *)((isRich) ? (([[[self firstTextView] textStorage] containsAttachments] || [[document fileType] isEqualToString:(NSString *)kUTTypeRTFD]) ? kUTTypeRTFD : kUTTypeRTF) : kUTTypePlainText);
-    
+
     [undoManager registerUndoWithTarget:self selector:_cmd object:undoType];
 
     [document setUsesScreenFonts:isRich];
@@ -778,52 +778,65 @@ - (void)toggleRichWithNewFileType:(NSString *)type {
     if (type == nil) type = (NSString *)(isRich ? kUTTypePlainText : kUTTypeRTF);
 
     if (fileURL) {
-        [document saveToURL:fileURL ofType:type forSaveOperation:NSAutosaveInPlaceOperation completionHandler:^(NSError *error) {
-            if (error) {
-                [document setFileURL:nil];
-                [document setFileType:type];
-            }
-        }];
-    } else {
-        [document setFileType:type];
-    }
-}
 
-- (void)autosaveIfNeededThenToggleRich {
-    Document *document = [self document];
-    
-    if ([document fileURL] && [document isDocumentEdited]) {
-        [document autosaveWithImplicitCancellability:NO completionHandler:^(NSError *error) {
-            if (!error) [self toggleRichWithNewFileType:nil];
-        }];
+        // Synchronously calling a method that invokes -performAsynchronousFileAccessUsingBlock: (like -saveToURL:ofType:forSaveOperation:completionHandler:) in the completion handler of method that uses -continueAsynchronousWorkOnMainThreadUsingBlock: to invoke its completion handler on the main thread (like -autosaveWithImplicitCancellability:completionHandler:, used in -toggleRich:) triggers a bug in NSdocument where the -performAsynchronousFileAccessUsingBlock: invocation has no effect besides invoking its block. This can potentially result in two 'file access' blocks being invoked at the same time, which breaks the contract.
+        CFRunLoopPerformBlock(CFRunLoopGetMain(), kCFRunLoopDefaultMode, ^{
+            [document saveToURL:fileURL ofType:type forSaveOperation:NSAutosaveInPlaceOperation completionHandler:^(NSError *error) {
+                if (error) {
+                    [document setFileURL:nil];
+                    [document setFileType:type];
+                }
+            }];
+        });
     } else {
-        [self toggleRichWithNewFileType:nil];
+        [document setFileType:type];
     }
 }
 
 /* toggleRich: puts up an alert before ultimately calling -setRichText:
 */
 - (void)toggleRich:(id)sender {
     Document *document = [self document];
-    // Check if there is any loss of information
-    if ([document toggleRichWillLoseInformation]) {
-        [document performActivityWithSynchronousWaiting:YES usingBlock:^(void (^activityCompletionHandler)(void)) {
-        NSBeginAlertSheet(NSLocalizedString(@"Convert this document to plain text?", @"Title of alert confirming Make Plain Text"),
-			  NSLocalizedString(@"OK", @"OK"), NSLocalizedString(@"Cancel", @"Button choice that allows the user to cancel."), nil, [[self document] windowForSheet], 
-                              self, NULL, @selector(didEndToggleRichSheet:returnCode:contextInfo:),
-                                Block_copy(^(void) {
-                                    activityCompletionHandler();
-                                }),
-			  NSLocalizedString(@"Making a rich text document plain will lose all text styles (such as fonts and colors), images, attachments, and document properties.", @"Subtitle of alert confirming Make Plain Text"));
+    [document performActivityWithSynchronousWaiting:YES usingBlock:^(void (^activityCompletionHandler)(void)) {
+
+        // What we'll do to cause the document to toggle rich, after maybe showing an alert about loss of information.
+        void (^continueTogglingRich)(void) = ^{
+            [document autosaveWithImplicitCancellability:NO completionHandler:^(NSError *error) {
+                if (!error) {
+                    [self toggleRichWithNewFileType:nil];
+                }
+                activityCompletionHandler();
+            }];
+
+        };
+
+        // Check if there is any loss of information, waiting for any previous saves (which might be changing the type) to complete.
+        __block BOOL willLoseInformation = NO;
+        [document performSynchronousFileAccessUsingBlock:^{
+            willLoseInformation = [document toggleRichWillLoseInformation];
         }];
-    } else {
-        [self autosaveIfNeededThenToggleRich];
-    }
+        if (willLoseInformation) {
+            NSString *messageText = NSLocalizedString(@"Convert this document to plain text?", @"Title of alert confirming Make Plain Text");
+            NSString *defaultButton = NSLocalizedString(@"OK", @"OK");
+            NSString *alternateButton = NSLocalizedString(@"Cancel", @"Button choice that allows the user to cancel.");
+            NSString *informativeText = NSLocalizedString(@"Making a rich text document plain will lose all text styles (such as fonts and colors), images, attachments, and document properties.", @"Subtitle of alert confirming Make Plain Text");
+            NSAlert *alert = [NSAlert alertWithMessageText:messageText defaultButton:defaultButton alternateButton:alternateButton otherButton:nil informativeTextWithFormat:@"%@", informativeText];
+            [alert beginSheetModalForWindow:[[self document] windowForSheet] modalDelegate:self didEndSelector:@selector(didEndToggleRichSheet:returnCode:contextInfo:) contextInfo:Block_copy(^(BOOL okToToggleRich){
+                if (okToToggleRich) {
+                    continueTogglingRich();
+                } else {
+                    activityCompletionHandler();
+                }
+            })];
+        } else {
+            continueTogglingRich();
+        }
+
+    }];
 }
 
-- (void)didEndToggleRichSheet:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void (^)(void))block {
-    if (returnCode == NSAlertDefaultReturn) [self autosaveIfNeededThenToggleRich];
-    block();
+- (void)didEndToggleRichSheet:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void (^)(BOOL))block {
+    block(returnCode == NSAlertDefaultReturn);
     Block_release(block);
 }
 

Base.lproj/SelectLinePanel.nib/designable.nib

@@ -3,7 +3,7 @@
      File: Edit_main.m
  Abstract: Standard main file.
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following

Base.lproj/SelectLinePanel.nib/keyedobjects.nib

@@ -4,7 +4,7 @@
  Abstract: Helper class providing additional functionality for character encodings.
  This file also defines the EncodingPopUpButtonCell class.
  
-  Version: 1.8
+  Version: 1.9
  
  Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
  Inc. ("Apple") in consideration of your agreement to the following