Merge branch 'release/2.1.4'

coteditor · Jul 12, 2015 · 7974a16 · 7974a16
2 parents 8c76c0b + 3bf957f
commit 7974a16
Show file tree

Hide file tree

Showing 44 changed files with 538 additions and 481 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 Change Log
 ==========================
 
-develop
+2.1.4
 --------------------------
 
 ### New Features
@@ -16,18 +16,24 @@ develop
 - Support Automatic Termination (Now, CotEditor can be terminated automatically if it has no window).
 - Display invisible vertical tab (`U+000B`) with `␋` symbol if “Show other invisible characters” turns on.
 - Add fancy animations to encoding list edit sheet in preferences.
+- Add suppression button to the IANA charset name conflict alret.
+- Improve word completion with words that exist in the document.
+- Modify layout of “General” pane in Preferences.
 - Add tooltip hint to controls in the find panel.
+- Optimize image resources size.
 - Update Sparkle framework to version 1.10.0.
 
 
 ### Fixes
 
-- Fix an issue where the application could hang up on document saving.
+- Address an issue where the application could hang up on document saving.
 - Fix an issue where the autosaving could sometime be disabled.
 - Fix an issue where the layout of the text fields in the find panel could rarely be broken.
 - Fix an issue where the auto-update notifier did not recognize a new stable version from specific beta version numbers.
 - Fix an issue where some 3rd-party text editors for OS X cannot interpret files which were created by CotEditor.
-- Fix an issue where selection after modifying sort of extnsion priority in syntax style edit sheet was wrong.
+- Fix an issue where an unwanted alert did show on the first save after reverting back.
+- Fix an issue where selection after modifying sort of extension priority in syntax style edit sheet was wrong.
+- Fix an issue where “Help” menu item duplicated in the menu bar on the second launch.
 - Add some missing Localized strings in simplified Chinese. (Thanks to Wei Wang!)
 - Improve general stability.
 

diff --git a/CotEditor/Base.lproj/FileDropPane.xib b/CotEditor/Base.lproj/FileDropPane.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="CEFileDropPaneController">
@@ -281,9 +281,10 @@ The parent directory name of the dropped file.
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="447">
+                                <rect key="frame" x="0.0" y="0.0" width="228" height="0.0"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
                                     <tableColumn identifier="extensions" width="225" minWidth="40" maxWidth="1000" id="448">

diff --git a/CotEditor/Base.lproj/GeneralPane.xib b/CotEditor/Base.lproj/GeneralPane.xib
diff --git a/CotEditor/Base.lproj/MainMenu.xib b/CotEditor/Base.lproj/MainMenu.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7702"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -23,12 +24,6 @@
                                     <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Check for Updates…" id="832">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="checkForUpdates:" target="831" id="833"/>
-                                </connections>
-                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="202">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
@@ -1023,12 +1018,6 @@
         </customObject>
         <customObject id="329" customClass="CEDocumentController"/>
         <customObject id="432" customClass="NSFontManager"/>
-        <customObject id="831" customClass="SUUpdater">
-            <connections>
-                <outlet property="delegate" destination="r3q-qM-B4R" id="1bv-9k-Sz0"/>
-            </connections>
-        </customObject>
-        <customObject id="r3q-qM-B4R" customClass="CEUpdaterDelegate"/>
     </objects>
     <resources>
         <image name="ScriptTemplate" width="22" height="22"/>

diff --git a/CotEditor/CotEditor.help/Contents/Resources/Shared/sty/standard.css b/CotEditor/CotEditor.help/Contents/Resources/Shared/sty/standard.css
@@ -11,7 +11,7 @@
 
 
 body {
-	font: 10pt/1.5 'Helvetica Neue', sans-serif;
+	font: 10pt/1.5 -apple-system-font, 'Helvetica Neue', sans-serif;
 	color: hsla(0,0%,0%,0.8);
 	margin: 0;
 	padding: 1.5em;
@@ -33,10 +33,11 @@ hr {
 
 code {
 	font-family: 'menlo', monospace;
-	font-size: 95%;
+	font-size: 90%;
 }
 
 body > h1 {
+    font-family: 'Helvetica Neue', sans-serif;
 	font-size: 160%;
 	font-weight: 300;
 	margin: 0 0 1.5em;

diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/pref_general.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/pref_general.html
@@ -23,20 +23,10 @@ <h1>General preferences</h1>
 <p>The General preferences control various overall behaviors of CotEditor.</p>
 
 <dl>
-	<dt>On launch</dt>
-	<dd>You can set the application behavior on launch.</dd>
-	<dd><dl>
-		<dt>Automatically check for updates</dt>
-		<dd>When this option is selected, CotEditor checks the existence of the new version via internet automatically on launch.  Then if the new one has been released, CotEditor notifies the information on the panel. You can also set the frequency of this checking here.</dd>
-
-		<dt>Open a new document</dt>
-		<dd>When this option is selected, a new blank document will be opened when you launch CotEditor.</dd>
-	</dl></dd>
-
 	<dt>Application</dt>
 	<dd>You can set the general application behavior.</dd>
 	<dd><dl>
-		<dt>Sync find strings with other applications</dt>
+		<dt>Sync find text with other applications</dt>
 		<dd>With this option selected, the Find panel automatically retrieves the latest Find string searched in another Cocoa application.</dd>
 
 		<dt>Inline script menu items into context menu</dt>
@@ -47,10 +37,25 @@ <h1>General preferences</h1>
 
 		<dt>Check spelling as you type</dt>
 		<dd>This option allows you to automatically check your spelling as you type.</dd>
+	</dl></dd>
+
+	<dt>Open a new document</dt>
+	<dd>You can set the timing to create a new document automatically.</dd>
+	<dd><dl>
+
+		<dt>On launch</dt>
+		<dd>When this option is selected, a new blank document will be opened when you launch CotEditor.</dd>
 
-		<dt>Open a new document when CotEditor becomes active</dt>
+		<dt>When CotEditor becomes active</dt>
 		<dd>With this option selected, a new blank document will be opened when you click CotEditor's icon in the Dock and you had no window already open.</dd>
 	</dl></dd>
+
+	<dt>Software Updates</dt>
+	<dd>You can set software updater behavior.</dd>
+	<dd><dl>
+		<dt>Automatically check for updates</dt>
+		<dd>When this option is selected, CotEditor checks the existence of the new version via internet automatically on launch.  Then if the new one has been released, CotEditor notifies the information on the panel.</dd>
+	</dl></dd>
 </dl>
 
 

diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html
@@ -26,7 +26,7 @@ <h1>Release Notes</h1>
 <article>
 <header>
 	<h1>CotEditor 2.1.4</h1>
-	<p>release: <time>2015-07-xx</time></p>
+	<p>release: <time>2015-07-12</time></p>
 </header>
 
 
@@ -47,7 +47,11 @@ <h2>Additions/Changes</h2>
 	<li>Support Automatic Termination (Now, CotEditor can be terminated automatically if it has no window).</li>
 	<li>Display invisible vertical tab (<code>U+000B</code>) with <code>␋</code> symbol if “Show other invisible characters” turns on.</li>
 	<li>Add fancy animations to encoding list edit sheet in preferences.</li>
+	<li>Add suppression button to the IANA charset name conflict alret.</li>
+	<li>Improve word completion with words that exist in the document.</li>
+	<li>Modify layout of “General” pane in Preferences.</li>
 	<li>Add tooltip hint to controls in the find panel.</li>
+	<li>Optimize image resources size.</li>
 	<li>Update Sparkle framework to version 1.10.0.</li>
 </ul>
 </section>
@@ -57,12 +61,14 @@ <h2>Additions/Changes</h2>
 <h2>Fixes</h2>
 
 <ul>
-	<li>Fix an issue where the application could hang up on document saving.</li>
+	<li>Address an issue where the application could hang up on document saving.</li>
 	<li>Fix an issue where the autosaving could sometime be disabled.</li>
 	<li>Fix an issue where the layout of the text fields in the find panel could rarely be broken.</li>
 	<li>Fix an issue where the auto-update notifier did not recognize a new stable version from specific beta version numbers.</li>
 	<li>Fix an issue where some 3rd-party text editors for OS X cannot interpret files which were created by CotEditor.</li>
-	<li>Fix an issue where selection after modifying sort of extnsion priority in syntax style edit sheet was wrong.</li>
+	<li>Fix an issue where an unwanted alert did show on the first save after reverting back.</li>
+	<li>Fix an issue where selection after modifying sort of extension priority in syntax style edit sheet was wrong.</li>
+	<li>Fix an issue where “Help” menu item duplicated in the menu bar on the second launch.</li>
 	<li>Add some missing Localized strings in simplified Chinese. (Thanks to Wei Wang!)</li>
 </ul>
 </section>

diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/pref_general.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/pref_general.html
@@ -23,15 +23,6 @@ <h1>環境設定：一般</h1>
 <p>起動時の動作など CotEditor の全体的な設定を行います。</p>
 
 <dl>
-	<dt>起動時</dt>
-	<dd>アプリケーション起動時の振る舞いを設定します。</dd>
-	<dd><dl>
-		<dt>自動的にアップデートを確認</dt>
-		<dd>オンにすると、起動時に CotEditor の新しいバージョンがリリースされているかをインターネット経由で自動で確認します。新しいバージョンがある場合は、その情報をパネルで通知します。確認する頻度も指定できます。</dd>
-		<dt>新規書類を開く</dt>
-		<dd>オンの場合、起動時に空の書類ウインドウを開きます。</dd>
-	</dl></dd>
-
 	<dt>アプリケーション</dt>
 	<dd>アプリケーションの振る舞いを設定します。</dd>
 	<dd><dl>
@@ -46,10 +37,26 @@ <h1>環境設定：一般</h1>
 
 		<dt>入力中に自動スペルチェック</dt>
 		<dd>オンの場合、テキスト入力中に自動的にスペルチェックされます。</dd>
+	</dl></dd>
+
+	<dt>新規書類を開く</dt>
+	<dd>新規書類を自動的に開くタイミングを設定します。</dd>
+	<dd><dl>
+		<dt>起動したとき</dt>
+		<dd>オンの場合、起動時に空の書類ウインドウを開きます。</dd>
 
-		<dt>CotEditor がアクティブになるとき新規書類を開く</dt>
+		<dt>CotEditor がアクティブになるとき</dt>
 		<dd>オンの場合、Dock の CotEditor アイコンをクリックしたときに書類が開かれていなければ、空の書類ウインドウを開きます。</dd>
 	</dl></dd>
+
+
+	<dt>ソフトウェアアップデート</dt>
+	<dd>ソフトウェアアップデートに関する振る舞いを設定します。</dd>
+	<dd><dl>
+		<dt>自動的にアップデートを確認</dt>
+		<dd>オンにすると、起動時に CotEditor の新しいバージョンがリリースされているかをインターネット経由で自動で確認します。新しいバージョンがある場合は、その情報をパネルで通知します。</dd>
+	</dl></dd>
+
 </dl>
 
 

diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html
@@ -26,7 +26,7 @@ <h1>リリースノート</h1>
 <article>
 <header>
 	<h1>CotEditor 2.1.4</h1>
-	<p>リリース: <time>2015-07-xx</time></p>
+	<p>リリース: <time>2015-07-12</time></p>
 </header>
 
 
@@ -47,7 +47,11 @@ <h2>機能改善／仕様変更</h2>
 	<li>自動終了に対応（開いているウインドウが1つないとき、状況に応じアプリケーションが自動的に終了されます）</li>
 	<li>「その他の不可視文字を表示」する設定のとき、垂直タブ (<code>U+000B</code>) を <code>␋</code> シンボルで描画</li>
 	<li>エンコーディングリスト編集シートに各種アニメーションを追加</li>
+	<li>IANA文字セットコンフリクトの表示を抑止するボタンをアラートに追加</li>
+	<li>書類中に出現する単語の補完を改善</li>
+	<li>環境設定の「一般」ペインを再配置</li>
 	<li>検索パネルのコントロールにツールチップヒントを追加</li>
+	<li>リソース画像を最適化</li>
 	<li>Sparkle framework を 1.10.0 に更新</li>
 </ul>
 </section>
@@ -57,12 +61,14 @@ <h2>機能改善／仕様変更</h2>
 <h2>バグフィックス</h2>
 
 <ul>
-	<li>書類保存時にアプリケーションがハングすることがある不具合を修正</li>
+	<li>書類保存時にアプリケーションがハングすることがある不具合を改善</li>
 	<li>自動保存がスケジュール通り行われないことがあった不具合を修正</li>
 	<li>検索パネルのフィールドのレイアウトが稀に崩れることがあった不具合を修正</li>
 	<li>自動更新通知が特定のβバージョンナンバーから安定版のアップデートを認識できなかった不具合を修正</li>
 	<li>サードパーティ製の OS X 用テキストエディタが CotEditor で作成したファイルを解釈できないことがある不具合を修正</li>
+	<li>書類更新後の初回の保存で不要なアラートが出現していた不具合を修正</li>
 	<li>シンタックススタイル編集シートで、拡張子の優先順位を変更した後の選択項目が誤っていた不具合を修正</li>
+	<li>2回目の起動時にメニューバーの「ヘルプ」メニュー項目が2重に表示された不具合を修正</li>
 	<li>簡体中国語のローカライズが一部抜けていた不具合を修正 (Wei Wangさんに感謝!)</li>
 </ul>
 </section>