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: use action with name 'Show Diff' as base for CommonShortcuts.getDiff()

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-04-24 20:10:08 +03:00
parent 4f0eebbf3a
commit af2475a3c9
8 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class CommonShortcuts {
}
public static ShortcutSet getDiff() {
return shortcutsById(IdeActions.ACTION_SHOW_DIFF);
return shortcutsById(IdeActions.ACTION_SHOW_DIFF_COMMON);
}
public static ShortcutSet getFind() {
platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java
+1 -1
View File
@@ -155,7 +155,7 @@ public interface IdeActions {
@NonNls String ACTION_CLOSE_ALL_UNMODIFIED_EDITORS = "CloseAllUnmodifiedEditors";
@NonNls String ACTION_CLOSE_ALL_EDITORS_BUT_THIS = "CloseAllEditorsButActive";
@NonNls String ACTION_SHOW_DIFF = "CompareTwoFiles";
@NonNls String ACTION_SHOW_DIFF_COMMON = "Diff.ShowDiff";
@NonNls String ACTION_PREVIOUS_DIFF = "PreviousDiff";
@NonNls String ACTION_NEXT_DIFF = "NextDiff";
platform/platform-resources-en/src/messages/ActionsBundle.properties
+2
View File
@@ -228,6 +228,8 @@ action.NewClass.text=Java Class
action.NewFile.text=File
action.NewDir.text=Directory/Package
action.NewFromTemplate.text=From Template
action.Diff.ShowDiff.text=Show Diff
action.Diff.ShowDiff.description=Show diff for selected changes
action.CompareTwoFiles.text=Compare _Files
action.CompareTwoFiles.description=Compare two selected files or folders
action.CompareFileWithEditor.text=Co_mpare File with Editor
platform/platform-resources/src/idea/Keymap_Default.xml
+3
View File
@@ -464,6 +464,9 @@
<action id="CompareTwoFiles">
<keyboard-shortcut first-keystroke="control D"/>
</action>
<action id="Diff.ShowDiff">
<keyboard-shortcut first-keystroke="control D"/>
</action>
<action id="Diff.ShowSettingsPopup">
<keyboard-shortcut first-keystroke="control shift D"/>
</action>
platform/platform-resources/src/idea/LangActions.xml
+1 -1
View File
@@ -854,7 +854,7 @@
<group>
<action class="com.intellij.execution.testframework.actions.ViewAssertEqualsDiffAction"
text="View assertEquals Difference" id="openAssertEqualsDiff" use-shortcut-of="CompareTwoFiles"/>
text="View assertEquals Difference" id="openAssertEqualsDiff" use-shortcut-of="Diff.ShowDiff"/>
<separator/>
<add-to-group anchor="first" group-id="TestTreePopupMenu"/>
</group>
platform/platform-resources/src/idea/PlatformActions.xml
+1
View File
@@ -158,6 +158,7 @@
<group id="VcsGeneral.KeymapGroup"/> <!-- grouping for Settings -> Keymap -> Version Control Systems -->
<group id="Diff.KeymapGroup" text="Diff">
<action id="Diff.ShowDiff" class="com.intellij.openapi.actionSystem.EmptyAction" icon="AllIcons.Actions.Diff"/> <!-- CommonShortcuts.getDiff() -->
<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
+3 -3
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" use-shortcut-of="CompareTwoFiles"/>
icon="AllIcons.Actions.Diff" use-shortcut-of="Diff.ShowDiff"/>
</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" use-shortcut-of="CompareTwoFiles"/>
icon="AllIcons.Actions.Diff" use-shortcut-of="Diff.ShowDiff"/>
<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"/>
@@ -229,7 +229,7 @@
<reference ref="EditSource"/>
<reference ref="$Delete"/>
<action id="Diff.UpdatedFiles" class="com.intellij.openapi.vcs.update.ShowUpdatedDiffAction"
use-shortcut-of="CompareTwoFiles" icon="AllIcons.Actions.Diff"/>
use-shortcut-of="Diff.ShowDiff" icon="AllIcons.Actions.Diff"/>
</group>
<group id="Vcs.MessageActionGroup">
platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
+5 -5
View File
@@ -92,7 +92,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "control ENTER", "EditorSplitLine", "ViewSource", "Console.Execute.Multiline"},
{ "control EQUALS", "ExpandAll", "ExpandRegion"},
{ "control F5", "Refresh", "Rerun"},
{ "control D", "EditorDuplicate", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "control D", "EditorDuplicate", "Diff.ShowDiff", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "control M", "EditorScrollToCenter", "Vcs.ShowMessageHistory"},
{ "control N", "FileChooser.NewFolder", "GotoClass", "GotoChangedFile"},
{ "control P", "FileChooser.TogglePathShowing", "ParameterInfo"},
@@ -182,7 +182,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "control 2", "FileChooser.GotoProject", "GotoBookmark2", "DuplicatesForm.SendToRight"},
{ "control 3", "GotoBookmark3", "FileChooser.GotoModule"},
{ "control 5", "ChangeSplitOrientation", "GotoBookmark5"},
{ "control D", "$Delete", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "control D", "$Delete", "Diff.ShowDiff", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "control K", "EditorCutLineEnd", "CheckinProject"},
{ "control N", "EditorDown", "FileChooser.NewFolder"},
{ "control P", "EditorUp", "FileChooser.TogglePathShowing"},
@@ -250,7 +250,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "alt HOME", "ViewNavigationBar", "ShowNavBar"},
{ "control F10", "ShowPopupMenu", "javaee.UpdateRunningApplication", "liveedit.UpdateRunningApplication"},
{ "control F11", "Rerun", "ToggleBookmarkWithMnemonic"},
{ "control D", "EditorDeleteLine", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "control D", "EditorDeleteLine", "Diff.ShowDiff", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "control N", "ShowPopupMenu", "FileChooser.NewFolder"},
{ "control P", "FileChooser.TogglePathShowing", "Print"},
{ "control R", "RunToCursor", "Console.TableResult.Reload", "org.jetbrains.plugins.ruby.rails.console.ReloadSources"},
@@ -288,7 +288,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "control 3", "ActivateProjectToolWindow", "FileChooser.GotoModule"},
{ "control BACK_SPACE", "EditorDeleteToWordStart", "ToggleDockMode"},
{ "control DIVIDE", "CollapseRegionRecursively", "Images.Editor.ActualSize"},
{ "control D", "EditorDuplicate", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "control D", "EditorDuplicate", "Diff.ShowDiff", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "control M", "Vcs.ShowMessageHistory", "Move"},
{ "control R", "RenameElement", "Console.TableResult.Reload", "org.jetbrains.plugins.ruby.rails.console.ReloadSources"},
{ "control SLASH", "CommentByLineComment", "Images.Editor.ActualSize"},
@@ -333,7 +333,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "control PERIOD", "EditorChooseLookupItemDot", "HippieCompletion"},
{ "meta 1", "FileChooser.GotoHome", "ShowIntentionActions", "DuplicatesForm.SendToLeft"},
{ "meta 3", "FileChooser.GotoModule", "GotoAction"},
{ "meta D", "EditorDeleteLine", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "meta D", "EditorDeleteLine", "Diff.ShowDiff", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "meta I", "DatabaseView.PropertiesAction", "AutoIndentLines"},
{ "meta P", "FileChooser.TogglePathShowing", "Print"},
{ "meta R", "org.jetbrains.plugins.ruby.rails.console.ReloadSources", "RunToCursor"},