/* prefs_dlg.c
* Routines for handling preferences
*
- * $Id: prefs_dlg.c,v 1.59 2003/03/11 23:14:42 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#include "main.h"
#include <epan/packet.h>
#include "file.h"
-#include "prefs.h"
+#include <epan/prefs.h>
#include "column_prefs.h"
#include "print.h"
#include "prefs_dlg.h"
#include "print_prefs.h"
#include "stream_prefs.h"
#include "gui_prefs.h"
+#include "layout_prefs.h"
#include "capture_prefs.h"
#include "nameres_prefs.h"
#include "ui_util.h"
#include "simple_dialog.h"
#include "compat_macros.h"
-#include "prefs-int.h"
+#include <epan/prefs-int.h>
#ifdef HAVE_LIBPCAP
-#ifdef WIN32
+#ifdef _WIN32
#include "capture-wpcap.h"
#endif /* _WIN32 */
#endif /* HAVE_LIBPCAP */
static void prefs_main_apply_cb(GtkWidget *, gpointer);
static void prefs_main_save_cb(GtkWidget *, gpointer);
static void prefs_main_cancel_cb(GtkWidget *, gpointer);
-static gboolean prefs_main_delete_cb(GtkWidget *, gpointer);
+static gboolean prefs_main_delete_event_cb(GtkWidget *, GdkEvent *, gpointer);
static void prefs_main_destroy_cb(GtkWidget *, gpointer);
#if GTK_MAJOR_VERSION < 2
static void prefs_tree_select_cb(GtkCTree *, GtkCTreeNode *, gint,
static void prefs_tree_select_cb(GtkTreeSelection *, gpointer);
#endif
-#define E_PRINT_PAGE_KEY "printer_options_page"
-#define E_COLUMN_PAGE_KEY "column_options_page"
-#define E_STREAM_PAGE_KEY "tcp_stream_options_page"
-#define E_GUI_PAGE_KEY "gui_options_page"
-#define E_CAPTURE_PAGE_KEY "capture_options_page"
-#define E_NAMERES_PAGE_KEY "nameres_options_page"
-#define E_TOOLTIPS_KEY "tooltips"
-
-static int first_proto_prefs_page = -1;
+#define E_GUI_PAGE_KEY "gui_options_page"
+#define E_GUI_LAYOUT_PAGE_KEY "gui_layout_page"
+#define E_GUI_COLUMN_PAGE_KEY "gui_column_options_page"
+#define E_GUI_FONT_PAGE_KEY "gui_font_options_page"
+#define E_GUI_COLORS_PAGE_KEY "gui_colors_options_page"
+#define E_CAPTURE_PAGE_KEY "capture_options_page"
+#define E_PRINT_PAGE_KEY "printer_options_page"
+#define E_NAMERES_PAGE_KEY "nameres_options_page"
+#define E_PAGE_MODULE_KEY "page_module"
/*
* Keep a static pointer to the notebook to be able to choose the
gboolean is_protocol;
};
-static void
+static guint
+pref_exists(pref_t *pref _U_, gpointer user_data _U_)
+{
+ return 1;
+}
+
+/* show a single preference on the GtkTable of a preference page */
+static guint
pref_show(pref_t *pref, gpointer user_data)
{
GtkWidget *main_tb = user_data;
switch (pref->info.base) {
case 10:
- sprintf(uint_str, "%u", pref->saved_val.uint);
+ g_snprintf(uint_str, 10+1, "%u", pref->saved_val.uint);
break;
case 8:
- sprintf(uint_str, "%o", pref->saved_val.uint);
+ g_snprintf(uint_str, 10+1, "%o", pref->saved_val.uint);
break;
case 16:
- sprintf(uint_str, "%x", pref->saved_val.uint);
+ g_snprintf(uint_str, 10+1, "%x", pref->saved_val.uint);
break;
}
pref->control = create_preference_entry(main_tb, pref->ordinal,
pref->saved_val.string);
break;
+ case PREF_RANGE:
+ {
+ char *range_string;
+
+ if (pref->saved_val.range != NULL)
+ g_free(pref->saved_val.range);
+ pref->saved_val.range = range_copy(*pref->varp.range);
+ range_string = range_convert_range(*pref->varp.range);
+ pref->control = create_preference_entry(main_tb, pref->ordinal,
+ label_string, pref->description,
+ range_string);
+ g_free(range_string);
+ break;
+ }
+
case PREF_OBSOLETE:
g_assert_not_reached();
break;
}
g_free(label_string);
+
+ return 0;
}
#define MAX_TREE_NODE_NAME_LEN 64
-static void
+/* show prefs page for each registered module (protocol) */
+static guint
module_prefs_show(module_t *module, gpointer user_data)
{
struct ct_struct *cts = user_data;
GtkTreeIter iter;
#endif
+ /*
+ * Is this module a subtree, with modules underneath it?
+ */
+ if (!module->is_subtree) {
+ /*
+ * No.
+ * Does it have any preferences (other than possibly obsolete ones)?
+ */
+ if (prefs_pref_foreach(module, pref_exists, NULL) == 0) {
+ /*
+ * No. Don't put the module into the preferences window.
+ * XXX - we should do the same for subtrees; if a subtree has
+ * nothing under it that will be displayed, don't put it into
+ * the window.
+ */
+ return 0;
+ }
+ }
+
/*
* Add this module to the tree.
*/
prefs_module_list_foreach(module->prefs, module_prefs_show, &child_cts);
} else {
/*
- * No.
- * Create a notebook page for it.
+ * No. Create a notebook page for it.
*/
/* Frame */
/* Add items for each of the preferences */
prefs_pref_foreach(module, pref_show, main_tb);
+ /* Associate this module with the page's frame. */
+ OBJECT_SET_DATA(frame, E_PAGE_MODULE_KEY, module);
+
/* Add the page to the notebook */
gtk_notebook_append_page(GTK_NOTEBOOK(cts->notebook), frame, NULL);
gtk_tree_store_set(model, &iter, 0, label_str, 1, cts->page, -1);
#endif
- /* If this is the first protocol page, remember its page number */
- if (first_proto_prefs_page == -1)
- first_proto_prefs_page = cts->page;
cts->page++;
/* Show 'em what we got */
gtk_widget_show_all(main_vb);
}
+
+ return 0;
+}
+
+
+#if GTK_MAJOR_VERSION < 2
+#define prefs_tree_iter GtkCTreeNode *
+#else
+#define prefs_tree_iter GtkTreeIter
+#endif
+
+/* add a page to the tree */
+prefs_tree_iter
+prefs_tree_page_add(const gchar *title, gint page_nr,
+ gpointer store, prefs_tree_iter *parent_iter,
+ gboolean has_child
+#if GTK_MAJOR_VERSION >= 2
+ _U_
+#endif
+ )
+{
+#if GTK_MAJOR_VERSION < 2
+ const gchar *label_ptr = title;
+#endif
+ prefs_tree_iter iter;
+
+#if GTK_MAJOR_VERSION < 2
+ iter = gtk_ctree_insert_node(GTK_CTREE(store), parent_iter ? *parent_iter : NULL, NULL,
+ (gchar **) &label_ptr, 5, NULL, NULL, NULL, NULL, !has_child, TRUE);
+ gtk_ctree_node_set_row_data(GTK_CTREE(store), iter,
+ GINT_TO_POINTER(page_nr));
+#else
+ gtk_tree_store_append(store, &iter, parent_iter);
+ gtk_tree_store_set(store, &iter, 0, title, 1, page_nr, -1);
+#endif
+ return iter;
+}
+
+/* add a page to the notebook */
+GtkWidget *
+prefs_nb_page_add(GtkWidget *notebook, const gchar *title, GtkWidget *page, const char *page_key)
+{
+ GtkWidget *frame;
+
+ frame = gtk_frame_new(title);
+ gtk_widget_show(frame);
+ gtk_container_add(GTK_CONTAINER(frame), page);
+ OBJECT_SET_DATA(prefs_w, page_key, page);
+ gtk_notebook_append_page (GTK_NOTEBOOK(notebook), frame, NULL);
+
+ return frame;
}
+
+/* show the dialog */
void
prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
{
- GtkWidget *top_hb, *bbox, *prefs_nb, *ct_sb, *frame,
+ GtkWidget *top_hb, *bbox, *prefs_nb, *ct_sb,
*ok_bt, *apply_bt, *save_bt, *cancel_bt;
- GtkWidget *print_pg, *column_pg, *stream_pg, *gui_pg;
-#ifdef HAVE_LIBPCAP
- GtkWidget *capture_pg;
-#endif
- GtkWidget *nameres_pg;
+ GtkWidget *gui_font_pg;
gchar label_str[MAX_TREE_NODE_NAME_LEN];
struct ct_struct cts;
#if GTK_MAJOR_VERSION < 2
- gchar *label_ptr = label_str;
- GtkCTreeNode *ct_node;
+ gpointer store = NULL;
+ static gchar *fixedwidths[] = { "c", "m", NULL };
#else
GtkTreeStore *store;
GtkTreeSelection *selection;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
gint col_offset;
- GtkTreeIter iter;
#endif
+ prefs_tree_iter gui_iter;
+
if (prefs_w != NULL) {
/* There's already a "Preferences" dialog box; reactivate it. */
copy_prefs(&saved_prefs, &prefs);
prefs_w = dlg_window_new("Ethereal: Preferences");
- SIGNAL_CONNECT(prefs_w, "delete_event", prefs_main_delete_cb, NULL);
- SIGNAL_CONNECT(prefs_w, "destroy", prefs_main_destroy_cb, NULL);
/*
* Unfortunately, we can't arrange that a GtkTable widget wrap an event box
gtk_container_add(GTK_CONTAINER(cts.main_vb), top_hb);
gtk_widget_show(top_hb);
- /* Place a Ctree on the left for preference categories */
+ /* scrolled window on the left for the categories tree */
ct_sb = scrolled_window_new(NULL, NULL);
+#if GTK_MAJOR_VERSION >= 2
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ct_sb),
+ GTK_SHADOW_IN);
+#endif
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ct_sb),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(top_hb), ct_sb);
gtk_widget_show(ct_sb);
+ /* categories tree */
#if GTK_MAJOR_VERSION < 2
cts.tree = ctree_new(1, 0);
+ store = cts.tree;
cts.node = NULL;
+ gtk_clist_set_column_auto_resize(GTK_CLIST(cts.tree), 0, TRUE);
+ SIGNAL_CONNECT(cts.tree, "tree-select-row", prefs_tree_select_cb, NULL);
#else
store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_INT);
cts.tree = tree_view_new(GTK_TREE_MODEL(store));
col_offset - 1);
gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column),
GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-#endif
- cts.page = 0;
- gtk_container_add(GTK_CONTAINER(ct_sb), cts.tree);
-
-#if GTK_MAJOR_VERSION < 2
- gtk_clist_set_column_auto_resize(GTK_CLIST(cts.tree), 0, TRUE);
- SIGNAL_CONNECT(cts.tree, "tree-select-row", prefs_tree_select_cb, NULL);
-#else
SIGNAL_CONNECT(selection, "changed", prefs_tree_select_cb, NULL);
#endif
+ gtk_container_add(GTK_CONTAINER(ct_sb), cts.tree);
gtk_widget_show(cts.tree);
- /* A notebook widget sans tabs is used to flip between prefs */
+ /* A notebook widget without tabs is used to flip between prefs */
notebook = prefs_nb = gtk_notebook_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(prefs_nb), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(prefs_nb), FALSE);
gtk_container_add(GTK_CONTAINER(top_hb), prefs_nb);
gtk_widget_show(prefs_nb);
- /* Printing prefs */
- frame = gtk_frame_new("Printing");
- gtk_widget_show(GTK_WIDGET(frame));
- print_pg = printer_prefs_show();
- gtk_container_add(GTK_CONTAINER(frame), print_pg);
- OBJECT_SET_DATA(prefs_w, E_PRINT_PAGE_KEY, print_pg);
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
- strcpy(label_str, "Printing");
-#if GTK_MAJOR_VERSION < 2
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.tree), NULL, NULL,
- &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
- gtk_ctree_node_set_row_data(GTK_CTREE(cts.tree), ct_node,
- GINT_TO_POINTER(cts.page));
-#else
- gtk_tree_store_append(store, &iter, NULL);
- gtk_tree_store_set(store, &iter, 0, label_str, 1, cts.page, -1);
-#endif
+ cts.page = 0;
+
+ /* GUI prefs */
+ strcpy(label_str, "User Interface");
+ prefs_nb_page_add(prefs_nb, label_str, gui_prefs_show(), E_GUI_PAGE_KEY);
+ gui_iter = prefs_tree_page_add(label_str, cts.page, store, NULL, TRUE);
cts.page++;
- /* Column prefs */
- frame = gtk_frame_new("Columns");
- gtk_widget_show(GTK_WIDGET(frame));
- column_pg = column_prefs_show();
- gtk_container_add(GTK_CONTAINER(frame), column_pg);
- OBJECT_SET_DATA(prefs_w, E_COLUMN_PAGE_KEY, column_pg);
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
+ /* GUI layout prefs */
+ strcpy(label_str, "Layout");
+ prefs_nb_page_add(prefs_nb, label_str, layout_prefs_show(), E_GUI_LAYOUT_PAGE_KEY);
+ prefs_tree_page_add(label_str, cts.page, store, &gui_iter, FALSE);
+ cts.page++;
+
+ /* GUI Column prefs */
strcpy(label_str, "Columns");
-#if GTK_MAJOR_VERSION < 2
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.tree), NULL, NULL,
- &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
- gtk_ctree_node_set_row_data(GTK_CTREE(cts.tree), ct_node,
- GINT_TO_POINTER(cts.page));
-#else
- gtk_tree_store_append(store, &iter, NULL);
- gtk_tree_store_set(store, &iter, 0, label_str, 1, cts.page, -1);
-#endif
+ prefs_nb_page_add(prefs_nb, label_str, column_prefs_show(), E_GUI_COLUMN_PAGE_KEY);
+ prefs_tree_page_add(label_str, cts.page, store, &gui_iter, FALSE);
+ cts.page++;
+
+ /* GUI Font prefs */
+ strcpy(label_str, "Font");
+ gui_font_pg = gui_font_prefs_show();
+ prefs_nb_page_add(prefs_nb, label_str, gui_font_pg, E_GUI_FONT_PAGE_KEY);
+ prefs_tree_page_add(label_str, cts.page, store, &gui_iter, FALSE);
cts.page++;
- /* TCP Streams prefs */
- frame = gtk_frame_new("TCP Streams");
- gtk_widget_show(GTK_WIDGET(frame));
- stream_pg = stream_prefs_show();
- gtk_container_add(GTK_CONTAINER(frame), stream_pg);
- OBJECT_SET_DATA(prefs_w, E_STREAM_PAGE_KEY, stream_pg);
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
- strcpy(label_str, "TCP Streams");
+ gtk_container_border_width( GTK_CONTAINER(gui_font_pg), 5 );
+
+ /* IMPORTANT: the following gtk_font_selection_set_xy() functions will only
+ work, if the widget and it's corresponding window is already shown
+ (so don't put the following into gui_font_prefs_show()) !!! */
+
+ /* We set the current font and, for GTK+ 1.2[.x], the font filter
+ now, because they appear not to work when run before appending
+ the frame to the notebook. */
+
+ /* Set the font to the current font.
+ XXX - GTK+ 1.2.8, and probably earlier versions, have a bug
+ wherein that doesn't necessarily cause that font to be
+ selected in the dialog box. I've sent to the GTK+ folk
+ a fix; hopefully, it'll show up in 1.2.9 if, as, and when
+ they put out a 1.2.9 release. */
+ gtk_font_selection_set_font_name(
+ GTK_FONT_SELECTION(gui_font_pg), prefs.PREFS_GUI_FONT_NAME);
+
#if GTK_MAJOR_VERSION < 2
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.tree), NULL, NULL,
- &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
- gtk_ctree_node_set_row_data(GTK_CTREE(cts.tree), ct_node,
- GINT_TO_POINTER(cts.page));
-#else
- gtk_tree_store_append(store, &iter, NULL);
- gtk_tree_store_set(store, &iter, 0, label_str, 1, cts.page, -1);
-#endif
+ /* Set its filter to show only fixed_width fonts. */
+ gtk_font_selection_set_filter(
+ GTK_FONT_SELECTION(gui_font_pg),
+ GTK_FONT_FILTER_BASE, /* user can't change the filter */
+ GTK_FONT_ALL, /* bitmap or scalable are fine */
+ NULL, /* all foundries are OK */
+ NULL, /* all weights are OK (XXX - normal only?) */
+ NULL, /* all slants are OK (XXX - Roman only?) */
+ NULL, /* all setwidths are OK */
+ fixedwidths, /* ONLY fixed-width fonts */
+ NULL); /* all charsets are OK (XXX - ISO 8859/1 only?) */
+#endif
+
+ /* GUI Colors prefs */
+ strcpy(label_str, "Colors");
+ prefs_nb_page_add(prefs_nb, label_str, stream_prefs_show(), E_GUI_COLORS_PAGE_KEY);
+ prefs_tree_page_add(label_str, cts.page, store, &gui_iter, FALSE);
cts.page++;
- /* GUI prefs */
- frame = gtk_frame_new("User Interface");
- gtk_widget_show(GTK_WIDGET(frame));
- gui_pg = gui_prefs_show();
- gtk_container_add(GTK_CONTAINER(frame), gui_pg);
- OBJECT_SET_DATA(prefs_w, E_GUI_PAGE_KEY, gui_pg);
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
- strcpy(label_str, "User Interface");
+ /* select the main GUI page as the default page and expand it's children */
#if GTK_MAJOR_VERSION < 2
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.tree), NULL, NULL,
- &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
- gtk_ctree_node_set_row_data(GTK_CTREE(cts.tree), ct_node,
- GINT_TO_POINTER(cts.page));
+ gtk_ctree_select(GTK_CTREE(cts.tree), gui_iter);
#else
- gtk_tree_store_append(store, &iter, NULL);
- gtk_tree_store_set(store, &iter, 0, label_str, 1, cts.page, -1);
+ gtk_tree_selection_select_iter(selection, &gui_iter);
+ /* (expand will only take effect, when at least one child exists) */
+ gtk_tree_view_expand_all(GTK_TREE_VIEW(cts.tree));
#endif
- cts.page++;
#ifdef HAVE_LIBPCAP
#ifdef _WIN32
if (has_wpcap) {
#endif /* _WIN32 */
/* capture prefs */
- frame = gtk_frame_new("Capture");
- gtk_widget_show(GTK_WIDGET(frame));
- capture_pg = capture_prefs_show();
- gtk_container_add(GTK_CONTAINER(frame), capture_pg);
- OBJECT_SET_DATA(prefs_w, E_CAPTURE_PAGE_KEY, capture_pg);
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
strcpy(label_str, "Capture");
-#if GTK_MAJOR_VERSION < 2
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.tree), NULL, NULL,
- &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
- gtk_ctree_node_set_row_data(GTK_CTREE(cts.tree), ct_node,
- GINT_TO_POINTER(cts.page));
-#else
- gtk_tree_store_append(store, &iter, NULL);
- gtk_tree_store_set(store, &iter, 0, label_str, 1, cts.page, -1);
-#endif
+ prefs_nb_page_add(prefs_nb, label_str, capture_prefs_show(), E_CAPTURE_PAGE_KEY);
+ prefs_tree_page_add(label_str, cts.page, store, NULL, FALSE);
cts.page++;
#ifdef _WIN32
}
#endif /* _WIN32 */
#endif /* HAVE_LIBPCAP */
+ /* Printing prefs */
+ strcpy(label_str, "Printing");
+ prefs_nb_page_add(prefs_nb, label_str, printer_prefs_show(), E_PRINT_PAGE_KEY);
+ prefs_tree_page_add(label_str, cts.page, store, NULL, FALSE);
+ cts.page++;
+
/* Name resolution prefs */
- frame = gtk_frame_new("Name resolution");
- gtk_widget_show(GTK_WIDGET(frame));
- nameres_pg = nameres_prefs_show();
- gtk_container_add(GTK_CONTAINER(frame), nameres_pg);
- OBJECT_SET_DATA(prefs_w, E_NAMERES_PAGE_KEY, nameres_pg);
- gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), frame, NULL);
- strcpy(label_str, "Name resolution");
-#if GTK_MAJOR_VERSION < 2
- ct_node = gtk_ctree_insert_node(GTK_CTREE(cts.tree), NULL, NULL,
- &label_ptr, 5, NULL, NULL, NULL, NULL, TRUE, TRUE);
- gtk_ctree_node_set_row_data(GTK_CTREE(cts.tree), ct_node,
- GINT_TO_POINTER(cts.page));
-#else
- gtk_tree_store_append(store, &iter, NULL);
- gtk_tree_store_set(store, &iter, 0, label_str, 1, cts.page, -1);
-#endif
+ strcpy(label_str, "Name Resolution");
+ prefs_nb_page_add(prefs_nb, label_str, nameres_prefs_show(), E_NAMERES_PAGE_KEY);
+ prefs_tree_page_add(label_str, cts.page, store, NULL, FALSE);
cts.page++;
/* Registered prefs */
prefs_module_list_foreach(NULL, module_prefs_show, &cts);
/* Button row: OK and cancel buttons */
- bbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
- gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
- gtk_container_add(GTK_CONTAINER(cts.main_vb), bbox);
+ bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, NULL);
+ gtk_box_pack_start(GTK_BOX(cts.main_vb), bbox, FALSE, FALSE, 0);
gtk_widget_show(bbox);
-#if GTK_MAJOR_VERSION < 2
- ok_bt = gtk_button_new_with_label ("OK");
-#else
- ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
+ ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
SIGNAL_CONNECT(ok_bt, "clicked", prefs_main_ok_cb, prefs_w);
- GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
- gtk_widget_grab_default(ok_bt);
- gtk_widget_show(ok_bt);
-#if GTK_MAJOR_VERSION < 2
- apply_bt = gtk_button_new_with_label ("Apply");
-#else
- apply_bt = gtk_button_new_from_stock(GTK_STOCK_APPLY);
-#endif
+ apply_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_APPLY);
SIGNAL_CONNECT(apply_bt, "clicked", prefs_main_apply_cb, prefs_w);
- GTK_WIDGET_SET_FLAGS(apply_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start(GTK_BOX (bbox), apply_bt, TRUE, TRUE, 0);
- gtk_widget_show(apply_bt);
-#if GTK_MAJOR_VERSION < 2
- save_bt = gtk_button_new_with_label ("Save");
-#else
- save_bt = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-#endif
+ save_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_SAVE);
SIGNAL_CONNECT(save_bt, "clicked", prefs_main_save_cb, prefs_w);
- GTK_WIDGET_SET_FLAGS(save_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (bbox), save_bt, TRUE, TRUE, 0);
- gtk_widget_show(save_bt);
-#if GTK_MAJOR_VERSION < 2
- cancel_bt = gtk_button_new_with_label ("Cancel");
-#else
- cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
+ cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
SIGNAL_CONNECT(cancel_bt, "clicked", prefs_main_cancel_cb, prefs_w);
- GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
- gtk_widget_show(cancel_bt);
+ window_set_cancel_button(prefs_w, cancel_bt, NULL);
- /* Catch the "key_press_event" signal in the window, so that we can catch
- the ESC key being pressed and act as if the "Cancel" button had
- been selected. */
- dlg_set_cancel(prefs_w, cancel_bt);
+ gtk_widget_grab_default(ok_bt);
+
+ SIGNAL_CONNECT(prefs_w, "delete_event", prefs_main_delete_event_cb, prefs_w);
+ SIGNAL_CONNECT(prefs_w, "destroy", prefs_main_destroy_cb, prefs_w);
gtk_widget_show(prefs_w);
+ window_present(prefs_w);
#if GTK_MAJOR_VERSION >= 2
g_object_unref(G_OBJECT(store));
for (enum_valp = enumvals, index = 0; enum_valp->name != NULL;
enum_valp++, index++) {
button = gtk_radio_button_new_with_label(rb_group,
- enum_valp->name);
+ enum_valp->description);
gtk_widget_show(button);
- if (rb_group == NULL)
- rb_group = gtk_radio_button_group(GTK_RADIO_BUTTON(button));
+ rb_group = gtk_radio_button_group(GTK_RADIO_BUTTON(button));
gtk_box_pack_start(GTK_BOX(radio_button_hbox), button, FALSE,
FALSE, 10);
if (enum_valp->value == current_val) {
label_to_enum_val(GtkWidget *label, const enum_val_t *enumvals)
{
char *label_string;
- gint enumval;
+ int i;
- /* Get the label's text, and translate it to a value. */
+ /* Get the label's text, and translate it to a value.
+ We match only the descriptions, as those are what appear in
+ the option menu items or as labels for radio buttons.
+ We fail if we don't find a match, as that "can't happen". */
gtk_label_get(GTK_LABEL(label), &label_string);
- enumval = find_val_for_string(label_string, enumvals, 1);
- return enumval;
+ for (i = 0; enumvals[i].name != NULL; i++) {
+ if (strcasecmp(label_string, enumvals[i].description) == 0) {
+ return enumvals[i].value;
+ }
+ }
+ g_assert_not_reached();
+ return -1;
}
gint
menu_index = -1;
for (enum_valp = enumvals, index = 0; enum_valp->name != NULL;
enum_valp++, index++) {
- menu_item = gtk_menu_item_new_with_label(enum_valp->name);
+ menu_item = gtk_menu_item_new_with_label(enum_valp->description);
gtk_menu_append(GTK_MENU(menu), menu_item);
if (enum_valp->value == current_val)
menu_index = index;
return entry;
}
-static void
+static guint
+pref_check(pref_t *pref, gpointer user_data)
+{
+ const char *str_val;
+ char *p;
+ guint uval;
+ pref_t **badpref = user_data;
+
+ /* Fetch the value of the preference, and check whether it's valid. */
+ switch (pref->type) {
+
+ case PREF_UINT:
+ str_val = gtk_entry_get_text(GTK_ENTRY(pref->control));
+ uval = strtoul(str_val, &p, pref->info.base);
+ if (p == str_val || *p != '\0') {
+ *badpref = pref;
+ return PREFS_SET_SYNTAX_ERR; /* number was bad */
+ }
+ break;
+
+ case PREF_BOOL:
+ /* Value can't be bad. */
+ break;
+
+ case PREF_ENUM:
+ /* Value can't be bad. */
+ break;
+
+ case PREF_STRING:
+ /* Value can't be bad. */
+ break;
+
+ case PREF_RANGE:
+ str_val = gtk_entry_get_text(GTK_ENTRY(pref->control));
+
+ if (strlen(str_val) != 0) {
+ range_t *newrange;
+
+ if (range_convert_str(&newrange, str_val, pref->info.max_value) !=
+ CVT_NO_ERROR) {
+ *badpref = pref;
+ return PREFS_SET_SYNTAX_ERR; /* range was bad */
+ }
+ g_free(newrange);
+ }
+ break;
+
+ case PREF_OBSOLETE:
+ g_assert_not_reached();
+ break;
+ }
+ return 0;
+}
+
+static guint
+module_prefs_check(module_t *module, gpointer user_data)
+{
+ /* For all preferences in this module, fetch its value from this
+ module's notebook page and check whether it's valid. */
+ return prefs_pref_foreach(module, pref_check, user_data);
+}
+
+static guint
pref_fetch(pref_t *pref, gpointer user_data)
{
- char *str_val;
+ const char *str_val;
char *p;
guint uval;
gboolean bval;
}
break;
+ case PREF_RANGE:
+ {
+ range_t *newrange;
+ convert_ret_t ret;
+
+ str_val = gtk_entry_get_text(GTK_ENTRY(pref->control));
+ ret = range_convert_str(&newrange, str_val, pref->info.max_value);
+ if (ret != CVT_NO_ERROR)
+#if 0
+ return PREFS_SET_SYNTAX_ERR; /* range was bad */
+#else
+ return 0; /* XXX - should fail */
+#endif
+
+ if (!ranges_are_equal(*pref->varp.range, newrange)) {
+ *pref_changed_p = TRUE;
+ g_free(*pref->varp.range);
+ *pref->varp.range = newrange;
+ } else
+ g_free(newrange);
+
+ break;
+ }
+
case PREF_OBSOLETE:
g_assert_not_reached();
break;
}
+ return 0;
}
-static void
+static guint
module_prefs_fetch(module_t *module, gpointer user_data)
{
gboolean *must_redissect_p = user_data;
could cause packets to be dissected differently. */
if (module->prefs_changed)
*must_redissect_p = TRUE;
+
+ return 0; /* keep fetching module preferences */
}
-static void
+static guint
pref_clean(pref_t *pref, gpointer user_data _U_)
{
switch (pref->type) {
}
break;
+ case PREF_RANGE:
+ if (pref->saved_val.range != NULL) {
+ g_free(pref->saved_val.range);
+ pref->saved_val.range = NULL;
+ }
+ break;
+
case PREF_OBSOLETE:
g_assert_not_reached();
break;
}
+ return 0;
}
-static void
+static guint
module_prefs_clean(module_t *module, gpointer user_data _U_)
{
/* For all preferences in this module, clean up any cruft allocated for
use by the GUI code. */
prefs_pref_foreach(module, pref_clean, NULL);
+ return 0; /* keep cleaning modules */
}
-static void
-prefs_main_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
+/* fetch all pref values from all pages */
+static gboolean
+prefs_main_fetch_all(GtkWidget *dlg, gboolean *must_redissect)
{
- gboolean must_redissect = FALSE;
+ pref_t *badpref;
+
+ /* First, check that the values are all valid. */
+ /* XXX - check the non-registered preferences too */
+ switch (prefs_modules_foreach(module_prefs_check, (gpointer)&badpref)) {
+
+ case PREFS_SET_SYNTAX_ERR:
+ switch (badpref->type) {
+
+ case PREF_UINT:
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "The value for \"%s\" isn't a valid number.",
+ badpref->title);
+ return FALSE;
+
+ case PREF_RANGE:
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "The value for \"%s\" isn't a valid range.",
+ badpref->title);
+ return FALSE;
+
+ default:
+ g_assert_not_reached();
+ break;
+ }
+ }
/* Fetch the preferences (i.e., make sure all the values set in all of
the preferences panes have been copied to "prefs" and the registered
preferences). */
- printer_prefs_fetch(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
- column_prefs_fetch(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
- stream_prefs_fetch(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
- gui_prefs_fetch(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
-#ifdef HAVE_LIBPCAP
-#ifdef _WIN32
- /* Is WPcap loaded? */
- if (has_wpcap) {
-#endif /* _WIN32 */
- capture_prefs_fetch(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
-#ifdef _WIN32
- }
-#endif /* _WIN32 */
-#endif /* HAVE_LIBPCAP */
- nameres_prefs_fetch(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
- prefs_modules_foreach(module_prefs_fetch, &must_redissect);
-
- /* Now apply those preferences. */
- printer_prefs_apply(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
- column_prefs_apply(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
- stream_prefs_apply(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
- gui_prefs_apply(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
+ gui_prefs_fetch(OBJECT_GET_DATA(dlg, E_GUI_PAGE_KEY));
+ layout_prefs_fetch(OBJECT_GET_DATA(dlg, E_GUI_LAYOUT_PAGE_KEY));
+ column_prefs_fetch(OBJECT_GET_DATA(dlg, E_GUI_COLUMN_PAGE_KEY));
+ stream_prefs_fetch(OBJECT_GET_DATA(dlg, E_GUI_COLORS_PAGE_KEY));
+
#ifdef HAVE_LIBPCAP
#ifdef _WIN32
/* Is WPcap loaded? */
if (has_wpcap) {
#endif /* _WIN32 */
- capture_prefs_apply(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
+ capture_prefs_fetch(OBJECT_GET_DATA(dlg, E_CAPTURE_PAGE_KEY));
#ifdef _WIN32
}
#endif /* _WIN32 */
#endif /* HAVE_LIBPCAP */
- nameres_prefs_apply(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
- prefs_apply_all();
+ printer_prefs_fetch(OBJECT_GET_DATA(dlg, E_PRINT_PAGE_KEY));
+ nameres_prefs_fetch(OBJECT_GET_DATA(dlg, E_NAMERES_PAGE_KEY));
- /* Now destroy the "Preferences" dialog. */
- gtk_widget_destroy(GTK_WIDGET(parent_w));
+ prefs_modules_foreach(module_prefs_fetch, must_redissect);
- if (must_redissect) {
- /* Redissect all the packets, and re-evaluate the display filter. */
- redissect_packets(&cfile);
- }
+ return TRUE;
}
+/* apply all pref values to the real world */
static void
-prefs_main_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w)
+prefs_main_apply_all(GtkWidget *dlg)
{
- gboolean must_redissect = FALSE;
+ /*
+ * Apply the protocol preferences first - "gui_prefs_apply()" could
+ * cause redissection, and we have to make sure the protocol
+ * preference changes have been fully applied.
+ */
+ prefs_apply_all();
+
+ gui_prefs_apply(OBJECT_GET_DATA(dlg, E_GUI_PAGE_KEY));
+ layout_prefs_apply(OBJECT_GET_DATA(dlg, E_GUI_LAYOUT_PAGE_KEY));
+ column_prefs_apply(OBJECT_GET_DATA(dlg, E_GUI_COLUMN_PAGE_KEY));
+ stream_prefs_apply(OBJECT_GET_DATA(dlg, E_GUI_COLORS_PAGE_KEY));
- /* Fetch the preferences (i.e., make sure all the values set in all of
- the preferences panes have been copied to "prefs" and the registered
- preferences). */
- printer_prefs_fetch(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
- column_prefs_fetch(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
- stream_prefs_fetch(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
- gui_prefs_fetch(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
#ifdef HAVE_LIBPCAP
#ifdef _WIN32
/* Is WPcap loaded? */
if (has_wpcap) {
#endif /* _WIN32 */
- capture_prefs_fetch(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
+ capture_prefs_apply(OBJECT_GET_DATA(dlg, E_CAPTURE_PAGE_KEY));
#ifdef _WIN32
}
#endif /* _WIN32 */
#endif /* HAVE_LIBPCAP */
- nameres_prefs_fetch(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
- prefs_modules_foreach(module_prefs_fetch, &must_redissect);
-
- /* Now apply those preferences. */
- printer_prefs_apply(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
- column_prefs_apply(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
- stream_prefs_apply(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
- gui_prefs_apply(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
+ printer_prefs_apply(OBJECT_GET_DATA(dlg, E_PRINT_PAGE_KEY));
+ nameres_prefs_apply(OBJECT_GET_DATA(dlg, E_NAMERES_PAGE_KEY));
+}
+
+
+/* destroy all preferences ressources from all pages */
+static void
+prefs_main_destroy_all(GtkWidget *dlg)
+{
+ gui_prefs_destroy(OBJECT_GET_DATA(dlg, E_GUI_PAGE_KEY));
+ layout_prefs_destroy(OBJECT_GET_DATA(dlg, E_GUI_LAYOUT_PAGE_KEY));
+ column_prefs_destroy(OBJECT_GET_DATA(dlg, E_GUI_COLUMN_PAGE_KEY));
+ stream_prefs_destroy(OBJECT_GET_DATA(dlg, E_GUI_COLORS_PAGE_KEY));
+
#ifdef HAVE_LIBPCAP
#ifdef _WIN32
/* Is WPcap loaded? */
if (has_wpcap) {
#endif /* _WIN32 */
- capture_prefs_apply(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
+ capture_prefs_destroy(OBJECT_GET_DATA(dlg, E_CAPTURE_PAGE_KEY));
#ifdef _WIN32
}
#endif /* _WIN32 */
#endif /* HAVE_LIBPCAP */
- nameres_prefs_apply(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
- prefs_apply_all();
+ printer_prefs_destroy(OBJECT_GET_DATA(dlg, E_PRINT_PAGE_KEY));
+ nameres_prefs_destroy(OBJECT_GET_DATA(dlg, E_NAMERES_PAGE_KEY));
+
+ /* Free up the saved preferences (both for "prefs" and for registered
+ preferences). */
+ free_prefs(&saved_prefs);
+ prefs_modules_foreach(module_prefs_clean, NULL);
+}
+
+
+static void
+prefs_main_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
+{
+ gboolean must_redissect = FALSE;
+
+ if (!prefs_main_fetch_all(parent_w, &must_redissect))
+ return; /* Errors in some preference setting */
+
+ prefs_main_apply_all(parent_w);
+
+ /* Now destroy the "Preferences" dialog. */
+ window_destroy(GTK_WIDGET(parent_w));
+
+ if (must_redissect) {
+ /* Redissect all the packets, and re-evaluate the display filter. */
+ cf_redissect_packets(&cfile);
+ }
+}
+
+static void
+prefs_main_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w)
+{
+ gboolean must_redissect = FALSE;
+
+ if (!prefs_main_fetch_all(parent_w, &must_redissect))
+ return; /* Errors in some preference setting */
+
+ prefs_main_apply_all(parent_w);
if (must_redissect) {
/* Redissect all the packets, and re-evaluate the display filter. */
- redissect_packets(&cfile);
+ cf_redissect_packets(&cfile);
}
}
char *pf_dir_path;
char *pf_path;
- /* Fetch the preferences (i.e., make sure all the values set in all of
- the preferences panes have been copied to "prefs" and the registered
- preferences). */
- printer_prefs_fetch(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
- column_prefs_fetch(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
- stream_prefs_fetch(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
- gui_prefs_fetch(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
-#ifdef HAVE_LIBPCAP
-#ifdef _WIN32
- /* Is WPcap loaded? */
- if (has_wpcap) {
-#endif /* _WIN32 */
- capture_prefs_fetch(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
-#ifdef _WIN32
- }
-#endif /* _WIN32 */
-#endif /* HAVE_LIBPCAP */
- nameres_prefs_fetch(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
- prefs_modules_foreach(module_prefs_fetch, &must_redissect);
+ if (!prefs_main_fetch_all(parent_w, &must_redissect))
+ return; /* Errors in some preference setting */
/* Create the directory that holds personal configuration files, if
necessary. */
if (create_persconffile_dir(&pf_dir_path) == -1) {
- simple_dialog(ESD_TYPE_WARN, NULL,
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"Can't create directory\n\"%s\"\nfor preferences file: %s.", pf_dir_path,
strerror(errno));
g_free(pf_dir_path);
/* Write the preferencs out. */
err = write_prefs(&pf_path);
if (err != 0) {
- simple_dialog(ESD_TYPE_WARN, NULL,
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"Can't open preferences file\n\"%s\": %s.", pf_path,
strerror(err));
g_free(pf_path);
"Apply" after this, we know we have to redissect;
4) we did apply the protocol preferences, at least, in the past. */
- printer_prefs_apply(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
- column_prefs_apply(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
- stream_prefs_apply(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
- gui_prefs_apply(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
-#ifdef HAVE_LIBPCAP
-#ifdef _WIN32
- /* Is WPcap loaded? */
- if (has_wpcap) {
-#endif /* _WIN32 */
- capture_prefs_apply(OBJECT_GET_DATA(parent_w, E_CAPTURE_PAGE_KEY));
-#ifdef _WIN32
- }
-#endif /* _WIN32 */
-#endif /* HAVE_LIBPCAP */
- nameres_prefs_apply(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
- prefs_apply_all();
+ prefs_main_apply_all(parent_w);
if (must_redissect) {
/* Redissect all the packets, and re-evaluate the display filter. */
- redissect_packets(&cfile);
+ cf_redissect_packets(&cfile);
}
}
-static void
+static guint
pref_revert(pref_t *pref, gpointer user_data)
{
gboolean *pref_changed_p = user_data;
}
break;
+ case PREF_RANGE:
+ if (!ranges_are_equal(*pref->varp.range, pref->saved_val.range)) {
+ *pref_changed_p = TRUE;
+ g_free(*pref->varp.range);
+ *pref->varp.range = range_copy(pref->saved_val.range);
+ }
+ break;
+
case PREF_OBSOLETE:
g_assert_not_reached();
break;
}
+ return 0;
}
-static void
+static guint
module_prefs_revert(module_t *module, gpointer user_data)
{
gboolean *must_redissect_p = user_data;
could cause packets to be dissected differently. */
if (module->prefs_changed)
*must_redissect_p = TRUE;
+ return 0; /* keep processing modules */
}
+/* cancel button pressed, revert prefs to saved and exit dialog */
static void
prefs_main_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w)
{
prefs_modules_foreach(module_prefs_revert, &must_redissect);
/* Now apply the reverted-to preferences. */
- printer_prefs_apply(OBJECT_GET_DATA(parent_w, E_PRINT_PAGE_KEY));
- column_prefs_apply(OBJECT_GET_DATA(parent_w, E_COLUMN_PAGE_KEY));
- stream_prefs_apply(OBJECT_GET_DATA(parent_w, E_STREAM_PAGE_KEY));
- gui_prefs_apply(OBJECT_GET_DATA(parent_w, E_GUI_PAGE_KEY));
- nameres_prefs_apply(OBJECT_GET_DATA(parent_w, E_NAMERES_PAGE_KEY));
- prefs_apply_all();
+ prefs_main_apply_all(parent_w);
- gtk_widget_destroy(GTK_WIDGET(parent_w));
+ window_destroy(GTK_WIDGET(parent_w));
if (must_redissect) {
/* Redissect all the packets, and re-evaluate the display filter. */
- redissect_packets(&cfile);
+ cf_redissect_packets(&cfile);
}
}
-/* Treat this as a cancel, by calling "prefs_main_cancel_cb()".
- XXX - that'll destroy the Preferences dialog; will that upset
- a higher-level handler that says "OK, we've been asked to delete
- this, so destroy it"? */
+/* Treat this as a cancel, by calling "prefs_main_cancel_cb()" */
static gboolean
-prefs_main_delete_cb(GtkWidget *prefs_w, gpointer dummy _U_)
+prefs_main_delete_event_cb(GtkWidget *prefs_w, GdkEvent *event _U_,
+ gpointer parent_w _U_)
{
prefs_main_cancel_cb(NULL, prefs_w);
return FALSE;
}
+
+/* dialog *is* already destroyed, clean up memory and such */
static void
-prefs_main_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
+prefs_main_destroy_cb(GtkWidget *win _U_, gpointer parent_w)
{
- /* Let the preference tabs clean up anything they've done. */
- printer_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_PRINT_PAGE_KEY));
- column_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_COLUMN_PAGE_KEY));
- stream_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_STREAM_PAGE_KEY));
- gui_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_GUI_PAGE_KEY));
-#ifdef HAVE_LIBPCAP
-#ifdef _WIN32
- /* Is WPcap loaded? */
- if (has_wpcap) {
-#endif /* _WIN32 */
- capture_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_CAPTURE_PAGE_KEY));
-#ifdef _WIN32
- }
-#endif /* _WIN32 */
-#endif /* HAVE_LIBPCAP */
- nameres_prefs_destroy(OBJECT_GET_DATA(prefs_w, E_NAMERES_PAGE_KEY));
-
- /* Free up the saved preferences (both for "prefs" and for registered
- preferences). */
- free_prefs(&saved_prefs);
- prefs_modules_foreach(module_prefs_clean, NULL);
+ prefs_main_destroy_all(parent_w);
/* Note that we no longer have a "Preferences" dialog box. */
prefs_w = NULL;
- first_proto_prefs_page = -1;
}
struct properties_data {
- GtkWidget *w;
- int page_num;
const char *title;
+ module_t *module;
};
-/* XXX this way of searching the correct page number is really ugly ... */
-static void
+static guint
module_search_properties(module_t *module, gpointer user_data)
{
struct properties_data *p = (struct properties_data *)user_data;
- if (p->title == NULL) return;
+ /* If this module has the specified title, remember it. */
if (strcmp(module->title, p->title) == 0) {
- /* found it */
- gtk_notebook_set_page(GTK_NOTEBOOK(p->w), p->page_num);
- p->title = NULL;
- } else {
- p->page_num++;
+ p->module = module;
+ return 1; /* stops the search */
}
+ return 0;
}
void
properties_cb(GtkWidget *w, gpointer dummy)
{
- const gchar *title = NULL;
+ header_field_info *hfinfo;
+ const gchar *title;
struct properties_data p;
+ int page_num;
+ GtkWidget *frame;
+ module_t *page_module;
- if (finfo_selected) {
- header_field_info *hfinfo = finfo_selected->hfinfo;
- if (hfinfo->parent == -1) {
- title = prefs_get_title_by_name(hfinfo->abbrev);
- } else {
- title =
- prefs_get_title_by_name(proto_registrar_get_abbrev(hfinfo->parent));
- }
- } else {
+ if (cfile.finfo_selected == NULL) {
+ /* There is no field selected */
return;
}
- if (!title) return;
+ /* Find the title for the protocol for the selected field. */
+ hfinfo = cfile.finfo_selected->hfinfo;
+ if (hfinfo->parent == -1)
+ title = prefs_get_title_by_name(hfinfo->abbrev);
+ else
+ title = prefs_get_title_by_name(proto_registrar_get_abbrev(hfinfo->parent));
+ if (!title)
+ return; /* Couldn't find it. XXX - just crash? "Can't happen"? */
+ /* Find the module for that protocol by searching for one with that title.
+ XXX - should we just associate protocols with modules directly? */
+ p.title = title;
+ p.module = NULL;
+ prefs_module_list_foreach(protocols_module->prefs, module_search_properties,
+ &p);
+ if (p.module == NULL) {
+ /* We didn't find it - that protocol probably has no preferences. */
+ return;
+ }
+
+ /* Create a preferences window, or pop up an existing one. */
if (prefs_w != NULL) {
reactivate_window(prefs_w);
} else {
prefs_cb(w, dummy);
}
- p.w = notebook;
- p.page_num = first_proto_prefs_page;
- p.title = title;
-
- prefs_module_list_foreach(protocols_module->prefs, module_search_properties,
- &p);
+ /* Search all the pages in that window for the one with the specified
+ module. */
+ for (page_num = 0;
+ (frame = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), page_num)) != NULL;
+ page_num++) {
+ /* Get the module for this page. */
+ page_module = OBJECT_GET_DATA(frame, E_PAGE_MODULE_KEY);
+ if (page_module == NULL)
+ continue; /* It doesn't have one. */
+ if (page_module == p.module) {
+ /* We found it. Select that page. */
+ gtk_notebook_set_page(GTK_NOTEBOOK(notebook), page_num);
+ break;
+ }
+ }
}
/* Prefs tree selection callback. The node data has been loaded with
git.samba.org / obnox / wireshark / wip.git / blobdiff