From c12cbb4c6822c87318f053f5c76a32d7c44e6709 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Wed, 16 Jun 2010 19:46:44 -0700
Subject: [PATCH] Add Cancel button to Register New Email dialog

Bug: issue 574
Change-Id: Ib9fbdee5d6de0da7905d5d132644e1ad97817652
Signed-off-by: Shawn O. Pearce <sop@google.com>
---
 .../gerrit/client/account/AccountConstants.java   |  1 +
 .../client/account/AccountConstants.properties    |  1 +
 .../gerrit/client/account/ContactPanelShort.java  | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java
index 1abfbc84ac..24439c7055 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java
@@ -90,6 +90,7 @@ public interface AccountConstants extends Constants {
   String contactFieldFax();
   String buttonOpenRegisterNewEmail();
   String buttonSendRegisterNewEmail();
+  String buttonCancel();
   String titleRegisterNewEmail();
   String descRegisterNewEmail();
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
index a22abe94f9..09ae95a038 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
@@ -77,6 +77,7 @@ contactFieldPhone = Phone Number
 contactFieldFax = Fax Number
 buttonOpenRegisterNewEmail = Register New Email ...
 buttonSendRegisterNewEmail = Register
+buttonCancel = Cancel
 titleRegisterNewEmail = Register Email Address
 descRegisterNewEmail = \
   <p>A confirmation link will be sent by email to this address.</p>\
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
index aa7e3d101b..923a86aa63 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
@@ -254,6 +254,7 @@ class ContactPanelShort extends Composite {
     inEmail.setVisibleLength(60);
 
     final Button register = new Button(Util.C.buttonSendRegisterNewEmail());
+    final Button cancel = new Button(Util.C.buttonCancel());
     final FormPanel form = new FormPanel();
     form.addSubmitHandler(new FormPanel.SubmitHandler() {
       @Override
@@ -288,9 +289,21 @@ class ContactPanelShort extends Composite {
         form.submit();
       }
     });
+    cancel.addClickHandler(new ClickHandler() {
+      @Override
+      public void onClick(ClickEvent event) {
+        box.hide();
+      }
+    });
+
+    final FlowPanel buttons = new FlowPanel();
+    buttons.setStyleName(Gerrit.RESOURCES.css().patchSetActions());
+    buttons.add(register);
+    buttons.add(cancel);
+
     body.add(new HTML(Util.C.descRegisterNewEmail()));
     body.add(inEmail);
-    body.add(register);
+    body.add(buttons);
 
     box.setText(Util.C.titleRegisterNewEmail());
     box.setWidget(form);