MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

vcs: Update tool window shortcuts

Browse Source 
* "Commit" tool window - Alt/Meta + 9
* "Version Control" tool window - Alt/Meta + Shift + 9
* "Show VCS Log" action - Alt/Meta + Ctrl + 9

GitOrigin-RevId: 0991e62f6cc937084c1570276d535799413aa566
This commit is contained in:
Konstantin Kolosovsky
2020-01-22 02:33:41 +00:00
committed by intellij-monorepo-bot
parent 3c94648ac6
commit 1b86de6fd0
9 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/keymaps/$default.xml
+9 -3
View File
@@ -911,13 +911,19 @@
<action id="ActivateServicesToolWindow">
<keyboard-shortcut first-keystroke="alt 8"/>
</action>
<action id="ActivateVersionControlToolWindow">
<action id="ActivateCommitToolWindow">
<keyboard-shortcut first-keystroke="alt 9"/>
</action>
<action id="ActivateVersionControlToolWindow">
<keyboard-shortcut first-keystroke="alt shift 9"/>
<keyboard-shortcut first-keystroke="alt 9"/>
</action>
<action id="Vcs.Show.Log">
<keyboard-shortcut first-keystroke="alt control 9"/>
</action>
<action id="NewElement">
<keyboard-shortcut first-keystroke="alt INSERT"/>
</action>
<keyboard-shortcut first-keystroke="alt INSERT"/>
</action>
<action id="NewElementSamePlace">
<keyboard-shortcut first-keystroke="control alt INSERT"/>
</action>
platform/platform-resources/src/keymaps/Default for GNOME.xml
-3
View File
@@ -30,9 +30,6 @@
<keyboard-shortcut first-keystroke="shift alt 1" />
<keyboard-shortcut first-keystroke="alt F1" />
</action>
<action id="RunToCursor">
<keyboard-shortcut first-keystroke="shift alt 9" />
</action>
<action id="SelectIn">
<keyboard-shortcut first-keystroke="shift alt 1" />
<keyboard-shortcut first-keystroke="alt F1" />
platform/platform-resources/src/keymaps/Default for KDE.xml
-3
View File
@@ -79,9 +79,6 @@
<action id="RestoreDefaultLayout">
<keyboard-shortcut first-keystroke="shift alt F12"/>
</action>
<action id="RunToCursor">
<keyboard-shortcut first-keystroke="shift alt 9"/>
</action>
<action id="SelectIn">
<keyboard-shortcut first-keystroke="shift alt 1"/>
</action>
platform/platform-resources/src/keymaps/Default for XWin.xml
+2 -6
View File
@@ -1,14 +1,10 @@
<keymap version="1" name="Default for XWin" disable-mnemonics="false" parent="$default">
<action id="ForceRunToCursor">
<keyboard-shortcut first-keystroke="control alt 9"/>
</action>
<action id="RunToCursor"/>
<action id="ForceRunToCursor"/>
<action id="QuickEvaluateExpression">
<keyboard-shortcut first-keystroke="control alt 8"/>
<mouse-shortcut keystroke="control shift alt button1"/>
</action>
<action id="ActivateVersionControlToolWindow">
<keyboard-shortcut first-keystroke="alt 9"/>
</action>
<action id="ShowUsages">
<keyboard-shortcut first-keystroke="control alt 7"/>
</action>
platform/platform-resources/src/keymaps/Mac OS X 10.5+.xml
+7 -1
View File
@@ -213,9 +213,15 @@
<action id="ActivateServicesToolWindow">
<keyboard-shortcut first-keystroke="meta 8"/>
</action>
<action id="ActivateVersionControlToolWindow">
<action id="ActivateCommitToolWindow">
<keyboard-shortcut first-keystroke="meta 9"/>
</action>
<action id="ActivateVersionControlToolWindow">
<keyboard-shortcut first-keystroke="meta shift 9"/>
<keyboard-shortcut first-keystroke="meta 9"/>
</action>
<action id="Vcs.Show.Log">
<keyboard-shortcut first-keystroke="meta control 9"/>
</action>
<action id="NextWindow">
<keyboard-shortcut first-keystroke="meta BACK_QUOTE"/>
platform/platform-resources/src/keymaps/Mac OS X.xml
+7 -1
View File
@@ -231,9 +231,15 @@
<action id="ActivateServicesToolWindow">
<keyboard-shortcut first-keystroke="meta 8"/>
</action>
<action id="ActivateVersionControlToolWindow">
<action id="ActivateCommitToolWindow">
<keyboard-shortcut first-keystroke="meta 9"/>
</action>
<action id="ActivateVersionControlToolWindow">
<keyboard-shortcut first-keystroke="meta shift 9"/>
<keyboard-shortcut first-keystroke="meta 9"/>
</action>
<action id="Vcs.Show.Log">
<keyboard-shortcut first-keystroke="meta control 9"/>
</action>
<action id="NextWindow">
<keyboard-shortcut first-keystroke="meta BACK_QUOTE"/>
platform/platform-resources/src/keymaps/Xcode.xml
+7
View File
@@ -22,9 +22,16 @@
<keyboard-shortcut first-keystroke="meta 7" />
<keyboard-shortcut first-keystroke="shift meta Y" />
</action>
<action id="ActivateCommitToolWindow">
<keyboard-shortcut first-keystroke="meta 2"/>
</action>
<action id="ActivateVersionControlToolWindow">
<keyboard-shortcut first-keystroke="meta shift 2"/>
<keyboard-shortcut first-keystroke="meta 2" />
</action>
<action id="Vcs.Show.Log">
<keyboard-shortcut first-keystroke="meta control 2"/>
</action>
<action id="FileStructurePopup">
<keyboard-shortcut first-keystroke="control 6"/>
<keyboard-shortcut first-keystroke="meta F12"/>
platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java
+9 -8
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.keymap;
import com.intellij.util.containers.ContainerUtil;
@@ -30,6 +30,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
"SearchEverywhere.CompleteCommand", "SearchEverywhere.NextTab"},
{ "LEFT", "EditorLeft", "Vcs.Log.GoToChild"},
{ "RIGHT", "EditorRight", "Vcs.Log.GoToParent"},
{ "alt 9", "ActivateCommitToolWindow", "ActivateVersionControlToolWindow"},
{ "alt DOWN", "ShowContent", "MethodDown", "Arrangement.Rule.Match.Condition.Move.Down", "ShowSearchHistory"},
{ "alt UP", "MethodUp", "Arrangement.Rule.Match.Condition.Move.Up"},
{ "alt F1", "SelectIn", "ProjectViewChangeView"},
@@ -137,6 +138,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "meta 1", "ActivateProjectToolWindow", "FileChooser.GotoHome", "DuplicatesForm.SendToLeft"},
{ "meta 2", "ActivateFavoritesToolWindow", "FileChooser.GotoProject", "DuplicatesForm.SendToRight"},
{ "meta 3", "ActivateFindToolWindow", "FileChooser.GotoModule"},
{ "meta 9", "ActivateCommitToolWindow", "ActivateVersionControlToolWindow"},
{ "meta N", "FileChooser.NewFolder", "Generate", "NewElement"},
{ "meta O", "GotoClass", "GotoChangedFile"},
{ "shift ctrl LEFT", "Diff.ApplyRightSide", "PreviousEditorTab"},
@@ -169,6 +171,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "meta 1", "ActivateProjectToolWindow", "FileChooser.GotoHome", "DuplicatesForm.SendToLeft"},
{ "meta 2", "ActivateFavoritesToolWindow", "FileChooser.GotoProject", "DuplicatesForm.SendToRight"},
{ "meta 3", "ActivateFindToolWindow", "FileChooser.GotoModule"},
{ "meta 9", "ActivateCommitToolWindow", "ActivateVersionControlToolWindow"},
{ "shift ctrl LEFT", "Diff.ApplyRightSide", "PreviousEditorTab"},
{ "shift ctrl RIGHT", "Diff.ApplyLeftSide", "NextEditorTab"},
{ "shift meta LEFT", "EditorLineStartWithSelection", "ResizeToolWindowLeft"},
@@ -393,13 +396,11 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
// @formatter:on
@NonNls protected static final Set<String> DEFAULT_UNKNOWN_ACTION_IDS = ContainerUtil.set(
"ActivateVersionControlToolWindow", "ActivateFavoritesToolWindow", "ActivateCommanderToolWindow", "ActivateDebugToolWindow",
"ActivateServicesToolWindow", "ActivateFindToolWindow",
"ActivateHierarchyToolWindow", "ActivateMessagesToolWindow", "ActivateProjectToolWindow", "ActivateRunToolWindow",
"ActivateStructureToolWindow", "ActivateTODOToolWindow", "ActivateWebToolWindow", "ActivatePaletteToolWindow",
"ActivateTerminalToolWindow",
"IDEtalk.SearchUserHistory", "IDEtalk.SearchUserHistory", "IDEtalk.Rename",
"CIDR.Lang.Cpp.GenerateDefinitions",
"ActivateCommitToolWindow", "ActivateVersionControlToolWindow", "ActivateFavoritesToolWindow", "ActivateCommanderToolWindow",
"ActivateDebugToolWindow", "ActivateServicesToolWindow", "ActivateFindToolWindow", "ActivateHierarchyToolWindow",
"ActivateMessagesToolWindow", "ActivateProjectToolWindow", "ActivateRunToolWindow", "ActivateStructureToolWindow",
"ActivateTODOToolWindow", "ActivateWebToolWindow", "ActivatePaletteToolWindow", "ActivateTerminalToolWindow",
"IDEtalk.SearchUserHistory", "IDEtalk.SearchUserHistory", "IDEtalk.Rename", "CIDR.Lang.Cpp.GenerateDefinitions",
""
);
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/VcsActionPromoter.java
+2 -15
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.vcs.actions;
import com.intellij.openapi.actionSystem.ActionManager;
@@ -34,6 +20,7 @@ public class VcsActionPromoter implements ActionPromoter {
List<AnAction> reorderedActions = new ArrayList<>(actions);
List<String> reorderedIds = ContainerUtil.map(reorderedActions, it -> am.getId(it));
reorderActionPair(reorderedActions, reorderedIds, "ActivateCommitToolWindow", "ActivateVersionControlToolWindow");
reorderActionPair(reorderedActions, reorderedIds, "Vcs.MoveChangedLinesToChangelist", "ChangesView.Move");
reorderActionPair(reorderedActions, reorderedIds, "Vcs.RollbackChangedLines", "ChangesView.Revert");