Add functions to create buttons whose labels specify mnemonics, i.e.

that contain an "_" preceding a letter, indicating that the letter is to
be underlined in the label, and that if the key for that letter is
pressed (either with Alt or without it) in the dialog box to which the
button belongs, and the widget with the input focus doesn't do anything
with that button, the button is sent the "clicked" signal.

Attach mnemonics to the buttons in the "Display->Options" dialog box.

svn path=/trunk/; revision=1915

3 files changed, 88 insertions, 11 deletions

diff --git a/gtk/display_opts.c b/gtk/display_opts.c
index ae67e5f198..5caf5e5d43 100644
--- a/gtk/display_opts.c
+++ b/gtk/display_opts.c
@@ -1,7 +1,7 @@
 /* display_opts.c
  * Routines for packet display windows
  *
- * $Id: display_opts.c,v 1.4 2000/05/08 01:23:16 guy Exp $
+ * $Id: display_opts.c,v 1.5 2000/05/08 04:23:45 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -90,6 +90,7 @@ static ts_type prev_timestamp_type;
 void
 display_opt_cb(GtkWidget *w, gpointer d) {
   GtkWidget     *display_opt_w, *button, *main_vb, *bbox, *ok_bt, *apply_bt, *cancel_bt;
+  GtkAccelGroup *accel_group;
 
   /* If there's already a "Display Options" window active, don't pop
      up another one.
@@ -106,23 +107,31 @@ display_opt_cb(GtkWidget *w, gpointer d) {
   display_opt_w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title(GTK_WINDOW(display_opt_w), "Ethereal: Display Options");
   
+  /* Accelerator group for the accelerators (or, as they're called in
+     Windows and, I think, in Motif, "mnemonics"; Alt+<key> is a mnemonic,
+     Ctrl+<key> is an accelerator). */
+  accel_group = gtk_accel_group_new();
+  gtk_window_add_accel_group(GTK_WINDOW(display_opt_w), accel_group);
+
   /* Container for each row of widgets */
   main_vb = gtk_vbox_new(FALSE, 3);
   gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
   gtk_container_add(GTK_CONTAINER(display_opt_w), main_vb);
   gtk_widget_show(main_vb);
   
-  button = gtk_radio_button_new_with_label(NULL, "Time of day");
+  button = dlg_radio_button_new_with_label_with_mnemonic(NULL, "_Time of day",
+							accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
                (timestamp_type == ABSOLUTE));
   gtk_object_set_data(GTK_OBJECT(display_opt_w), E_DISPLAY_TIME_ABS_KEY,
                button);
   gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
+  
   gtk_widget_show(button);
 
-  button = gtk_radio_button_new_with_label(
+  button = dlg_radio_button_new_with_label_with_mnemonic(
                gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
-               "Seconds since beginning of capture");
+               "Seconds since _beginning of capture", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
                (timestamp_type == RELATIVE));
   gtk_object_set_data(GTK_OBJECT(display_opt_w), E_DISPLAY_TIME_REL_KEY,
@@ -130,9 +139,9 @@ display_opt_cb(GtkWidget *w, gpointer d) {
   gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
-  button = gtk_radio_button_new_with_label(
+  button = dlg_radio_button_new_with_label_with_mnemonic(
                gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
-               "Seconds since previous frame");
+               "Seconds since _previous frame", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
                (timestamp_type == DELTA));
   gtk_object_set_data(GTK_OBJECT(display_opt_w), E_DISPLAY_TIME_DELTA_KEY,
@@ -140,21 +149,24 @@ display_opt_cb(GtkWidget *w, gpointer d) {
   gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
-  button = gtk_check_button_new_with_label("Automatic scrolling in live capture");
+  button = dlg_check_button_new_with_label_with_mnemonic(
+		"_Automatic scrolling in live capture", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), auto_scroll_live);
   gtk_object_set_data(GTK_OBJECT(display_opt_w), E_DISPLAY_AUTO_SCROLL_KEY,
 		      button);
   gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
 
-  button = gtk_check_button_new_with_label("Name resolution");
+  button = dlg_check_button_new_with_label_with_mnemonic("_Name resolution",
+		accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), g_resolving_actif);
   gtk_object_set_data(GTK_OBJECT(display_opt_w), E_DISPLAY_NAME_RESOLUTION_KEY,
 		      button);
   gtk_box_pack_start(GTK_BOX(main_vb), button, TRUE, TRUE, 0);
   gtk_widget_show(button);
   
-  button = gtk_check_button_new_with_label("Decode IPv4 TOS field as DiffServ Field");
+  button = dlg_check_button_new_with_label_with_mnemonic(
+		"Decode IPv4 TOS field as _DiffServ Field", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), g_ip_dscp_actif);
   gtk_object_set_data(GTK_OBJECT(display_opt_w), E_DISPLAY_IP_DSCP_KEY,
 		      button);
diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c
index ac5f50af10..63d1ee2155 100644
--- a/gtk/dlg_utils.c
+++ b/gtk/dlg_utils.c
@@ -1,7 +1,7 @@
 /* dlg_utils.c
  * Utilities to use when constructing dialogs
  *
- * $Id: dlg_utils.c,v 1.1 2000/05/02 08:04:28 guy Exp $
+ * $Id: dlg_utils.c,v 1.2 2000/05/08 04:23:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -89,3 +89,63 @@ dlg_key_press (GtkWidget *widget, GdkEventKey *event, gpointer cancel_button)
 
   return FALSE;
 }
+
+/* Sigh.  GTK+ appears not to acknowledge that it should be possible
+   to attach mnemonics to anything other than menu items; perhaps
+   it's easy to dig up the label widget for a button, but, right now,
+   it appears to be easier just to cut-and-paste
+   "gtk_radio_button_new_with_label()".  */
+GtkWidget *
+dlg_radio_button_new_with_label_with_mnemonic(GSList *group,
+		const gchar *label, GtkAccelGroup *accel_group)
+{
+  GtkWidget *radio_button;
+  GtkWidget *label_widget;
+  guint accel_key;
+
+  radio_button = gtk_radio_button_new (group);
+  label_widget = gtk_label_new (label);
+  gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
+
+  gtk_container_add (GTK_CONTAINER (radio_button), label_widget);
+  gtk_widget_show (label_widget);
+
+  accel_key = gtk_label_parse_uline (GTK_LABEL (label_widget), label);
+  if (accel_key != GDK_VoidSymbol) {
+    /* Yes, we have a mnemonic. */
+    gtk_widget_add_accelerator (radio_button, "clicked", accel_group,
+				accel_key, 0, GTK_ACCEL_LOCKED);
+    gtk_widget_add_accelerator (radio_button, "clicked", accel_group,
+				accel_key, GDK_MOD1_MASK, GTK_ACCEL_LOCKED);
+  }
+
+  return radio_button;
+}
+
+/* The same applies to check buttons. */
+GtkWidget *
+dlg_check_button_new_with_label_with_mnemonic(const gchar *label,
+			GtkAccelGroup *accel_group)
+{
+  GtkWidget *check_button;
+  GtkWidget *label_widget;
+  guint accel_key;
+	         
+  check_button = gtk_check_button_new ();
+  label_widget = gtk_label_new (label);
+  gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
+	              
+  gtk_container_add (GTK_CONTAINER (check_button), label_widget);
+  gtk_widget_show (label_widget);
+
+  accel_key = gtk_label_parse_uline (GTK_LABEL (label_widget), label);
+  if (accel_key != GDK_VoidSymbol) {
+    /* Yes, we have a mnemonic. */
+    gtk_widget_add_accelerator (check_button, "clicked", accel_group,
+				accel_key, 0, GTK_ACCEL_LOCKED);
+    gtk_widget_add_accelerator (check_button, "clicked", accel_group,
+				accel_key, GDK_MOD1_MASK, GTK_ACCEL_LOCKED);
+  }
+	                   
+  return check_button;
+}
diff --git a/gtk/dlg_utils.h b/gtk/dlg_utils.h
index 4b11a2f68d..ef3a786b18 100644
--- a/gtk/dlg_utils.h
+++ b/gtk/dlg_utils.h
@@ -1,7 +1,7 @@
 /* dlg_utils.h
  * Declarations of utilities to use when constructing dialogs
  *
- * $Id: dlg_utils.h,v 1.1 2000/05/02 08:04:29 guy Exp $
+ * $Id: dlg_utils.h,v 1.2 2000/05/08 04:23:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -24,3 +24,8 @@
  */
 void dlg_set_activate(GtkWidget *widget, GtkWidget *ok_button);
 void dlg_set_cancel(GtkWidget *widget, GtkWidget *cancel_button);
+
+GtkWidget *dlg_radio_button_new_with_label_with_mnemonic(GSList *group,
+    const gchar *label, GtkAccelGroup *accel_group);
+GtkWidget *dlg_check_button_new_with_label_with_mnemonic(const gchar *label,
+    GtkAccelGroup *accel_group);