Make panel key bindings cutomizable

CHANGELOG.md

@@ -7,14 +7,15 @@ Change Log
 
 ### Additions/Changes
 
-- Now, return with Shift key in find text field finds text backwards.
-- Always bring focus to the find text field when find panel is called.
+- Make key bindings for panel windows customizable.
+- [beta] Now, return with Shift key in find text field finds text backwards.
+- [beta] Always bring focus to the find text field when find panel is called.
 
 
 ### Fixes
 
-- Fix an issue where find panel could fail to set escape character.
-- Fix an issue where `cot` command couldn't open relative path.
+- [beta] Fix an issue where find panel could fail to set escape character.
+- [beta] Fix an issue where `cot` command couldn't open relative path.
 
 
 

CotEditor/Base.lproj/MainMenu.xib

@@ -1,7 +1,6 @@
 <?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="6254" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
     </dependencies>
     <objects>
@@ -889,24 +888,19 @@
                             <menuItem isSeparatorItem="YES" id="622">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Panels" tag="7999" id="649">
+                            <menuItem title="Panels" id="649">
                                 <menu key="submenu" title="Panels" id="650">
                                     <items>
-                                        <menuItem title="Window Opacity Panel" keyEquivalent="1" id="655">
-                                            <connections>
-                                                <action selector="showOpacityPanel:" target="290" id="G8h-8R-17R"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Color Code Panel" tag="2" keyEquivalent="2" id="651">
-                                            <connections>
-                                                <action selector="showHexColorCodeEditor:" target="290" id="yVn-uY-7Wr"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Console Panel" keyEquivalent="3" id="653">
+                                        <menuItem title="Console Panel" keyEquivalent="1" id="653">
                                             <connections>
                                                 <action selector="showConsolePanel:" target="290" id="glc-xb-NG9"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="Color Code Panel" keyEquivalent="2" id="651">
+                                            <connections>
+                                                <action selector="showColorCodePanel:" target="290" id="0bX-dd-iko"/>
+                                            </connections>
+                                        </menuItem>
                                     </items>
                                 </menu>
                             </menuItem>

CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html

@@ -73,6 +73,10 @@
 	<li>テキストキーバインドのユーザ設定を保存するタイミングを遅延</li>
 	<li>書類タイプをローカライズ</li>
 	<li>ビューが半透明時のテキストレンダリングを改善</li>
+	<li>“Markdown”シンタックス定義を更新
+		<ul>
+		<li>水平線をアウトラインメニューに追加</li>
+	</ul></li>
 	<li>テキスト描画のパフォーマンスを改善</li>
 </ul>
 </section>
@@ -99,10 +103,6 @@
 	<li>メインメニューの「行高」でチェックマークが表示されていなかった不具合を修正</li>
 	<li>簡体中国語のローカライズが一部抜けていた不具合を修正 (Wei Wangさんに感謝!)</li>
 	<li>とあるアラートメッセージがローカライズされていなかった不具合を修正</li>
-	<li>“Markdown”シンタックス定義を更新
-		<ul>
-		<li>水平線をアウトラインメニューに追加</li>
-	</ul></li>
 	<li>ほか、UI に関する些細な修正と改善</li>
 </ul>
 </section>

CotEditor/KeyBindings/MenuKeyBindings.plist

@@ -42,6 +42,10 @@
 	<string>shiftRight:</string>
 	<key>@/</key>
 	<string>toggleComment:</string>
+	<key>@1</key>
+	<string>showConsolePanel:</string>
+	<key>@2</key>
+	<string>showColorCodePanel:</string>
 	<key>@a</key>
 	<string>selectAll:</string>
 	<key>@c</key>

CotEditor/Sources/CEAppDelegate.m

@@ -474,7 +474,7 @@
 
 // ------------------------------------------------------
 /// show color code editor panel
-- (IBAction)showHexColorCodeEditor:(id)sender
+- (IBAction)showColorCodePanel:(id)sender
 // ------------------------------------------------------
 {
     [[CEColorCodePanelController sharedController] showWindow:self];

CotEditor/Sources/CEKeyBindingManager.m

@@ -251,7 +251,6 @@ static NSDictionary *kUnprintableKeyTable;
     for (NSMenuItem *item in [menu itemArray]) {
         if ([item isSeparatorItem] || [item isAlternate] || ([[item title] length] == 0) ||
             ([item tag] == CEServicesMenuItemTag) ||
-            ([item tag] == CEWindowPanelsMenuItemTag) ||
             ([item tag] == CEScriptMenuDirectoryTag))
         {
             continue;
@@ -437,7 +436,6 @@ static NSDictionary *kUnprintableKeyTable;
         // フォントサイズ変更、エンコーディングの各項目、カラーリングの各項目、などは変更しない
         if ([[CEKeyBindingManager selectorStringsToIgnore] containsObject:NSStringFromSelector([item action])] ||
             ([item tag] == CEServicesMenuItemTag) ||
-            ([item tag] == CEWindowPanelsMenuItemTag) ||
             ([item tag] == CEScriptMenuDirectoryTag) ||
             [item isAlternate])  // 隠しメニューは変更しない
         {
@@ -483,7 +481,6 @@ static NSDictionary *kUnprintableKeyTable;
         // フォントサイズ変更、エンコーディングの各項目、カラーリングの各項目、などは変更しない
         if ([[CEKeyBindingManager selectorStringsToIgnore] containsObject:selectorString] ||
             ([item tag] == CEServicesMenuItemTag) ||
-            ([item tag] == CEWindowPanelsMenuItemTag) ||
             ([item tag] == CEScriptMenuDirectoryTag))
         {
             continue;

CotEditor/Sources/constants.h

@@ -381,7 +381,6 @@ typedef NS_ENUM(NSInteger, CEMenuItemTag) {
     CESyntaxMenuItemTag         = 4002,
     CEThemeMenuItemTag          = 4003,
     CEServicesMenuItemTag       =  999,  // const to not list up in "Menu Key Bindings" setting
-    CEWindowPanelsMenuItemTag   = 7999,  // const to not list up in "Menu Key Bindings" setting
     CEScriptMenuDirectoryTag    = 8999,  // const to not list up in "Menu Key Bindings" setting
     
     // in script menu

CotEditor/ja.lproj/MainMenu.strings

@@ -409,12 +409,10 @@
 "649.title" = "パネル";
 /* Class = "NSMenu"; title = "Panels"; ObjectID = "650"; */
 "650.title" = "パネル";
-/* Class = "NSMenuItem"; title = "Window Opacity Panel"; ObjectID = "655"; */
-"655.title" = "不透明度パネル";
-/* Class = "NSMenuItem"; title = "Color Code Panel"; ObjectID = "651"; */
-"651.title" = "カラーコードパネル";
 /* Class = "NSMenuItem"; title = "Console Panel"; ObjectID = "653"; */
 "653.title" = "コンソールパネル";
+/* Class = "NSMenuItem"; title = "Color Code Panel"; ObjectID = "651"; */
+"651.title" = "カラーコードパネル";
 
 
 

CotEditor/zh-Hans.lproj/MainMenu.strings

@@ -409,12 +409,10 @@
 /* Class = "NSMenu"; title = "Panels"; ObjectID = "650"; */
 "650.title" = "面板";
 
-/* Class = "NSMenuItem"; title = "Window Opacity Panel"; ObjectID = "655"; */
-"655.title" = "窗口透明度设置面板";
-/* Class = "NSMenuItem"; title = "Color Code Panel"; ObjectID = "651"; */
-"651.title" = "颜色代码面板";
 /* Class = "NSMenuItem"; title = "Console Panel"; ObjectID = "653"; */
 "653.title" = "控制台面板";
+/* Class = "NSMenuItem"; title = "Color Code Panel"; ObjectID = "651"; */
+"651.title" = "颜色代码面板";