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

diff: remove duplicated actions from keymap

Browse Source 
these shortcuts did nothing anyway, because ChangesViewManages assighned CommonShortcuts.getDiff() instead
This commit is contained in:
Aleksey Pivovarov
2015-04-23 18:12:51 +03:00
parent 6d9c1caa12
commit d3447ca2cb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/idea/PlatformActions.xml
+1 -1
View File
@@ -158,7 +158,7 @@
<group id="VcsGeneral.KeymapGroup"/> <!-- grouping for Settings -> Keymap -> Version Control Systems -->
<group id="Diff.KeymapGroup" text="Diff">
<action id="CompareTwoFiles" class="com.intellij.diff.actions.CompareFilesAction"/>
<action id="CompareTwoFiles" class="com.intellij.diff.actions.CompareFilesAction" icon="AllIcons.Actions.Diff"/>
<action id="CompareFileWithEditor" class="com.intellij.diff.actions.CompareFileWithEditorAction"/>
<action id="CompareClipboardWithSelection" class="com.intellij.diff.actions.CompareClipboardWithSelectionAction"/>
platform/platform-resources/src/idea/VcsActions.xml
+2 -2
View File
@@ -88,7 +88,7 @@
<action id="ChangesView.Move" class="com.intellij.openapi.vcs.changes.actions.MoveChangesToAnotherListAction"
icon="AllIcons.Actions.MoveToAnotherChangelist"/>
<action id="ChangesView.Diff" class="com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction"
icon="AllIcons.Actions.Diff"/>
icon="AllIcons.Actions.Diff" use-shortcut-of="CompareTwoFiles"/>
</group>
<group id="AlienCommitChangesDialog.AdditionalActions"/>
@@ -137,7 +137,7 @@
text="Unshelve..." description="Correct paths where to apply patches and unshelve"/>
<action id="ShelvedChanges.Restore" class="com.intellij.openapi.vcs.changes.shelf.RestoreShelvedChange"/>
<action id="ShelvedChanges.Diff" class="com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesAction"
icon="AllIcons.Actions.Diff"/>
icon="AllIcons.Actions.Diff" use-shortcut-of="CompareTwoFiles"/>
<action id="ChangesView.CreatePatchFromChanges" class="com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction"
icon="AllIcons.Actions.CreatePatch"/>
<action id="ShelvedChanges.ImportPatches" class="com.intellij.openapi.vcs.changes.shelf.ImportIntoShelfAction"/>