summaryrefslogtreecommitdiff
path: root/platform/platform-resources/src/idea
diff options
context:
space:
mode:
Diffstat (limited to 'platform/platform-resources/src/idea')
-rw-r--r--platform/platform-resources/src/idea/Keymap_Default.xml7
-rw-r--r--platform/platform-resources/src/idea/Keymap_Netbeans.xml1
-rw-r--r--platform/platform-resources/src/idea/Keymap_VisualStudio.xml1
-rw-r--r--platform/platform-resources/src/idea/LangActions.xml5
-rw-r--r--platform/platform-resources/src/idea/PlatformActions.xml4
5 files changed, 10 insertions, 8 deletions
diff --git a/platform/platform-resources/src/idea/Keymap_Default.xml b/platform/platform-resources/src/idea/Keymap_Default.xml
index d42b30b322ad..58d6f3a76d27 100644
--- a/platform/platform-resources/src/idea/Keymap_Default.xml
+++ b/platform/platform-resources/src/idea/Keymap_Default.xml
@@ -90,9 +90,6 @@
<action id="Generate">
<keyboard-shortcut first-keystroke="alt INSERT"/>
</action>
- <action id="CloneElement">
- <keyboard-shortcut first-keystroke="shift F5"/>
- </action>
<action id="EditorChooseLookupItemReplace">
<keyboard-shortcut first-keystroke="TAB"/>
</action>
@@ -899,6 +896,9 @@
<action id="FileChooser.GotoHome">
<keyboard-shortcut first-keystroke="control 1"/>
</action>
+ <action id="FileChooser.GotoDesktop">
+ <keyboard-shortcut first-keystroke="control D"/>
+ </action>
<action id="FileChooser.GotoProject">
<keyboard-shortcut first-keystroke="control 2"/>
</action>
@@ -909,6 +909,7 @@
<keyboard-shortcut first-keystroke="alt INSERT"/>
<keyboard-shortcut first-keystroke="control N"/>
</action>
+
<action id="PopupHector">
<keyboard-shortcut first-keystroke="ctrl alt shift H"/>
</action>
diff --git a/platform/platform-resources/src/idea/Keymap_Netbeans.xml b/platform/platform-resources/src/idea/Keymap_Netbeans.xml
index a343ec152dfb..b38699989ca3 100644
--- a/platform/platform-resources/src/idea/Keymap_Netbeans.xml
+++ b/platform/platform-resources/src/idea/Keymap_Netbeans.xml
@@ -42,7 +42,6 @@
<keyboard-shortcut first-keystroke="control alt SPACE" />
<keyboard-shortcut first-keystroke="control alt BACK_SLASH" />
</action>
- <action id="CloneElement" />
<action id="CloseActiveTab" />
<action id="CloseAllEditors">
<keyboard-shortcut first-keystroke="shift control W" />
diff --git a/platform/platform-resources/src/idea/Keymap_VisualStudio.xml b/platform/platform-resources/src/idea/Keymap_VisualStudio.xml
index 7df5974cb7e8..ec5620e51383 100644
--- a/platform/platform-resources/src/idea/Keymap_VisualStudio.xml
+++ b/platform/platform-resources/src/idea/Keymap_VisualStudio.xml
@@ -205,6 +205,5 @@
<keyboard-shortcut first-keystroke="shift control alt UP"/>
</action>
<action id="CopyElement"/>
- <action id="CloneElement"/>
</keymap>
</component>
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index af636ab5a3cf..65fa309fe3b9 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -120,7 +120,7 @@
<action id="GotoTypeDeclaration" class="com.intellij.codeInsight.navigation.actions.GotoTypeDeclarationAction"/>
<action id="GotoSuperMethod" class="com.intellij.codeInsight.navigation.actions.GotoSuperAction"/>
<action id="GotoTest" class="com.intellij.testIntegration.GotoTestOrCodeAction"/>
- <action id="GotoRelated" class="com.intellij.ide.actions.GotoRelatedFileAction"/>
+ <action id="GotoRelated" class="com.intellij.ide.actions.GotoRelatedSymbolAction"/>
<separator/>
<action id="FileStructurePopup" class="com.intellij.ide.actions.ViewStructureAction"/>
<action id="ShowFilePath" class="com.intellij.ide.actions.ShowFilePathAction"/>
@@ -269,7 +269,6 @@
<separator/>
<action id="Move" class="com.intellij.refactoring.actions.MoveAction"/>
<action id="CopyElement" class="com.intellij.ide.actions.CopyElementAction"/>
- <action id="CloneElement" class="com.intellij.ide.actions.CloneElementAction"/>
<action id="SafeDelete" class="com.intellij.refactoring.actions.SafeDeleteAction"/>
<separator/>
<group id="IntroduceActionsGroup" popup="true">
@@ -638,6 +637,7 @@
<separator/>
<action id="ToggleLineBreakpoint" class="com.intellij.xdebugger.impl.actions.ToggleLineBreakpointAction"/>
<action id="ToggleTemporaryLineBreakpoint" class="com.intellij.xdebugger.impl.actions.ToggleTemporaryLineBreakpointAction"/>
+ <action id="ToggleBreakpointEnabled" class="com.intellij.xdebugger.impl.actions.ToggleBreakpointEnabledAction"/>
<action id="ViewBreakpoints" class="com.intellij.xdebugger.impl.actions.ViewBreakpointsAction" icon="AllIcons.Debugger.ViewBreakpoints"/>
<separator/>
@@ -681,6 +681,7 @@
<action id="XDebugger.AutoTooltip" class="com.intellij.xdebugger.impl.actions.ValueTooltipAutoShowAction"/>
<action id="XDebugger.ToggleSortValues" class="com.intellij.xdebugger.impl.ui.tree.actions.SortValuesToggleAction" icon="AllIcons.ObjectBrowser.Sorted"/>
<action id="Debugger.MarkObject" class="com.intellij.xdebugger.impl.actions.MarkObjectAction"/>
+ <action id="Debugger.FocusOnBreakpoint" class="com.intellij.xdebugger.impl.actions.FocusOnBreakpointAction"/>
</group>
<group id="XDebugger.ToolWindow.TopToolbar">
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 85a834d97b37..9cebd282ded6 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -27,7 +27,7 @@
<action id="ContextHelp" class="com.intellij.ide.actions.ContextHelpAction"/>
<action id="RunGc" class="com.intellij.ide.actions.RunGcAction"/>
<action id="ShowPopupMenu" class="com.intellij.ide.actions.ShowPopupMenuAction"/>
- <action id="ShowColorPicker" class="com.intellij.ui.ShowColorPickerAction" text="Show Color Picker"/>
+ <action id="ShowColorPicker" class="com.intellij.ui.ShowColorPickerAction" text="Show Color Picker" icon="AllIcons.Ide.Pipette"/>
<action id="NextEditorTab" class="com.intellij.openapi.fileEditor.impl.SelectNextEditorTabAction"/>
<action id="PreviousEditorTab" class="com.intellij.openapi.fileEditor.impl.SelectPreviousEditorTabAction"/>
@@ -543,6 +543,8 @@
<group id="FileChooserToolbar">
<action id="FileChooser.GotoHome" class="com.intellij.openapi.fileChooser.actions.GotoHomeAction"
icon="AllIcons.Nodes.HomeFolder"/>
+ <action id="FileChooser.GotoDesktop" class="com.intellij.openapi.fileChooser.actions.GotoDesktopDirAction"
+ icon="AllIcons.Nodes.Desktop"/>
<action id="FileChooser.GotoProject" class="com.intellij.openapi.fileChooser.actions.GotoProjectDirectory"
icon="AllIcons.Nodes.IdeaProject"/>
<separator/>