From 79c3db85f4b97aa379d1b1c3687654e57f67abd6 Mon Sep 17 00:00:00 2001
From: Bernd Hufmann <bhufmann@gmail.com>
Date: Mon, 23 Apr 2012 08:45:20 -0400
Subject: [PATCH] Add cancel button to dialogs for LTTng 2.0 tracer control

---
 .../icons/elcl16/add_button.gif                 | Bin 308 -> 318 bytes
 org.eclipse.linuxtools.lttng2.ui/plugin.xml     |   6 +++---
 .../views/control/dialogs/AddContextDialog.java |   1 +
 .../control/dialogs/CreateChannelDialog.java    |   5 +++--
 .../control/dialogs/CreateSessionDialog.java    |   1 +
 .../control/dialogs/EnableEventsDialog.java     |   3 ++-
 .../control/dialogs/GetEventInfoDialog.java     |   3 ++-
 .../dialogs/ImportConfirmationDialog.java       |   1 +
 .../ui/views/control/dialogs/ImportDialog.java  |   1 +
 .../control/dialogs/NewConnectionDialog.java    |   1 +
 10 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/add_button.gif b/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/add_button.gif
index ae9543c6e76539c99f5f0ffd5c172045bd3b63b0..252d7ebcb8c74d6e5de66ef0eb8856622a0e9d89 100644
GIT binary patch
delta 195
zcmdnOw2z6$-P6s&GEsm*fZ-~`M4r}q1`2@UPZmZ725kl%kQpE&8Q7u^OfB%xk?QwI
zOpWy9)7A>TymQf#0I^qIMN<{j1y4M7v9mqLzsOm|XyUD<g1a44^je%2@M%2x`9s`=
ojgyN@T1Hx$i-VorgH=+BHHt+-oH>edDpM50T!yFx3mh4&0ah0!jsO4v

delta 185
zcmdnTw1tVs-P6s&GLeUYhheGqM4s0A{}celpDc_F4E78<3_t)fl7TJo!2A#4nqh4o
zi@ZvGxHL7V9MzoSqI$xU<&#CFfB%QWib69zo?TjTC!xh@0iVW`pDH)R+ghA9KFl%W
f;$Ua@V3m|&4Y6mD5NGaU>}Bd=n9AVc$Y2cs^m1Zc

diff --git a/org.eclipse.linuxtools.lttng2.ui/plugin.xml b/org.eclipse.linuxtools.lttng2.ui/plugin.xml
index 6999c2ae85..48379557b5 100644
--- a/org.eclipse.linuxtools.lttng2.ui/plugin.xml
+++ b/org.eclipse.linuxtools.lttng2.ui/plugin.xml
@@ -473,7 +473,7 @@
          </command>
          <command
                commandId="org.eclipse.linuxtools.internal.lttng2.ui.commands.control.enableEventOnSession"
-               icon="icons/elcl16/edit.gif"
+               icon="icons/elcl16/enable.gif"
                label="%commands.control.enable.eventOnDomain"
                style="push">
             <visibleWhen
@@ -527,7 +527,7 @@
          </command>
          <command
                commandId="org.eclipse.linuxtools.internal.lttng2.ui.commands.control.enableEventOnDomain"
-               icon="icons/elcl16/edit.gif"
+               icon="icons/elcl16/enable.gif"
                label="%commands.control.enable.eventOnDomain"
                style="push">
             <visibleWhen
@@ -643,7 +643,7 @@
          </command>
          <command
                commandId="org.eclipse.linuxtools.internal.lttng2.ui.commands.control.enableEventOnChannel"
-               icon="icons/elcl16/edit.gif"
+               icon="icons/elcl16/enable.gif"
                label="%commands.control.enable.eventOnChannel"
                style="push">
             <visibleWhen
diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java
index a9e01fb8e0..dda5375e52 100644
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java
@@ -161,6 +161,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog  {
      */
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
+        createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$
         createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$
     }
 
diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateChannelDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateChannelDialog.java
index a30d43347f..b250711f51 100644
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateChannelDialog.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateChannelDialog.java
@@ -47,7 +47,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelDialog
     /**
      * The icon file for this dialog box.
      */
-    public static final String ENABLE_CHANNEL_ICON_FILE = "icons/elcl16/edit.gif"; //$NON-NLS-1$ 
+    public static final String ENABLE_CHANNEL_ICON_FILE = "icons/elcl16/add_button.gif"; //$NON-NLS-1$ 
 
     // ------------------------------------------------------------------------
     // Attributes
@@ -298,7 +298,8 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelDialog
      */
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
-        createButton(parent, IDialogConstants.DETAILS_ID, "Default", true); //$NON-NLS-1$
+        createButton(parent, IDialogConstants.DETAILS_ID, "&Default", true); //$NON-NLS-1$
+        createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$
         createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$
     }
 
diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java
index 2b95f217d2..7ecbe421ac 100644
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java
@@ -187,6 +187,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog
      */
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
+        createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$
         createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$
     }
 
diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java
index 3bdef66023..53cd10c3ed 100644
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java
@@ -48,7 +48,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     /**
      * The icon file for this dialog box.
      */
-    public static final String ENABLE_EVENT_ICON_FILE = "icons/elcl16/edit.gif"; //$NON-NLS-1$ 
+    public static final String ENABLE_EVENT_ICON_FILE = "icons/elcl16/enable.gif"; //$NON-NLS-1$ 
 
     // ------------------------------------------------------------------------
     // Attributes
@@ -442,6 +442,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
      */
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
+        createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$
         createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$
     }
 
diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java
index ebf0e27d38..e2ad1fb9a4 100644
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java
@@ -47,7 +47,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
     /**
      * The icon file for this dialog box.
      */
-    public static final String TARGET_NEW_CONNECTION_ICON_FILE = "icons/elcl16/edit.gif"; //$NON-NLS-1$ 
+    public static final String TARGET_NEW_CONNECTION_ICON_FILE = "icons/elcl16/enable.gif"; //$NON-NLS-1$ 
 
     // ------------------------------------------------------------------------
     // Attributes
@@ -251,6 +251,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
      */
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
+        createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$
         createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$
     }
 
diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java
index 3d55c59d20..43bdf9261a 100644
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java
@@ -195,6 +195,7 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat
      */
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
+        createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$
         createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$
     }
 
diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java
index 9715f739c8..46c89a8104 100644
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java
@@ -273,6 +273,7 @@ public class ImportDialog extends Dialog implements IImportDialog {
      */
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
+        createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$
         createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$
     }
 
diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java
index 103c0ec8fe..c591fbc6ec 100644
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java
@@ -274,6 +274,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog
      */
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
+        createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$
         createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$
     }
 
-- 
2.34.1