Polish the column prefs a bit. Make the column tile entry and format

menu modify the currently-selected item directly.  Remove the "Change"
button since it's no longer needed.  Make the column list a clist, and
add a column which shows the format.  Make the format option menu not
fill the entire table cell.  Update the man page accordingly.

svn path=/trunk/; revision=5214

1 files changed, 179 insertions, 161 deletions

diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index bca6f9b0a2..fa11a4d3c3 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -1,7 +1,7 @@
 /* column_prefs.c
  * Dialog box for column preferences
  *
- * $Id: column_prefs.c,v 1.8 2002/03/05 11:55:58 guy Exp $
+ * $Id: column_prefs.c,v 1.9 2002/04/22 02:03:53 gerald Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -38,17 +38,19 @@
 
 static GtkWidget *column_l, *chg_bt, *del_bt, *title_te, *fmt_m, *up_bt,
                  *dn_bt;
-static gint       cur_fmt;
+static gint       cur_fmt, cur_row;
 
-static void   column_sel_list_cb(GtkWidget *, gpointer);
-static void   column_sel_new_cb(GtkWidget *, gpointer);
-static void   column_sel_chg_cb(GtkWidget *, gpointer);
-static void   column_sel_del_cb(GtkWidget *, gpointer);
-static void   column_sel_arrow_cb(GtkWidget *, gpointer);
-static void   column_set_fmt_cb(GtkWidget *, gpointer);
+static void   column_list_select_cb(GtkCList *clist, gint row, gint column,
+				 GdkEvent *event, gpointer user_data);
+static void   column_list_unselect_cb(GtkCList *clist, gint row, gint column,
+				 GdkEvent *event, gpointer user_data);
+static void   column_list_new_cb(GtkWidget *, gpointer);
+static void   column_entry_changed_cb(GtkEditable *, gpointer);
+static void   column_menu_changed_cb(GtkWidget *, gpointer);
+static void   column_list_delete_cb(GtkWidget *, gpointer);
+static void   column_arrow_cb(GtkWidget *, gpointer);
+void          column_set_arrow_button_sensitivity(GList *);
 
-#define E_COL_NAME_KEY "column_name"
-#define E_COL_LBL_KEY  "column_label"
 #define E_COL_CM_KEY   "in_col_cancel_mode"
 
 /* Create and display the column selection widgets. */
@@ -59,7 +61,8 @@ column_prefs_show() {
               *nl_lb, *tb, *lb, *menu, *mitem, *arrow_hb;
   GList       *clp = NULL;
   fmt_data    *cfmt;
-  gint         i;
+  gint         i, row;
+  gchar       *column_titles[] = {"Title", "Format"}, *col_ent[2];
 
   /* Container for each row of widgets */
   main_vb = gtk_vbox_new(FALSE, 5);
@@ -77,23 +80,16 @@ column_prefs_show() {
   gtk_container_add(GTK_CONTAINER(top_hb), list_bb);
   gtk_widget_show(list_bb);
 
-  new_bt = gtk_button_new_with_label ("New");
+  new_bt = gtk_button_new_with_label ("Add New");
   gtk_signal_connect(GTK_OBJECT(new_bt), "clicked",
-    GTK_SIGNAL_FUNC(column_sel_new_cb), NULL);
+    GTK_SIGNAL_FUNC(column_list_new_cb), NULL);
   gtk_container_add(GTK_CONTAINER(list_bb), new_bt);
   gtk_widget_show(new_bt);
   
-  chg_bt = gtk_button_new_with_label ("Change");
-  gtk_widget_set_sensitive(chg_bt, FALSE);
-  gtk_signal_connect(GTK_OBJECT(chg_bt), "clicked",
-    GTK_SIGNAL_FUNC(column_sel_chg_cb), NULL);
-  gtk_container_add(GTK_CONTAINER(list_bb), chg_bt);
-  gtk_widget_show(chg_bt);
-  
   del_bt = gtk_button_new_with_label ("Delete");
   gtk_widget_set_sensitive(del_bt, FALSE);
   gtk_signal_connect(GTK_OBJECT(del_bt), "clicked",
-    GTK_SIGNAL_FUNC(column_sel_del_cb), NULL);
+    GTK_SIGNAL_FUNC(column_list_delete_cb), NULL);
   gtk_container_add(GTK_CONTAINER(list_bb), del_bt);
   gtk_widget_show(del_bt);
   
@@ -104,14 +100,14 @@ column_prefs_show() {
   up_bt = gtk_button_new_with_label("Up");
   gtk_widget_set_sensitive(up_bt, FALSE);
   gtk_signal_connect(GTK_OBJECT(up_bt), "clicked",
-    GTK_SIGNAL_FUNC(column_sel_arrow_cb), NULL);
+    GTK_SIGNAL_FUNC(column_arrow_cb), NULL);
   gtk_box_pack_start(GTK_BOX(arrow_hb), up_bt, TRUE, TRUE, 0);
   gtk_widget_show(up_bt);
   
   dn_bt = gtk_button_new_with_label("Down");
   gtk_widget_set_sensitive(dn_bt, FALSE);
   gtk_signal_connect(GTK_OBJECT(dn_bt), "clicked",
-    GTK_SIGNAL_FUNC(column_sel_arrow_cb), NULL);
+    GTK_SIGNAL_FUNC(column_arrow_cb), NULL);
   gtk_box_pack_start(GTK_BOX(arrow_hb), dn_bt, TRUE, TRUE, 0);
   gtk_widget_show(dn_bt);
   
@@ -122,26 +118,28 @@ column_prefs_show() {
   gtk_container_add(GTK_CONTAINER(top_hb), column_sc);
   gtk_widget_show(column_sc);
 
-  column_l = gtk_list_new();
-  gtk_list_set_selection_mode(GTK_LIST(column_l), GTK_SELECTION_SINGLE);
-  gtk_signal_connect(GTK_OBJECT(column_l), "selection_changed",
-    GTK_SIGNAL_FUNC(column_sel_list_cb), main_vb);
+  column_l = gtk_clist_new_with_titles(2, column_titles);
+  /* XXX - make this match the packet list prefs? */
+  gtk_clist_set_selection_mode(GTK_CLIST(column_l), GTK_SELECTION_SINGLE);
+  gtk_clist_column_titles_passive(GTK_CLIST(column_l));
+  gtk_clist_column_titles_show(GTK_CLIST(column_l));
+  gtk_clist_set_column_auto_resize(GTK_CLIST(column_l), 0, TRUE);
+  gtk_clist_set_column_auto_resize(GTK_CLIST(column_l), 1, TRUE);
+
+  gtk_signal_connect(GTK_OBJECT(column_l), "select-row",
+    GTK_SIGNAL_FUNC(column_list_select_cb), NULL);
+  gtk_signal_connect(GTK_OBJECT(column_l), "unselect-row",
+    GTK_SIGNAL_FUNC(column_list_unselect_cb), NULL);
   gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(column_sc), column_l);
   gtk_widget_show(column_l);
 
   clp = g_list_first(prefs.col_list);
   while (clp) {
     cfmt    = (fmt_data *) clp->data;
-    nl_lb   = gtk_label_new(cfmt->title);
-    nl_item = gtk_list_item_new();
-    gtk_misc_set_alignment (GTK_MISC (nl_lb), 0.0, 0.5);
-    gtk_container_add(GTK_CONTAINER(nl_item), nl_lb);
-    gtk_widget_show(nl_lb);
-    gtk_container_add(GTK_CONTAINER(column_l), nl_item);
-    gtk_widget_show(nl_item);
-    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_LBL_KEY, nl_lb);
-    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_NAME_KEY, clp);
- 
+    col_ent[0] = cfmt->title;
+    col_ent[1] = col_format_desc(get_column_format_from_str(cfmt->fmt)); 
+    row = gtk_clist_append(GTK_CLIST(column_l), col_ent);
+    gtk_clist_set_row_data(GTK_CLIST(column_l), row, clp);
     clp = clp->next;
   }
   
@@ -159,6 +157,9 @@ column_prefs_show() {
   
   title_te = gtk_entry_new();
   gtk_table_attach_defaults(GTK_TABLE(tb), title_te, 1, 2, 0, 1);
+  gtk_signal_connect(GTK_OBJECT(title_te), "changed",
+    GTK_SIGNAL_FUNC(column_entry_changed_cb), column_l);
+  gtk_widget_set_sensitive(title_te, FALSE);
   gtk_widget_show(title_te);
 
   lb = gtk_label_new("Column format:");
@@ -166,178 +167,195 @@ column_prefs_show() {
   gtk_table_attach_defaults(GTK_TABLE(tb), lb, 0, 1, 1, 2);
   gtk_widget_show(lb);
 
+  top_hb = gtk_hbox_new(FALSE, 5);
+  gtk_table_attach(GTK_TABLE(tb), top_hb, 1, 2, 1, 2, GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_widget_show(top_hb);
+
   fmt_m = gtk_option_menu_new();
   menu  = gtk_menu_new();
   for (i = 0; i < NUM_COL_FMTS; i++) {
     mitem = gtk_menu_item_new_with_label(col_format_desc(i));
     gtk_menu_append(GTK_MENU(menu), mitem);
     gtk_signal_connect( GTK_OBJECT(mitem), "activate",
-      GTK_SIGNAL_FUNC(column_set_fmt_cb), (gpointer) i);
+      GTK_SIGNAL_FUNC(column_menu_changed_cb), (gpointer) i);
     gtk_widget_show(mitem);
   }
   gtk_option_menu_set_menu(GTK_OPTION_MENU(fmt_m), menu);
   cur_fmt = 0;
   gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt);
-  gtk_table_attach_defaults(GTK_TABLE(tb), fmt_m, 1, 2, 1, 2);
+  gtk_widget_set_sensitive(fmt_m, FALSE);
+  gtk_box_pack_start(GTK_BOX(top_hb), fmt_m, FALSE, FALSE, 0);
   gtk_widget_show(fmt_m);  
-      
+  
   return(main_vb);
 }
 
+/* For each selection, set the entry and option menu widgets to match 
+   the currently selected item.  Set the up/down button sensitivity.
+   Draw focus to the entry widget. */
 static void
-column_sel_list_cb(GtkWidget *l, gpointer data) {
+column_list_select_cb(GtkCList *clist,
+                   gint      row,
+                   gint      column _U_,
+                   GdkEvent *event _U_,
+                   gpointer  user_data _U_) {
   fmt_data   *cfmt;
-  gchar      *title = "";
-  GList      *sl, *clp;
-  GtkObject  *l_item;
-  gint        sensitivity = FALSE, up_sens = FALSE, dn_sens = FALSE;
-
-  sl = GTK_LIST(l)->selection;
-          
-  if (sl) {  /* Something was selected */
-    l_item = GTK_OBJECT(sl->data);
-    clp    = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
-    if (clp) {
-      cfmt   = (fmt_data *) clp->data;
-      title   = cfmt->title;
-      cur_fmt = get_column_format_from_str(cfmt->fmt);
-      g_assert(cur_fmt != -1);	/* It should always be valid */
-      gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt);
-      sensitivity = TRUE;
-      if (clp != g_list_first(prefs.col_list))
-        up_sens = TRUE;
-      if (clp != g_list_last(prefs.col_list))
-        dn_sens = TRUE;
-    }
-  }
+  GList      *clp;
+  
+  clp = gtk_clist_get_row_data(clist, row);
+  g_assert(clp != NULL);
+  cfmt   = (fmt_data *) clp->data;
+  cur_fmt = get_column_format_from_str(cfmt->fmt);
+  g_assert(cur_fmt != -1);	/* It should always be valid */
+  cur_row = row;
 
-  /* Did you know that this function is called when the window is destroyed? */
-  /* Funny, that. */
-  if (!gtk_object_get_data(GTK_OBJECT(data), E_COL_CM_KEY)) {
-    gtk_entry_set_text(GTK_ENTRY(title_te), title);
-    gtk_widget_set_sensitive(chg_bt, sensitivity);
-    gtk_widget_set_sensitive(del_bt, sensitivity);
-    gtk_widget_set_sensitive(up_bt, up_sens);
-    gtk_widget_set_sensitive(dn_bt, dn_sens);
-  }
+  gtk_entry_set_text(GTK_ENTRY(title_te), cfmt->title);
+  gtk_editable_select_region(GTK_EDITABLE(title_te), 0, -1);
+  gtk_widget_grab_focus(title_te);
+  
+  gtk_option_menu_set_history(GTK_OPTION_MENU(fmt_m), cur_fmt);
+
+  gtk_widget_set_sensitive(del_bt, TRUE);
+  gtk_widget_set_sensitive(title_te, TRUE);
+  gtk_widget_set_sensitive(fmt_m, TRUE);
+  column_set_arrow_button_sensitivity(clp);
+}
+
+/* A row was deselected.  Clear the text entry box and disable various widgets. */
+static void
+column_list_unselect_cb(GtkCList *clist _U_,
+                   gint      row,
+                   gint      column _U_,
+                   GdkEvent *event _U_,
+                   gpointer  user_data _U_) {
+  
+  cur_row = -1;
+  gtk_editable_delete_text(GTK_EDITABLE(title_te), 0, -1);
+  
+  gtk_widget_set_sensitive(del_bt, FALSE);
+  gtk_widget_set_sensitive(title_te, FALSE);
+  gtk_widget_set_sensitive(fmt_m, FALSE);
+  gtk_widget_set_sensitive(up_bt, FALSE);
+  gtk_widget_set_sensitive(dn_bt, FALSE);
 }
 
 /* To do: add input checking to each of these callbacks */
  
 static void
-column_sel_new_cb(GtkWidget *w _U_, gpointer data _U_) {
+column_list_new_cb(GtkWidget *w _U_, gpointer data _U_) {
   fmt_data   *cfmt;
-  gchar      *title;
-  GtkWidget  *nl_item, *nl_lb;
+  gchar      *title = "New Column", *col_ent[2];
   
-  title = gtk_entry_get_text(GTK_ENTRY(title_te));
-  
-  if (strlen(title) > 0) {
-    cfmt           = (fmt_data *) g_malloc(sizeof(fmt_data));
-    cfmt->title    = g_strdup(title);
-    cfmt->fmt      = g_strdup(col_format_to_string(cur_fmt));
-    prefs.col_list = g_list_append(prefs.col_list, cfmt);
-    nl_lb          = gtk_label_new(cfmt->title);
-    nl_item        = gtk_list_item_new();
-    gtk_misc_set_alignment (GTK_MISC (nl_lb), 0.0, 0.5);
-    gtk_container_add(GTK_CONTAINER(nl_item), nl_lb);
-    gtk_widget_show(nl_lb);
-    gtk_container_add(GTK_CONTAINER(column_l), nl_item);
-    gtk_widget_show(nl_item);
-    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_LBL_KEY, nl_lb);
-    gtk_object_set_data(GTK_OBJECT(nl_item), E_COL_NAME_KEY,
-      g_list_last(prefs.col_list));
-    gtk_list_select_child(GTK_LIST(column_l), nl_item);
-  }
+  cur_fmt        = 0;
+  cfmt           = (fmt_data *) g_malloc(sizeof(fmt_data));
+  cfmt->title    = g_strdup(title);
+  cfmt->fmt      = g_strdup(col_format_to_string(cur_fmt));
+  prefs.col_list = g_list_append(prefs.col_list, cfmt);
+
+  col_ent[0] = title;
+  col_ent[1] = col_format_desc(cur_fmt);
+  cur_row = gtk_clist_append(GTK_CLIST(column_l), col_ent);
+  gtk_clist_set_row_data(GTK_CLIST(column_l), cur_row, g_list_last(prefs.col_list));
+
+  gtk_clist_select_row(GTK_CLIST(column_l), cur_row, 0);
 }
 
 static void
-column_sel_chg_cb(GtkWidget *w _U_, gpointer data _U_) {
-  fmt_data   *cfmt;
-  gchar      *title = "";
+column_list_delete_cb(GtkWidget *w _U_, gpointer data _U_) {
   GList      *sl, *clp;
+  fmt_data   *cfmt;
   GtkObject  *l_item;
-  GtkLabel   *nl_lb;
-
-  sl     = GTK_LIST(column_l)->selection;
-  title  = gtk_entry_get_text(GTK_ENTRY(title_te));
-
-  if (sl) {  /* Something was selected */
-    l_item = GTK_OBJECT(sl->data);
-    clp    = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
-    nl_lb  = (GtkLabel *) gtk_object_get_data(l_item, E_COL_LBL_KEY);
-    if (clp && nl_lb) {
-      cfmt = (fmt_data *) clp->data;
-      
-      if (strlen(title) > 0 && cfmt) {
-        g_free(cfmt->title);
-        g_free(cfmt->fmt);
-        cfmt->title = g_strdup(title);
-        cfmt->fmt   = g_strdup(col_format_to_string(cur_fmt));
-        gtk_label_set(nl_lb, cfmt->title);
-      }
-    }
+  gint        pos;
+
+  g_assert(cur_row >= 0);
+  clp = gtk_clist_get_row_data(GTK_CLIST(column_l), cur_row);
+
+  cfmt = (fmt_data *) clp->data;
+  g_free(cfmt->title);
+  g_free(cfmt->fmt);
+  g_free(cfmt);
+  prefs.col_list = g_list_remove_link(prefs.col_list, clp);
+
+  gtk_clist_remove(GTK_CLIST(column_l), cur_row);
+}
+
+/* The user changed the column title entry box. */
+static void
+column_entry_changed_cb(GtkEditable *te, gpointer data) {
+  fmt_data   *cfmt;
+  GList      *clp;
+  GtkCList   *cl = data;  
+  gchar      *title;
+  gint        row;
+  
+  if (cur_row >= 0) {
+    title = gtk_editable_get_chars(te, 0, -1);
+    clp   = gtk_clist_get_row_data(cl, cur_row);
+    cfmt  = (fmt_data *) clp->data;
+
+    gtk_clist_set_text(cl, cur_row, 0, title);
+    g_free(cfmt->title);
+    cfmt->title = title;
   }
 }
 
+/* The user changed the format menu. */
 static void
-column_sel_del_cb(GtkWidget *w _U_, gpointer data _U_) {
-  GList      *sl, *clp;
+column_menu_changed_cb(GtkWidget *w _U_, gpointer data) {
   fmt_data   *cfmt;
-  GtkObject  *l_item;
-  gint        pos;
+  GList      *clp;
+  gint        row;
   
-  sl = GTK_LIST(column_l)->selection;
-  if (sl) {  /* Something was selected */
-    l_item = GTK_OBJECT(sl->data);
-    pos    = gtk_list_child_position(GTK_LIST(column_l), GTK_WIDGET(l_item));
-    clp    = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
-    if (clp) {
-      cfmt = (fmt_data *) clp->data;
-      g_free(cfmt->title);
-      g_free(cfmt->fmt);
-      g_free(cfmt);
-      prefs.col_list = g_list_remove_link(prefs.col_list, clp);
-      gtk_list_clear_items(GTK_LIST(column_l), pos, pos + 1);
-    } 
+  if (cur_row >= 0) {
+    cur_fmt = (gint) data;
+    clp     = gtk_clist_get_row_data(GTK_CLIST(column_l), cur_row);
+    cfmt    = (fmt_data *) clp->data;
+
+    gtk_clist_set_text(GTK_CLIST(column_l), cur_row, 1, col_format_desc(cur_fmt));
+    g_free(cfmt->fmt);
+    cfmt->fmt = g_strdup(col_format_to_string(cur_fmt));
   }
 }
 
 static void
-column_sel_arrow_cb(GtkWidget *w, gpointer data _U_) {
-  GList      *sl, *clp, *il;
+column_arrow_cb(GtkWidget *w, gpointer data _U_) {
+  GList      *clp;
   fmt_data   *cfmt;
-  GtkObject  *l_item;
-  gint        pos, inc = 1;
+  gint        inc = 1;
   
+  g_assert(cur_row >= 0); 
+
   if (w == up_bt)
     inc = -1;
   
-  sl = GTK_LIST(column_l)->selection;
-  if (sl) {  /* Something was selected */
-    l_item  = GTK_OBJECT(sl->data);
-    pos     = gtk_list_child_position(GTK_LIST(column_l), GTK_WIDGET(l_item));
-    clp     = (GList *) gtk_object_get_data(l_item, E_COL_NAME_KEY);
-    if (clp) {
-      cfmt = (fmt_data *) clp->data;
-      prefs.col_list = g_list_remove(prefs.col_list, cfmt);
-      g_list_insert(prefs.col_list, cfmt, pos + inc);
-      il = (GList *) g_malloc(sizeof(GList));
-      il->next = NULL;
-      il->prev = NULL;
-      il->data = l_item;
-      gtk_widget_ref(GTK_WIDGET(l_item));
-      gtk_list_clear_items(GTK_LIST(column_l), pos, pos + 1);
-      gtk_list_insert_items(GTK_LIST(column_l), il, pos + inc);
-      gtk_widget_unref(GTK_WIDGET(l_item));
-      gtk_list_select_item(GTK_LIST(column_l), pos + inc);
-    } 
-  }
+  /* This would end up appending to the list.  We shouldn't have to check for
+     appending past the end of the list. */
+  g_assert((cur_row + inc) >= 0); 
+
+  clp = gtk_clist_get_row_data(GTK_CLIST(column_l), cur_row);
+  cfmt = (fmt_data *) clp->data;
+  prefs.col_list = g_list_remove(prefs.col_list, cfmt);
+  prefs.col_list = g_list_insert(prefs.col_list, cfmt, cur_row + inc);
+
+  gtk_clist_row_move(GTK_CLIST(column_l), cur_row, cur_row + inc);
+  clp = g_list_find(prefs.col_list, cfmt);
+  cur_row += inc;
+  gtk_clist_set_row_data(GTK_CLIST(column_l), cur_row, clp);
+
+  column_set_arrow_button_sensitivity(clp);
 }
 
 void
-column_set_fmt_cb(GtkWidget *w _U_, gpointer data) {
-  cur_fmt = (gint) data;
+column_set_arrow_button_sensitivity(GList *clp) {
+  gint        up_sens = FALSE, dn_sens = FALSE;
+
+  if (clp != g_list_first(prefs.col_list))
+    up_sens = TRUE;
+  if (clp != g_list_last(prefs.col_list))
+    dn_sens = TRUE;
+
+  gtk_widget_set_sensitive(up_bt, up_sens);
+  gtk_widget_set_sensitive(dn_bt, dn_sens);
 }
 
 void