From 6dcb2b5aaa47e0487e4f690916695ef825cf9e7f Mon Sep 17 00:00:00 2001 From: Vassiliy Kudryashov Date: Tue, 11 Dec 2012 19:49:52 +0400 Subject: [PATCH] Common shortcuts for Move up/down in decorators and bookmarks --- .../ide/bookmarks/actions/MoveBookmarkDownAction.java | 5 ++--- .../intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java | 5 ++--- .../com/intellij/openapi/actionSystem/CommonShortcuts.java | 5 ++++- .../platform-api/src/com/intellij/ui/CommonActionsPanel.java | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java index df4beb9872fa..561a48bb9bba 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java @@ -19,10 +19,9 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.bookmarks.BookmarkItem; import com.intellij.ide.bookmarks.BookmarkManager; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.CustomShortcutSet; +import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.ListUtil; import javax.swing.*; @@ -35,7 +34,7 @@ class MoveBookmarkDownAction extends DumbAwareAction { super("Down", "Move current bookmark down", AllIcons.Actions.NextOccurence); myProject = project; myList = list; - registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(SystemInfo.isMac ? "meta DOWN" : "alt DOWN")), list); + registerCustomShortcutSet(CommonShortcuts.MOVE_DOWN, list); } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java index 912233a86f50..ea598195e60f 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java @@ -18,10 +18,9 @@ package com.intellij.ide.bookmarks.actions; import com.intellij.icons.AllIcons; import com.intellij.ide.bookmarks.BookmarkManager; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.CustomShortcutSet; +import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.ListUtil; import javax.swing.*; @@ -34,7 +33,7 @@ class MoveBookmarkUpAction extends DumbAwareAction { super("Up", "Move current bookmark up", AllIcons.Actions.PreviousOccurence); myProject = project; myList = list; - registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(SystemInfo.isMac ? "meta UP" : "alt UP")), list); + registerCustomShortcutSet(CommonShortcuts.MOVE_UP, list); } @Override diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java index 6f5749d8b02c..5842382bb938 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java @@ -40,7 +40,10 @@ public class CommonShortcuts { public static final ShortcutSet ESCAPE = new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0)); public static final ShortcutSet DOUBLE_CLICK_1 = new CustomShortcutSet(new MouseShortcut(MouseEvent.BUTTON1, 0, 2)); - + + public static final ShortcutSet MOVE_UP = CustomShortcutSet.fromString("alt UP"); + public static final ShortcutSet MOVE_DOWN = CustomShortcutSet.fromString("alt DOWN"); + public static ShortcutSet getNewForDialogs() { final ArrayList shortcuts = new ArrayList(); for (Shortcut shortcut : getNew().getShortcuts()) { diff --git a/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java b/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java index a816ff8163ad..5c8b22d5fa7c 100644 --- a/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java +++ b/platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java @@ -270,8 +270,8 @@ public class CommonActionsPanel extends JPanel { case ADD: return CommonShortcuts.getNewForDialogs(); case EDIT: return CustomShortcutSet.fromString("ENTER"); case REMOVE: return CustomShortcutSet.fromString(SystemInfo.isMac ? "meta BACK_SPACE" : "alt DELETE"); - case UP: return CustomShortcutSet.fromString("alt UP"); - case DOWN: return CustomShortcutSet.fromString("alt DOWN"); + case UP: return CommonShortcuts.MOVE_UP; + case DOWN: return CommonShortcuts.MOVE_DOWN; } return null; }