Move the comment editor actions into their own keyboard shortcut group

The help text reads better this way.

Signed-off-by: Shawn O. Pearce <sop@google.com>

3 files changed, 25 insertions, 3 deletions

diff --git a/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java b/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java
index 13a6a64225..bdce4d22e1 100644
--- a/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java
+++ b/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java
@@ -43,7 +43,9 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.InlineLabel;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.gwtexpui.globalkey.client.GlobalKey;
 import com.google.gwtexpui.globalkey.client.KeyCommand;
+import com.google.gwtexpui.globalkey.client.KeyCommandSet;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -60,6 +62,8 @@ public abstract class AbstractPatchContentTable extends NavigationTable<Object>
 
   private final Timestamp aged =
       new Timestamp(System.currentTimeMillis() - AGE);
+  private final KeyCommandSet keysComment;
+  private HandlerRegistration regComment;
   private HandlerRegistration regSignOut;
 
   protected AbstractPatchContentTable() {
@@ -78,12 +82,15 @@ public abstract class AbstractPatchContentTable extends NavigationTable<Object>
 
       // See CommentEditorPanel
       //
-      keysAction.add(new NoOpKeyCommand(KeyCommand.M_CTRL, 's', PatchUtil.C
+      keysComment = new KeyCommandSet(PatchUtil.C.commentEditorSet());
+      keysComment.add(new NoOpKeyCommand(KeyCommand.M_CTRL, 's', PatchUtil.C
           .commentSaveDraft()));
-      keysAction.add(new NoOpKeyCommand(KeyCommand.M_CTRL, 'd', PatchUtil.C
+      keysComment.add(new NoOpKeyCommand(KeyCommand.M_CTRL, 'd', PatchUtil.C
           .commentDiscard()));
-      keysAction.add(new NoOpKeyCommand(0, KeyCodes.KEY_ESCAPE, PatchUtil.C
+      keysComment.add(new NoOpKeyCommand(0, KeyCodes.KEY_ESCAPE, PatchUtil.C
           .commentCancelEdit()));
+    } else {
+      keysComment = null;
     }
 
     table.setStyleName("gerrit-PatchContentTable");
@@ -96,6 +103,17 @@ public abstract class AbstractPatchContentTable extends NavigationTable<Object>
   }
 
   @Override
+  public void setRegisterKeys(final boolean on) {
+    super.setRegisterKeys(on);
+    if (on && keysComment != null && regComment == null) {
+      regComment = GlobalKey.add(this, keysComment);
+    } else if (!on && regComment != null) {
+      regComment.removeHandler();
+      regComment = null;
+    }
+  }
+
+  @Override
   protected void onLoad() {
     super.onLoad();
     if (regSignOut == null && Gerrit.isSignedIn()) {
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchConstants.java b/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
index 2074c9baa8..30aa596639 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
+++ b/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
@@ -37,6 +37,8 @@ public interface PatchConstants extends Constants {
   String chunkPrev();
   String chunkNext();
   String fileList();
+
+  String commentEditorSet();
   String commentInsert();
   String commentSaveDraft();
   String commentDiscard();
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties b/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties
index cd1f6d3656..f1abb940ab 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties
+++ b/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties
@@ -18,6 +18,8 @@ lineNext = Next line
 chunkPrev = Previous diff chunk or comment
 chunkNext = Next diff chunk or comment
 fileList = Browse files in patch set
+
+commentEditorSet = Comment Editing
 commentInsert = Create a new inline comment
 commentSaveDraft = Save draft comment
 commentDiscard = Discard draft comment