more duplicated shortcuts replaced by 'use-shortcut-of' attribute

This commit is contained in:
nik
2010-09-16 13:43:52 +04:00
parent 8fe723bdc1
commit 52e7505411
15 changed files with 19 additions and 116 deletions
+3 -7
View File
@@ -63,10 +63,8 @@
<action class="org.intellij.images.editor.actions.ZoomOutAction"
id="Images.Editor.ZoomOut"
icon="/org/intellij/images/icons/ZoomOut.png"
text="Zoom Out">
<keyboard-shortcut first-keystroke="control SUBTRACT" keymap="$default"/>
<keyboard-shortcut first-keystroke="control MINUS" keymap="$default"/>
</action>
text="Zoom Out"
use-shortcut-of="CollapseAll"/>
<action class="org.intellij.images.editor.actions.ActualSizeAction"
id="Images.Editor.ActualSize"
icon="/org/intellij/images/icons/ActualSize.png"
@@ -108,9 +106,7 @@
<separator/>
<action class="org.intellij.images.thumbnail.actions.HideThumbnailsAction"
id="Images.Thumbnails.Hide"
icon="/actions/cancel.png">
<keyboard-shortcut first-keystroke="control F4" keymap="$default"/>
</action>
icon="/actions/cancel.png" use-shortcut-of="CloseContent"/>
</group>
<group id="Images.ThumbnailsPopupMenu">
<reference id="CutCopyPasteGroup"/>
@@ -6,15 +6,6 @@
<action id="FileChooser.TogglePathShowing">
<keyboard-shortcut first-keystroke="control P"/>
</action>
<action id="GuiDesigner.ExpandSelection">
<keyboard-shortcut first-keystroke="control W"/>
</action>
<action id="GuiDesigner.ShrinkSelection">
<keyboard-shortcut first-keystroke="control shift W"/>
</action>
<action id="GuiDesigner.QuickJavadoc">
<keyboard-shortcut first-keystroke="control Q"/>
</action>
<action id="ShowSettings">
<keyboard-shortcut first-keystroke="control alt S"/>
</action>
@@ -76,12 +67,6 @@
<action id="UsageView.Include">
<keyboard-shortcut first-keystroke="INSERT"/>
</action>
<action id="UsageView.Exclude">
<keyboard-shortcut first-keystroke="DELETE"/>
</action>
<action id="UsageView.ShowRecentFindUsages">
<keyboard-shortcut first-keystroke="control E"/>
</action>
<action id="EditorJoinLines">
<keyboard-shortcut first-keystroke="control shift J"/>
</action>
@@ -253,9 +238,6 @@
<action id="EditorScrollDown">
<keyboard-shortcut first-keystroke="control DOWN"/>
</action>
<action id="MethodHierarchy.ImplementMethodAction">
<keyboard-shortcut first-keystroke="control I"/>
</action>
<action id="CompileDirty">
<keyboard-shortcut first-keystroke="control F9"/>
</action>
@@ -277,9 +259,6 @@
<action id="IntroduceVariable">
<keyboard-shortcut first-keystroke="control alt V"/>
</action>
<action id="EditorDelete">
<keyboard-shortcut first-keystroke="DELETE"/>
</action>
<action id="RecentFiles">
<keyboard-shortcut first-keystroke="control E"/>
</action>
@@ -497,10 +476,6 @@
<mouse-shortcut keystroke="button2"/>
</action>
<action id="CollapseRegion">
<keyboard-shortcut first-keystroke="control SUBTRACT"/>
<keyboard-shortcut first-keystroke="control MINUS"/>
</action>
<action id="GotoNextError">
<keyboard-shortcut first-keystroke="F2"/>
</action>
@@ -519,9 +494,6 @@
<action id="EditorPreviousWordWithSelection">
<keyboard-shortcut first-keystroke="control shift LEFT"/>
</action>
<action id="MethodHierarchy.OverrideMethodAction">
<keyboard-shortcut first-keystroke="control O"/>
</action>
<action id="EditorDownWithSelection">
<keyboard-shortcut first-keystroke="shift DOWN"/>
</action>
@@ -761,9 +733,6 @@
<action id="ActivateChangesToolWindow">
<keyboard-shortcut first-keystroke="alt 9"/>
</action>
<action id="NewElement">
<keyboard-shortcut first-keystroke="alt INSERT"/>
</action>
<action id="NewElementSamePlace">
<keyboard-shortcut first-keystroke="control alt INSERT"/>
</action>
@@ -920,7 +889,6 @@
<action id="Console.Jdbc.Execute"><keyboard-shortcut first-keystroke="control ENTER"/></action>
<action id="Console.Jdbc.Properties"><keyboard-shortcut first-keystroke="control alt ENTER"/></action>
<action id="Console.Jdbc.Close"><keyboard-shortcut first-keystroke="control shift F4"/></action>
<action id="Console.Hibernate.Execute"><keyboard-shortcut first-keystroke="control ENTER"/></action>
<action id="Console.Hibernate.GenerateSql"><keyboard-shortcut first-keystroke="control shift ENTER"/></action>
@@ -170,22 +170,16 @@
</action>
<action id="GuiDesigner.EditComponent" />
<action id="GuiDesigner.EditGroup" />
<action id="GuiDesigner.ExpandSelection" />
<action id="GuiDesigner.GoToListener">
<keyboard-shortcut first-keystroke="control T" />
<keyboard-shortcut first-keystroke="control alt B" />
</action>
<action id="GuiDesigner.QuickJavadoc">
<keyboard-shortcut first-keystroke="shift alt Q" />
</action>
<action id="GuiDesigner.ShrinkSelection" />
<action id="HighlightUsagesInFile">
<keyboard-shortcut first-keystroke="shift alt O" />
<keyboard-shortcut first-keystroke="shift control F7" />
</action>
<action id="IDEtalk.Rename" />
<action id="Images.ShowThumbnails" />
<action id="Images.Thumbnails.Hide" />
<action id="Images.Thumbnails.ToggleRecursive" />
<action id="ImplementMethods">
<keyboard-shortcut first-keystroke="shift alt P" />
@@ -210,8 +204,6 @@
<action id="MethodDown">
<keyboard-shortcut first-keystroke="shift control DOWN" />
</action>
<action id="MethodHierarchy.ImplementMethodAction" />
<action id="MethodHierarchy.OverrideMethodAction" />
<action id="MethodUp">
<keyboard-shortcut first-keystroke="shift control UP" />
</action>
@@ -224,7 +216,6 @@
<action id="MoveStatementUp">
<keyboard-shortcut first-keystroke="alt UP" />
</action>
<action id="NewElement" />
<action id="NextDiff">
<keyboard-shortcut first-keystroke="control F7" />
</action>
@@ -182,10 +182,6 @@
<keyboard-shortcut first-keystroke="LEFT"/>
<keyboard-shortcut first-keystroke="control B"/>
</action>
<action id="EditorDelete">
<keyboard-shortcut first-keystroke="DELETE"/>
<keyboard-shortcut first-keystroke="control D"/>
</action>
<action id="CloseAllEditors">
<keyboard-shortcut first-keystroke="control X" second-keystroke="control C"/>
</action>
@@ -59,9 +59,6 @@
<action id="IDEtalk.SearchUserHistory">
<keyboard-shortcut first-keystroke="shift alt 7" />
</action>
<action id="Images.Thumbnails.Hide">
<keyboard-shortcut first-keystroke="control 4" />
</action>
<action id="IntroduceVariable">
<keyboard-shortcut first-keystroke="shift alt V" />
</action>
@@ -204,11 +204,6 @@
<action id="ActivateChangesToolWindow">
<keyboard-shortcut first-keystroke="meta 9"/>
</action>
<action id="NewElement">
<keyboard-shortcut first-keystroke="meta N"/>
<keyboard-shortcut first-keystroke="control N"/>
<keyboard-shortcut first-keystroke="control ENTER"/>
</action>
<action id="Generate">
<keyboard-shortcut first-keystroke="meta N"/>
<keyboard-shortcut first-keystroke="control N"/>
@@ -299,13 +294,6 @@
</action>
<action id="GuiDesigner.ExpandSelection">
<keyboard-shortcut first-keystroke="alt UP"/>
</action>
<action id="GuiDesigner.ShrinkSelection">
<keyboard-shortcut first-keystroke="alt DOWN"/>
</action>
<action id="EditorSelectWord">
<keyboard-shortcut first-keystroke="alt UP"/>
</action>
@@ -205,10 +205,6 @@
<action id="ActivateChangesToolWindow">
<keyboard-shortcut first-keystroke="meta 9"/>
</action>
<action id="NewElement">
<keyboard-shortcut first-keystroke="control N"/>
<keyboard-shortcut first-keystroke="control ENTER"/>
</action>
<action id="Generate">
<keyboard-shortcut first-keystroke="control N"/>
<keyboard-shortcut first-keystroke="control ENTER"/>
@@ -190,21 +190,9 @@
<action id="Graph.Print">
<keyboard-shortcut first-keystroke="shift control alt P" />
</action>
<action id="GuiDesigner.DecreaseIndent">
<keyboard-shortcut first-keystroke="shift alt LEFT" />
</action>
<action id="GuiDesigner.ExpandSelection">
<keyboard-shortcut first-keystroke="shift alt PERIOD" />
</action>
<action id="GuiDesigner.IncreaseIndent">
<keyboard-shortcut first-keystroke="shift alt RIGHT" />
</action>
<action id="GuiDesigner.ReloadCustomComponents">
<keyboard-shortcut first-keystroke="shift control R" />
</action>
<action id="GuiDesigner.ShrinkSelection">
<keyboard-shortcut first-keystroke="shift alt COMMA" />
</action>
<action id="HideAllWindows" />
<action id="HippieBackwardCompletion">
<keyboard-shortcut first-keystroke="control K" />
@@ -226,8 +214,6 @@
<keyboard-shortcut first-keystroke="control alt DOWN" />
</action>
<action id="MethodHierarchy" />
<action id="MethodHierarchy.ImplementMethodAction" />
<action id="MethodHierarchy.OverrideMethodAction" />
<action id="MethodUp">
<keyboard-shortcut first-keystroke="control alt UP" />
</action>
@@ -240,7 +226,7 @@
<action id="MoveStatementUp">
<keyboard-shortcut first-keystroke="shift alt UP" />
</action>
<action id="NewElement">
<action id="Generate">
<keyboard-shortcut first-keystroke="alt INSERT" />
<keyboard-shortcut first-keystroke="control N" />
</action>
@@ -352,7 +338,6 @@
<keyboard-shortcut first-keystroke="shift control alt P" />
</action>
<action id="Unwrap" />
<action id="UsageView.ShowRecentFindUsages" />
<action id="ValidateJsp">
<keyboard-shortcut first-keystroke="shift alt F9" />
</action>
@@ -70,9 +70,6 @@
<action id="$Undo">
<keyboard-shortcut first-keystroke="control Z"/>
</action>
<action id="MethodHierarchy.OverrideMethodAction">
<keyboard-shortcut first-keystroke="shift control O"/>
</action>
<action id="$Copy">
<keyboard-shortcut first-keystroke="control C"/>
</action>
@@ -111,15 +108,9 @@
<mouse-shortcut keystroke="ctrl button1"/>
<mouse-shortcut keystroke="button2"/>
</action>
<action id="NewElement">
<keyboard-shortcut first-keystroke="alt INSERT"/>
</action>
<action id="FindPrevious">
<keyboard-shortcut first-keystroke="shift F3"/>
</action>
<action id="MethodHierarchy.ImplementMethodAction">
<keyboard-shortcut first-keystroke="shift control I"/>
</action>
<action id="FindUsagesInFile">
<keyboard-shortcut first-keystroke="shift control F7"/>
<keyboard-shortcut first-keystroke="shift F12"/>
@@ -157,7 +157,7 @@
<group id="FoldingGroup" class="com.intellij.codeInsight.folding.impl.actions.FoldingActionGroup" popup="true">
<action id="ExpandRegion" class="com.intellij.codeInsight.folding.impl.actions.ExpandRegionAction"/>
<action id="CollapseRegion" class="com.intellij.codeInsight.folding.impl.actions.CollapseRegionAction"/>
<action id="CollapseRegion" class="com.intellij.codeInsight.folding.impl.actions.CollapseRegionAction" use-shortcut-of="CollapseAll"/>
<separator/>
<action id="ExpandAllRegions" class="com.intellij.codeInsight.folding.impl.actions.ExpandAllRegionsAction"/>
<action id="CollapseAllRegions" class="com.intellij.codeInsight.folding.impl.actions.CollapseAllRegionsAction"/>
@@ -587,9 +587,10 @@
<group id="UsageView.Popup">
<reference ref="EditSource"/>
<action id="UsageView.Include" class="com.intellij.usages.actions.IncludeUsageAction"/>
<action id="UsageView.Exclude" class="com.intellij.usages.actions.ExcludeUsageAction"/>
<action id="UsageView.Exclude" class="com.intellij.usages.actions.ExcludeUsageAction" use-shortcut-of="$Delete"/>
<separator/>
<action id="UsageView.ShowRecentFindUsages" class="com.intellij.find.impl.ShowRecentFindUsagesAction" icon="/actions/back.png"/>
<action id="UsageView.ShowRecentFindUsages" class="com.intellij.find.impl.ShowRecentFindUsagesAction" icon="/actions/back.png"
use-shortcut-of="RecentFiles"/>
</group>
<action id="NewElementSamePlace" class="com.intellij.ide.actions.NewElementSamePlaceAction"/>
@@ -30,7 +30,7 @@
<action id="EditorPaste" class="com.intellij.openapi.editor.actions.PasteAction" use-shortcut-of="$Paste"/>
<action id="EditorPasteSimple" class="com.intellij.openapi.editor.actions.SimplePasteAction"/>
<action id="EditorPasteFromX11" class="com.intellij.openapi.editor.actions.PasteFromX11Action"/>
<action id="EditorDelete" class="com.intellij.openapi.editor.actions.DeleteAction"/>
<action id="EditorDelete" class="com.intellij.openapi.editor.actions.DeleteAction" use-shortcut-of="$Delete"/>
<action id="EditorBackSpace" class="com.intellij.openapi.editor.actions.BackspaceAction"/>
<action id="EditorMoveToPageTop" class="com.intellij.openapi.editor.actions.PageTopAction"/>
<action id="EditorMoveToPageBottom" class="com.intellij.openapi.editor.actions.PageBottomAction"/>
@@ -36,7 +36,7 @@
<add-to-group group-id="FileOpenGroup" anchor="first"/>
</group>
<action id="NewElement" class="com.intellij.ide.actions.NewElementAction">
<action id="NewElement" class="com.intellij.ide.actions.NewElementAction" use-shortcut-of="Generate">
<add-to-group group-id="PlatformOpenProjectGroup" anchor="after" relative-to-action="NewDirectoryProject"/>
</action>
+5 -5
View File
@@ -161,10 +161,10 @@
<action id="GuiDesigner.AddTab" class="com.intellij.uiDesigner.actions.AddTabAction"/>
<separator/>
<reference ref="EditSource"/>
<action id="GuiDesigner.ExpandSelection" class="com.intellij.uiDesigner.actions.ExpandSelectionAction"/>
<action id="GuiDesigner.ShrinkSelection" class="com.intellij.uiDesigner.actions.ShrinkSelectionAction"/>
<action id="GuiDesigner.IncreaseIndent" class="com.intellij.uiDesigner.actions.IncreaseIndentAction"/>
<action id="GuiDesigner.DecreaseIndent" class="com.intellij.uiDesigner.actions.DecreaseIndentAction"/>
<action id="GuiDesigner.ExpandSelection" class="com.intellij.uiDesigner.actions.ExpandSelectionAction" use-shortcut-of="EditorSelectWord"/>
<action id="GuiDesigner.ShrinkSelection" class="com.intellij.uiDesigner.actions.ShrinkSelectionAction" use-shortcut-of="EditorUnSelectWord"/>
<action id="GuiDesigner.IncreaseIndent" class="com.intellij.uiDesigner.actions.IncreaseIndentAction" use-shortcut-of="EditorIndentSelection"/>
<action id="GuiDesigner.DecreaseIndent" class="com.intellij.uiDesigner.actions.DecreaseIndentAction" use-shortcut-of="EditorUnindentSelection"/>
<action id="GuiDesigner.GroupButtons" class="com.intellij.uiDesigner.actions.GroupButtonsAction"/>
<action id="GuiDesigner.UngroupButtons" class="com.intellij.uiDesigner.actions.UngroupButtonsAction"/>
<action id="GuiDesigner.Duplicate" class="com.intellij.uiDesigner.actions.DuplicateComponentsAction"
@@ -206,7 +206,7 @@
</group>
<group id="GuiDesigner.PropertyInspectorPopupMenu">
<action id="GuiDesigner.QuickJavadoc" class="com.intellij.uiDesigner.actions.ShowJavadocAction"/>
<action id="GuiDesigner.QuickJavadoc" class="com.intellij.uiDesigner.actions.ShowJavadocAction" use-shortcut-of="QuickJavaDoc"/>
<reference ref="EditSource"/>
<action id="GuiDesigner.ResetValue" class="com.intellij.uiDesigner.actions.ResetValueAction"/>
</group>
+4 -5
View File
@@ -63,7 +63,7 @@
<add-to-group group-id="FileOpenGroup" anchor="first"/>
</group>
<action id="NewElement" class="com.intellij.ide.actions.NewElementAction">
<action id="NewElement" class="com.intellij.ide.actions.NewElementAction" use-shortcut-of="Generate">
<add-to-group group-id="OpenProjectGroup" anchor="after" relative-to-action="NewModule"/>
</action>
@@ -376,8 +376,7 @@
<add-to-group group-id="ProjectViewPopupMenuRunGroup" anchor="first"/>
</group>
<action id="PackageFile" class="com.intellij.packaging.impl.ui.actions.PackageFileAction">
<keyboard-shortcut first-keystroke="control shift F9" keymap="$default"/>
<action id="PackageFile" class="com.intellij.packaging.impl.ui.actions.PackageFileAction" use-shortcut-of="Compile">
<add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="Compile"/>
<add-to-group group-id="ProjectViewPopupMenu" anchor="before" relative-to-action="MakeModule"/>
<add-to-group group-id="FavoritesViewPopupMenu" anchor="before" relative-to-action="MakeModule"/>
@@ -436,8 +435,8 @@
</group>
<group id="MethodHierarchyPopupMenu">
<action id="MethodHierarchy.ImplementMethodAction" class="com.intellij.ide.hierarchy.method.ImplementMethodAction"/>
<action id="MethodHierarchy.OverrideMethodAction" class="com.intellij.ide.hierarchy.method.OverrideMethodAction"/>
<action id="MethodHierarchy.ImplementMethodAction" class="com.intellij.ide.hierarchy.method.ImplementMethodAction" use-shortcut-of="ImplementMethods"/>
<action id="MethodHierarchy.OverrideMethodAction" class="com.intellij.ide.hierarchy.method.OverrideMethodAction" use-shortcut-of="OverrideMethods"/>
<separator/>
<action id="MethodHierarchy.BaseOnThisType" class="com.intellij.ide.hierarchy.method.MethodHierarchyBrowser$BaseOnThisMethodAction"/>
<reference ref="EditSource"/>
-5
View File
@@ -29,9 +29,6 @@
<keyboard-shortcut first-keystroke="control SUBTRACT"/>
</action>
<action id="CollapseBlock"/>
<action id="CollapseRegion">
<keyboard-shortcut first-keystroke="control SUBTRACT"/>
</action>
<action id="CopyElement"/>
<action id="CopyPaths"/>
<action id="EditSource"/>
@@ -90,8 +87,6 @@
<keyboard-shortcut first-keystroke="control alt V"/>
<keyboard-shortcut first-keystroke="shift control V"/>
</action>
<action id="MethodHierarchy.ImplementMethodAction"/>
<action id="MethodHierarchy.OverrideMethodAction"/>
<action id="NextTab">
<keyboard-shortcut first-keystroke="alt RIGHT"/>
<keyboard-shortcut first-keystroke="shift control F6"/>