Merge branch 'release/1.3'

coteditor · Feb 9, 2012 · 9f732e0 · 9f732e0
2 parents 77a2cb4 + 16f8e87
commit 9f732e0
Show file tree

Hide file tree

Showing 24 changed files with 18,441 additions and 8,787 deletions.
diff --git a/CEAppController.m b/CEAppController.m
@@ -88,6 +88,7 @@ + (void)initialize
                 [NSNumber numberWithBool:YES], k_key_countLineEndingAsChar, 
                 [NSNumber numberWithBool:NO], k_key_syncFindPboard, 
                 [NSNumber numberWithBool:NO], k_key_inlineContextualScriptMenu, 
+                [NSNumber numberWithBool:YES], k_key_appendExtensionAtSaving, 
                 [NSNumber numberWithBool:YES], k_key_showStatusBarThousSeparator, 
                 [NSNumber numberWithBool:YES], k_key_showNavigationBar, 
                 [NSNumber numberWithBool:YES], k_key_wrapLines, 

diff --git a/CEDocument.m b/CEDocument.m
@@ -79,6 +79,26 @@ - (void)showAlertForNotWritable;
 
 @implementation CEDocument
 
+#pragma mark ===== Class method =====
+
+// ------------------------------------------------------
++ (BOOL)autosavesInPlace
+// OS X 10.7 AutoSave
+// ------------------------------------------------------
+{
+    return NO;
+}
+
+
+// ------------------------------------------------------
++ (BOOL)preservesVersions
+// OS X 10.7 Versions
+// ------------------------------------------------------
+{
+    return NO;
+}
+
+
 #pragma mark ===== Public method =====
 
 //=======================================================
@@ -291,7 +311,7 @@ - (void)runModalSavePanelForSaveOperation:(NSSaveOperationType)inSaveOperation d
     [super runModalSavePanelForSaveOperation:inSaveOperation delegate:inDelegate 
             didSaveSelector:inDidSaveSelector contextInfo:inContextInfo];
 
-    // 保存するファイル名の、拡張子をのぞいた部分を選択状態にする
+    // セーブパネル表示時の処理
     NSSavePanel *theSavePanel = (NSSavePanel *)[[_editorView window] attachedSheet];
     if (theSavePanel != nil) {
         NSEnumerator *theEnumerator = [[[theSavePanel contentView] subviews] objectEnumerator];
@@ -308,6 +328,16 @@ - (void)runModalSavePanelForSaveOperation:(NSSaveOperationType)inSaveOperation d
             NSText *theText = [theSavePanel fieldEditor:NO forObject:theTextField];
             NSString *theName = [theText string];
 
+            // 保存時に拡張子を追加する
+            id theValues = [[NSUserDefaultsController sharedUserDefaultsController] values];
+            if ([[theValues valueForKey:k_key_appendExtensionAtSaving] boolValue]) {
+                // ファイル名に拡張子がない場合は追加する
+                if ([[theName pathExtension] compare:@""] == NSOrderedSame) {
+                    [theText setString:[theName stringByAppendingPathExtension:@"txt"]];
+                }
+            }
+
+            // 保存するファイル名の、拡張子をのぞいた部分を選択状態にする
             [theText setSelectedRange:NSMakeRange(0, [[theName stringByDeletingPathExtension] length])];
         }
     }

diff --git a/CotEditor_Lion.xcodeproj/project.pbxproj b/CotEditor_Lion.xcodeproj/project.pbxproj
diff --git a/Docs/EN/History-en.rtf b/Docs/EN/History-en.rtf
diff --git a/Docs/EN/ReadMe-en.rtf b/Docs/EN/ReadMe-en.rtf
@@ -1,29 +1,29 @@
-{\rtf1\ansi\ansicpg932\cocoartf1038\cocoasubrtf350
+{\rtf1\ansi\ansicpg932\cocoartf1138\cocoasubrtf230
 \readonlydoc1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset128 HiraKakuProN-W3;}
 {\colortbl;\red255\green255\blue255;}
-\vieww9000\viewh8400\viewkind0
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\vieww13460\viewh13880\viewkind0
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
-\f0\b\fs30 \cf0 CotEditor 1.2\
+\f0\b\fs30 \cf0 CotEditor 1.3\
 ReadMe\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\qr
 
-\b0\fs24 \cf0 2011.05.23\
+\b0\fs24 \cf0 2012.02.10\
 \
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \b \cf0 About Regular Expression Syntax For Coloring\
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \b0 \cf0 From version 0.9.5, CotEditor's syntax coloring function uses RegexKitLite instead of OgreKit for its regular expression search in order to improve coloring speed (the Find or Outline Menu functions use OgreKit as before). Their regular expression syntax are slightly different from each other.\
 The default coloring rules are not affected by the differences, but if you have your own rules, see the following references to make sure they work properly.\
 \
 Oniguruma Regular Expressions (used by OgreKit)\
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 {\field{\*\fldinst{HYPERLINK "http://www.geocities.jp/kosako3/oniguruma/doc/RE.txt"}}{\fldrslt \cf0 http://www.geocities.jp/kosako3/oniguruma/doc/RE.txt}}\
 \
 ICU Regular Expressions (used by RegexKitLite)\
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 {\field{\*\fldinst{HYPERLINK "http://regexkit.sourceforge.net/RegexKitLite/#ICURegularExpressionSyntax"}}{\fldrslt \cf0 http://regexkit.sourceforge.net/RegexKitLite/#ICURegularExpressionSyntax}}
 \b \
 \
@@ -33,7 +33,7 @@ Requirements
 Mac OS X 10.4+\
 \
 \
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \b \cf0 License
 \b0 \
@@ -51,34 +51,40 @@ GPL (GNU GENERAL PUBLIC LICENSE)\
 \b0 \
 # CotEditor source code is available for download at the following site (see the \'93Distribution Site\'94 section below).\
 # CotEditor is written in Objective-C (UTF-8).\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 \cf0 \
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 \cf0 \
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \b \cf0 Development Environment
 \b0 \
+(For 10.7)\
 MacBook Air (Late 2010)\
-Mac OS X 10.6.7\
+Mac OS X 10.7.3\
+Xcode 4.2.1\
+\
+(For 10.4/10.5/10.6)\
+MacBook (Early 2008)\
+Mac OS X 10.6.8\
 Xcode 3.2.5\
 \
 \
 
 \b Distribution Site
 \b0 \
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 {\field{\*\fldinst{HYPERLINK "http://sourceforge.jp/projects/coteditor/"}}{\fldrslt \cf0 http://sourceforge.jp/projects/coteditor/}}\
 \
 \
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \b \cf0 Copyrights
 \b0 \
 CotEditor\
 Copyright (c) 2005 nakamuxu\
 Copyright (c) 2011 usami-k\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 \cf0  All rights reserved.\
 \
 OgreKit  ({\field{\*\fldinst{HYPERLINK "http://www8.ocn.ne.jp/~sonoisa/OgreKit/"}}{\fldrslt http://www8.ocn.ne.jp/~sonoisa/OgreKit/}})\
@@ -88,19 +94,19 @@ Copyright (c) 2003 Isao Sonobe\
 Oniguruma  ({\field{\*\fldinst{HYPERLINK "http://www.geocities.jp/kosako3/oniguruma/"}}{\fldrslt http://www.geocities.jp/kosako3/oniguruma/}})\
 Copyright (c) 2002  K.Kosako\
  All rights reserved.\
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 \cf0 \
 Smultron  ({\field{\*\fldinst{HYPERLINK "http://smultron.sourceforge.net/"}}{\fldrslt http://smultron.sourceforge.net/}})\
 Copyright (c) 2004 Peter Borg\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 \cf0  All rights reserved.\
 \
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 \cf0 UKKQuete  ({\field{\*\fldinst{HYPERLINK "http://www.zathras.de/angelweb/sourcecode.htm"}}{\fldrslt http://www.zathras.de/angelweb/sourcecode.htm}})\
 Copyright (c) 2003-06 M. Uli Kusterer\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 \cf0  All rights reserved.\
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 \cf0 \
 FJDDetectEncoding  ({\field{\*\fldinst{HYPERLINK "http://blogs.dion.ne.jp/fujidana/archives/4169016.html"}}{\fldrslt http://blogs.dion.ne.jp/fujidana/archives/4169016.html}})\
 Copyright (c) 2006 FUJIDANA\
@@ -111,12 +117,12 @@ Copyright (c) 2008 John Engelhart\
  All rights reserved.\
 \
 \
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \b \cf0 Acknowledgments
 \b0 \
 I'm deeply grateful for those who let me use their valuable programs/information for making CotEditor.\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 \cf0 *  Thanks to kaz ({\field{\*\fldinst{HYPERLINK "http://pbx.homeunix.org/jam_log/"}}{\fldrslt http://pbx.homeunix.org/jam_log/}}) for providing the application/document icon, and for creating the syntax definition file for PHP.\
 *  Thanks to Y.Yamamoto for providing the toolbar/preferences icons, and for translating documentation and help files into English.\
 *  Thanks to s.sawada ({\field{\*\fldinst{HYPERLINK "http://www.mouseup.net/diary/"}}{\fldrslt http://www.mouseup.net/diary/}}) for providing the Ruby sample script.\
@@ -139,6 +145,6 @@ Also, thanks to the information regarding the use of UKKQueue by kimura wataru (
 *  Thanks to the web site HMDT ({\field{\*\fldinst{HYPERLINK "http://hmdt.jp/"}}{\fldrslt http://hmdt.jp/}}) for a lot of useful information.\
 *  Thanks to the web site Cocoabuilder ({\field{\*\fldinst{HYPERLINK "http://www.cocoabuilder.com/"}}{\fldrslt http://www.cocoabuilder.com/}}) for a lot of useful information.\
 *  Thanks to mi by Daisuke Kamiyama ({\field{\*\fldinst{HYPERLINK "http://www.mimikaki.net/"}}{\fldrslt http://www.mimikaki.net/}}) on which the pre-formatted strings of CotEditor's File Drop function are based.\
-\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 \cf0 \
 }