Skip to content

Commit

Permalink
Merge branch 'release/1.5.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@usami-k
usami-k committed May 21, 2014
2 parents ce2b9fd + 85433ff commit f89c32b
Show file tree
Hide file tree
Showing 42 changed files with 410 additions and 371 deletions.
4 changes: 2 additions & 2 deletions CotEditor/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.5.2</string>
<string>1.5.3</string>
<key>CFBundleSignature</key>
<string>cEd1</string>
<key>CFBundleVersion</key>
<string>1.5.2</string>
<string>1.5.3</string>
<key>NSAppleScriptEnabled</key>
<true/>
<key>NSHumanReadableCopyright</key>
Expand Down
7 changes: 4 additions & 3 deletions CotEditor/Sources/CEAppDelegate.m
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
=================================================
CEAppController
CEAppDelegate
(for CotEditor)
Copyright (C) 2004-2007 nakamuxu.
Expand Down Expand Up @@ -142,7 +142,7 @@ + (void)initialize
k_key_defaultColoringStyleName: NSLocalizedString(@"None", nil),
k_key_delayColoring: @NO,
k_key_fileDropArray: @[@{k_key_fileDropExtensions: @"jpg, jpeg, gif, png",
k_key_fileDropFormatString: @"<img src=\"<<<RELATIVE-PATH>>>\" alt =\"<<<FILENAME-NOSUFFIX>>>\" title=\"<<<FILENAME-NOSUFFIX>>>\" width=\"<<<IMAGEWIDTH>>>\" height=\"<<<IMAGEHEIGHT>>>\" />"}],
k_key_fileDropFormatString: @"<img src=\"<<<RELATIVE-PATH>>>\" alt=\"<<<FILENAME-NOSUFFIX>>>\" title=\"<<<FILENAME-NOSUFFIX>>>\" width=\"<<<IMAGEWIDTH>>>\" height=\"<<<IMAGEHEIGHT>>>\" />"}],
k_key_NSDragAndDropTextDelay: @1,
k_key_smartInsertAndDelete: @NO,
k_key_enableSmartQuotes: @NO,
Expand Down Expand Up @@ -206,7 +206,8 @@ + (void)initialize
k_key_showColoringIndicatorTextLength: @115000U,
k_key_runAppleScriptInLaunching: @YES,
k_key_showAlertForNotWritable: @YES,
k_key_notifyEditByAnother: @YES};
k_key_notifyEditByAnother: @YES,
k_key_coloringRangeBufferLength: @10000};
[[NSUserDefaults standardUserDefaults] registerDefaults:defaults];

// 出荷時へのリセットが必要な項目に付いては NSUserDefaultsController に初期値をセットする
Expand Down
115 changes: 56 additions & 59 deletions CotEditor/Sources/CEDocument.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,11 @@ - (void)canCloseDocumentWithDelegate:(id)delegate shouldCloseSelector:(SEL)shoul
if ([self isDocumentEdited] &&
![self canReleaseFinderLockAtURL:[self fileURL] isLocked:nil lockAgain:YES])
{
NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Finder's lock is On.", nil)
defaultButton:NSLocalizedString(@"Cancel", nil)
alternateButton:NSLocalizedString(@"Don't Save, and Close", nil)
otherButton:nil
informativeTextWithFormat:NSLocalizedString(@"Finder's lock could not be released. So, you can not save your changes on this file, but you will be able to save a copy somewhere else.\n\nDo you want to close?", nil)];
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:NSLocalizedString(@"Finder's lock is On.", nil)];
[alert setInformativeText:NSLocalizedString(@"Finder's lock could not be released. So, you can not save your changes on this file, but you will be able to save a copy somewhere else.\n\nDo you want to close?", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Don't Save, and Close", nil)];

for (NSButton *button in [alert buttons]) {
if ([[button title] isEqualToString:NSLocalizedString(@"Don't Save, and Close", nil)]) {
Expand Down Expand Up @@ -594,7 +594,6 @@ - (BOOL)doSetEncoding:(NSStringEncoding)encoding updateDocument:(BOOL)updateDocu
if (encoding == [self encodingCode]) {
return YES;
}
NSInteger result = NSAlertOtherReturn;
BOOL shouldShowList = NO;
if (updateDocument) {

Expand All @@ -605,15 +604,14 @@ - (BOOL)doSetEncoding:(NSStringEncoding)encoding updateDocument:(BOOL)updateDocu
if (askLossy) {
if (![curString canBeConvertedToEncoding:encoding]) {
NSString *encodingNameStr = [NSString localizedNameOfStringEncoding:encoding];
NSString *messageText = [NSString stringWithFormat:NSLocalizedString(@"The characters would have to be changed or deleted in saving as “%@”.", nil), encodingNameStr];
NSAlert *alert = [NSAlert alertWithMessageText:messageText
defaultButton:NSLocalizedString(@"Cancel", nil)
alternateButton:NSLocalizedString(@"Change Encoding", nil)
otherButton:nil
informativeTextWithFormat:NSLocalizedString(@"Do you want to change encoding and show incompatible characters?", nil)];

result = [alert runModal];
if (result == NSAlertDefaultReturn) { // == Cancel
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"The characters would have to be changed or deleted in saving as “%@”.", nil), encodingNameStr]];
[alert setInformativeText:NSLocalizedString(@"Do you want to change encoding and show incompatible characters?", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Change Encoding", nil)];

NSInteger returnCode = [alert runModal];
if (returnCode == NSAlertFirstButtonReturn) { // == Cancel
return NO;
}
shouldShowList = YES;
Expand Down Expand Up @@ -1055,11 +1053,11 @@ - (void)showUpdatedByExternalProcessAlert
defaultButton = @"Keep Unchanged";
[self updateChangeCount:NSChangeDone]; // ダーティーフラグを立てる
}
alert = [NSAlert alertWithMessageText:NSLocalizedString(messageText, nil)
defaultButton:NSLocalizedString(defaultButton, nil)
alternateButton:NSLocalizedString(@"Update", nil)
otherButton:nil
informativeTextWithFormat:NSLocalizedString(informativeText, nil)];
alert = [[NSAlert alloc] init];
[alert setMessageText:NSLocalizedString(messageText, nil)];
[alert setInformativeText:NSLocalizedString(informativeText, nil)];
[alert addButtonWithTitle:NSLocalizedString(defaultButton, nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Update", nil)];

// シートが表示中でなければ、表示
if ([[self windowForSheet] attachedSheet] == nil) {
Expand Down Expand Up @@ -1303,36 +1301,37 @@ - (IBAction)setEncoding:(id)sender

// 文字列がないまたは未保存の時は直ちに変換プロセスへ
if (([[[self editorView] string] length] < 1) || (![self fileURL])) {
result = NSAlertDefaultReturn;
result = NSAlertFirstButtonReturn;
} else {
// 変換するか再解釈するかの選択ダイアログを表示
NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"File encoding", nil)
defaultButton:NSLocalizedString(@"Convert", nil)
alternateButton:NSLocalizedString(@"Reinterpret", nil)
otherButton:NSLocalizedString(@"Cancel", nil)
informativeTextWithFormat:NSLocalizedString(@"Do you want to convert or reinterpret it using “%@”?", nil), encodingName];
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:NSLocalizedString(@"File encoding", nil)];
[alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Do you want to convert or reinterpret it using “%@”?", nil), encodingName]];
[alert addButtonWithTitle:NSLocalizedString(@"Convert", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Reinterpret", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];

result = [alert runModal];
}
if (result == NSAlertDefaultReturn) { // = Convert 変換
if (result == NSAlertFirstButtonReturn) { // = Convert 変換

NSString *actionName = [NSString stringWithFormat:NSLocalizedString(@"Encoding to “%@”",@""),
[NSString localizedNameOfStringEncoding:encoding]];

[self doSetEncoding:encoding updateDocument:YES askLossy:YES lossy:NO asActionName:actionName];

} else if (result == NSAlertAlternateReturn) { // = Reinterpret 再解釈
} else if (result == NSAlertSecondButtonReturn) { // = Reinterpret 再解釈

if (![self fileURL]) { return; } // まだファイル保存されていない時（ファイルがない時）は、戻る
if ([self isDocumentEdited]) {
NSAlert *secondAlert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"The file “%@” has unsaved changes.", nil), [[self fileURL] path]]
defaultButton:NSLocalizedString(@"Cancel", nil)
alternateButton:NSLocalizedString(@"Discard Changes", nil)
otherButton:nil
informativeTextWithFormat:NSLocalizedString(@"Do you want to discard the changes and reset the file encodidng?", nil)];
NSAlert *secondAlert = [[NSAlert alloc] init];
[secondAlert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"The file “%@” has unsaved changes.", nil), [[self fileURL] path]]];
[secondAlert setInformativeText:NSLocalizedString(@"Do you want to discard the changes and reset the file encodidng?", nil)];
[secondAlert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
[secondAlert addButtonWithTitle:NSLocalizedString(@"Discard Changes", nil)];

NSInteger secondResult = [secondAlert runModal];
if (secondResult != NSAlertAlternateReturn) { // != Discard Change
if (secondResult != NSAlertSecondButtonReturn) { // != Discard Change
// ツールバーから変更された場合のため、ツールバーアイテムの選択状態をリセット
[[[self windowController] toolbarController] setSelectEncoding:[self encodingCode]];
return;
Expand All @@ -1344,11 +1343,10 @@ - (IBAction)setEncoding:(id)sender
[[self undoManager] removeAllActions];
[self updateChangeCount:NSChangeCleared];
} else {
NSAlert *thirdAlert = [NSAlert alertWithMessageText:NSLocalizedString(@"Can not reinterpret", nil)
defaultButton:NSLocalizedString(@"Done", nil)
alternateButton:nil
otherButton:nil
informativeTextWithFormat:NSLocalizedString(@"The file “%@” could not be reinterpreted using the new encoding “%@”.", nil), [[self fileURL] path], encodingName];
NSAlert *thirdAlert = [[NSAlert alloc] init];
[thirdAlert setMessageText:NSLocalizedString(@"Can not reinterpret", nil)];
[thirdAlert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"The file “%@” could not be reinterpreted using the new encoding “%@”.", nil), [[self fileURL] path], encodingName]];
[thirdAlert addButtonWithTitle:NSLocalizedString(@"Done", nil)];
[thirdAlert setAlertStyle:NSCriticalAlertStyle];

NSBeep();
Expand Down Expand Up @@ -1684,14 +1682,14 @@ - (BOOL)acceptSaveDocumentWithIANACharSetName

NSString *IANANameStr = [NSString localizedNameOfStringEncoding:IANACharSetEncoding];
NSString *encodingNameStr = [NSString localizedNameOfStringEncoding:[self encodingCode]];
NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"The encoding is “%@”, but the IANA charset name in text is “%@”.", nil), encodingNameStr, IANANameStr]
defaultButton:NSLocalizedString(@"Cancel", nil)
alternateButton:NSLocalizedString(@"Continue Saving", nil)
otherButton:nil
informativeTextWithFormat:NSLocalizedString(@"Do you want to continue processing?", nil)];
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"The encoding is “%@”, but the IANA charset name in text is “%@”.", nil), encodingNameStr, IANANameStr]];
[alert setInformativeText:NSLocalizedString(@"Do you want to continue processing?", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Continue Saving", nil)];

NSInteger result = [alert runModal];
if (result != NSAlertAlternateReturn) { // == Cancel
if (result != NSAlertSecondButtonReturn) { // == Cancel
return NO;
}
}
Expand All @@ -1709,15 +1707,16 @@ - (BOOL)acceptSaveDocumentToConvertEncoding
withEncoding:[self encodingCode]];
if (![curString canBeConvertedToEncoding:[self encodingCode]]) {
NSString *encodingName = [NSString localizedNameOfStringEncoding:[self encodingCode]];
NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"The characters would have to be changed or deleted in saving as “%@”.", nil), encodingName]
defaultButton:NSLocalizedString(@"Show Incompatible Chars", nil)
alternateButton:NSLocalizedString(@"Save Available Strings", nil)
otherButton:NSLocalizedString(@"Cancel", nil)
informativeTextWithFormat:NSLocalizedString(@"Do you want to continue processing?", nil)];
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"The characters would have to be changed or deleted in saving as “%@”.", nil), encodingName]];
[alert setInformativeText:NSLocalizedString(@"Do you want to continue processing?", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Show Incompatible Chars", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Save Available Strings", nil)];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];

NSInteger result = [alert runModal];
if (result != NSAlertAlternateReturn) { // != Save
if (result == NSAlertDefaultReturn) { // == show incompatible char
if (result != NSAlertSecondButtonReturn) { // != Save
if (result == NSAlertFirstButtonReturn) { // == show incompatible chars
[[self windowController] showIncompatibleCharList];
}
return NO;
Expand Down Expand Up @@ -1748,11 +1747,9 @@ - (BOOL)forceWriteToURL:(NSURL *)url ofType:(NSString *)typeName forSaveOperatio
// ユーザがオーナーでないファイルに Finder Lock がかかっていたら編集／保存できない
BOOL isFinderLockOn = NO;
if (![self canReleaseFinderLockAtURL:url isLocked:&isFinderLockOn lockAgain:NO]) {
NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Finder's lock could not be released.", nil)
defaultButton:nil
alternateButton:nil
otherButton:nil
informativeTextWithFormat:NSLocalizedString(@"You can use “Save As” to save a copy.", nil)];
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:NSLocalizedString(@"Finder's lock could not be released.", nil)];
[alert setInformativeText:NSLocalizedString(@"You can use “Save As” to save a copy.", nil)];
[alert setAlertStyle:NSCriticalAlertStyle];
[alert runModal];
return NO;
Expand Down Expand Up @@ -1835,7 +1832,7 @@ - (void)alertForModByAnotherProcessDidEnd:(NSAlert *)alert returnCode:(NSInteger
contextInfo:(void *)inContextInfo
// ------------------------------------------------------
{
if (returnCode == NSAlertAlternateReturn) { // == Revert
if (returnCode == NSAlertSecondButtonReturn) { // == Revert
// Revert 確認アラートを表示させないため、実行メソッドを直接呼び出す
if ([self revertToContentsOfURL:[self fileURL] ofType:[self fileType] error:nil]) {
[[self undoManager] removeAllActions];
Expand Down Expand Up @@ -1905,7 +1902,7 @@ - (void)alertForNotWritableCloseDocDidEnd:(NSAlert *)alert returnCode:(int)retur
id delegate = contextInfoDict[@"delegate"];
SEL shouldCloseSelector = [contextInfoDict[@"shouldCloseSelector"] pointerValue];
void *originalContextInfo = [contextInfoDict[@"contextInfo"] pointerValue];
BOOL shouldClose = (returnCode == NSAlertAlternateReturn); // YES == Don't Save and Close
BOOL shouldClose = (returnCode == NSAlertSecondButtonReturn); // YES == Don't Save and Close

if (delegate) {
void (*callback)(id, SEL, id, BOOL, void *) = (void (*)(id, SEL, id, BOOL, void *))objc_msgSend;
Expand Down
14 changes: 7 additions & 7 deletions CotEditor/Sources/CEEditorView.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,8 @@ - (void)setLineEndingCharacter:(OgreNewlineCharacter)lineEndingCharacter
(lineEndingCharacter <= OgreWindowsNewlineCharacter)) {
_lineEndingCharacter = lineEndingCharacter;
} else {
NSInteger defaultLineEnding = [[NSUserDefaults standardUserDefaults] integerForKey:k_key_defaultLineEndCharCode]; _lineEndingCharacter = defaultLineEnding;
NSInteger defaultLineEnding = [[NSUserDefaults standardUserDefaults] integerForKey:k_key_defaultLineEndCharCode];
_lineEndingCharacter = defaultLineEnding;
}
// set to textViewCore.
switch (_lineEndingCharacter) {
Expand Down Expand Up @@ -578,11 +579,9 @@ - (void)alertForNotWritable

if ([[NSUserDefaults standardUserDefaults] boolForKey:k_key_showAlertForNotWritable]) {

NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"The file is not writable.", nil)
defaultButton:nil
alternateButton:nil
otherButton:nil
informativeTextWithFormat:NSLocalizedString(@"You may not be able to save your changes, but you will be able to save a copy somewhere else.", nil)];
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:NSLocalizedString(@"The file is not writable.", nil)];
[alert setInformativeText:NSLocalizedString(@"You may not be able to save your changes, but you will be able to save a copy somewhere else.", nil)];

[alert beginSheetModalForWindow:[self window]
modalDelegate:self
Expand Down Expand Up @@ -1198,7 +1197,8 @@ - (void)doColoringNow
coloringRange = NSMakeRange(location, length);
} else {
// 表示領域の前もある程度カラーリングの対象に含める
NSUInteger buffer = MIN(charRange.location, k_coloringRangeBufferLength);
NSUInteger buffer = MIN(charRange.location,
[[NSUserDefaults standardUserDefaults] integerForKey:k_key_coloringRangeBufferLength]);
coloringRange.location -= buffer;
coloringRange.length += buffer;
}
Expand Down
Loading

0 comments on commit f89c32b

Please sign in to comment.