From 1ddbe05e58e0297039650fb4bffa37f8ae6834aa Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 21 Jan 2001 02:27:24 +0000 Subject: Give various filter constructing/editing dialog boxes titles to reflect what they were popped up for. svn path=/trunk/; revision=2923 --- gtk/file_dlg.c | 8 ++++++-- gtk/filter_prefs.c | 16 ++++++++++++---- gtk/filter_prefs.h | 3 ++- gtk/find_dlg.c | 8 ++++++-- gtk/main.c | 8 ++++++-- 5 files changed, 32 insertions(+), 11 deletions(-) (limited to 'gtk') diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index 516abe56c6..757df42631 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -1,7 +1,7 @@ /* file_dlg.c * Dialog boxes for handling files * - * $Id: file_dlg.c,v 1.34 2001/01/21 01:45:06 guy Exp $ + * $Id: file_dlg.c,v 1.35 2001/01/21 02:27:24 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -73,7 +73,11 @@ file_open_cmd_cb(GtkWidget *w, gpointer data) *resolv_cb; /* No Apply button, and "OK" just sets our text widget, it doesn't activate it (i.e., it doesn't cause us to try to open the file). */ - static construct_args_t args = {FALSE, FALSE}; + static construct_args_t args = { + "Ethereal: Read Filter", + FALSE, + FALSE + }; if (file_open_w != NULL) { /* There's already an "Open Capture File" dialog box; reactivate it. */ diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c index b09afa9802..960c4ed31f 100644 --- a/gtk/filter_prefs.c +++ b/gtk/filter_prefs.c @@ -3,7 +3,7 @@ * (This used to be a notebook page under "Preferences", hence the * "prefs" in the file name.) * - * $Id: filter_prefs.c,v 1.21 2001/01/21 01:45:07 guy Exp $ + * $Id: filter_prefs.c,v 1.22 2001/01/21 02:27:24 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -195,7 +195,11 @@ capture_filter_construct_cb(GtkWidget *w, gpointer user_data) GtkWidget *parent_filter_te; /* No Apply button, and "OK" just sets our text widget, it doesn't activate it (i.e., it doesn't cause us to try to open the file). */ - static construct_args_t args = {FALSE, FALSE}; + static construct_args_t args = { + "Ethereal: Capture Filter", + FALSE, + FALSE + }; /* Has a filter dialog box already been opened for that top-level widget? */ @@ -287,7 +291,11 @@ filter_dialog_cb(GtkWidget *w) { /* No Apply button, and there's no text widget to set, much less activate, on "OK". */ - static construct_args_t args = {FALSE, FALSE}; + static construct_args_t args = { + "Ethereal: Edit Filter List", + FALSE, + FALSE + }; /* Has a filter dialog box already been opened for editing? */ if (global_filter_w != NULL) { @@ -338,7 +346,7 @@ filter_dialog_new(GtkWidget *caller, GtkWidget *parent_filter_te, filter_def *filt; gchar *filter_te_str = NULL; - main_w = dlg_window_new("Ethereal: Filters"); + main_w = dlg_window_new(construct_args->title); gtk_object_set_data(GTK_OBJECT(main_w), E_FILT_CONSTRUCT_ARGS_KEY, construct_args); diff --git a/gtk/filter_prefs.h b/gtk/filter_prefs.h index 369d5f1c99..048855966f 100644 --- a/gtk/filter_prefs.h +++ b/gtk/filter_prefs.h @@ -3,7 +3,7 @@ * (This used to be a notebook page under "Preferences", hence the * "prefs" in the file name.) * - * $Id: filter_prefs.h,v 1.8 2001/01/21 01:45:07 guy Exp $ + * $Id: filter_prefs.h,v 1.9 2001/01/21 02:27:24 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -33,6 +33,7 @@ * created. */ typedef struct { + gchar *title; /* title of dialog box */ gboolean wants_apply_button; /* if it should have an Apply button */ gboolean activate_on_ok; /* if parent text widget should be activated on "Ok" or "Apply" */ diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index f0d806e6d9..9203899baf 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -1,7 +1,7 @@ /* find_dlg.c * Routines for "find frame" window * - * $Id: find_dlg.c,v 1.17 2001/01/21 01:45:07 guy Exp $ + * $Id: find_dlg.c,v 1.18 2001/01/21 02:27:24 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -76,7 +76,11 @@ find_frame_cb(GtkWidget *w, gpointer d) GtkAccelGroup *accel_group; /* No Apply button, but "OK" not only sets our text widget, it activates it (i.e., it causes us to do the search). */ - static construct_args_t args = {FALSE, TRUE}; + static construct_args_t args = { + "Ethereal: Search Filter", + FALSE, + TRUE + }; if (find_frame_w != NULL) { /* There's already a "Find Frame" dialog box; reactivate it. */ diff --git a/gtk/main.c b/gtk/main.c index 9172e03d04..6c5529ebbe 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.172 2001/01/21 01:45:07 guy Exp $ + * $Id: main.c,v 1.173 2001/01/21 02:27:24 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -1492,7 +1492,11 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) /* Display filter construct dialog has an Apply button, and "OK" not only sets our text widget, it activates it (i.e., it causes us to filter the capture). */ - static construct_args_t args = {TRUE, TRUE}; + static construct_args_t args = { + "Ethereal: Display Filter", + TRUE, + TRUE + }; /* Main window */ top_level = gtk_window_new(GTK_WINDOW_TOPLEVEL); -- cgit v1.2.1