Commit aea35f1a authored by Kirill Likhodedov's avatar Kirill Likhodedov
Browse files

Rework the VCS operation popup for Git

* IDEA-81862
   Remove "Commit File", which is used rarely used and is semi-duplicated by "Commit Changes...".
   Add "Resolve Conflicts" and "Fetch".
* Move "Add to VCS" to the bottom so that other actions shortcuts don't shift for unversioned file.
   Also because "A" is a perfect mnemonic for "Add".
* Allow alpha-mnemonics for the popup, because there may be more than 10 actions there.
parent 7f85f3a6
Branches unavailable Tags unavailable
No related merge requests found
Showing with 7 additions and 12 deletions
+7 -12
......@@ -71,7 +71,7 @@ public abstract class QuickSwitchSchemeAction extends AnAction implements DumbAw
}
protected JBPopupFactory.ActionSelectionAid getAidMethod() {
return JBPopupFactory.ActionSelectionAid.NUMBERING;
return JBPopupFactory.ActionSelectionAid.ALPHA_NUMBERING;
}
protected String getPopupTitle(AnActionEvent e) {
......
......@@ -45,28 +45,23 @@ public class GitQuickListContentProvider implements VcsQuickListContentProvider
final ActionManager manager = ActionManager.getInstance();
final List<AnAction> actions = new ArrayList<AnAction>();
// Basic
actions.add(new Separator(activeVcs.getDisplayName()));
add("ChangesView.AddUnversioned", manager, actions);
add("CheckinProject", manager, actions);
add("CheckinFiles", manager, actions);
add("ChangesView.Rollback", manager, actions);
// History, Diff
addSeparator(actions);
add("Vcs.ShowTabbedFileHistory", manager, actions);
add("Annotate", manager, actions);
add("Compare.SameVersion", manager, actions);
// Pull/Push
addSeparator(actions);
add("Git.Branches", manager, actions);
add("Git.Fetch", manager, actions);
add("Git.Push", manager, actions);
// misc
add("Git.Stash", manager, actions);
add("Git.Unstash", manager, actions);
add("ChangesView.AddUnversioned", manager, actions);
add("Git.ResolveConflicts", manager, actions);
// Github
addSeparator(actions);
final AnAction githubRebase = manager.getAction("Github.Rebase");
......@@ -90,11 +85,11 @@ public class GitQuickListContentProvider implements VcsQuickListContentProvider
return true;
}
private void addSeparator(@NotNull final List<AnAction> actions) {
private static void addSeparator(@NotNull final List<AnAction> actions) {
actions.add(new Separator());
}
private void add(String actionName, ActionManager manager, List<AnAction> actions) {
private static void add(String actionName, ActionManager manager, List<AnAction> actions) {
final AnAction action = manager.getAction(actionName);
assert action != null;
actions.add(action);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment