/* color_dlg.c
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.c,v 1.33 2004/01/18 00:33:03 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#include "colors.h"
#include "color_filters.h"
#include "color_dlg.h"
-#include "color_utils.h"
#include "file.h"
#include <epan/dfilter/dfilter.h>
#include "simple_dialog.h"
#include "ui_util.h"
#include "dfilter_expr_dlg.h"
#include "compat_macros.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
#include "file_dlg.h"
+#include "gtkglobals.h"
+#include <epan/prefs.h>
+#include "help_dlg.h"
static GtkWidget* colorize_dialog_new(char *filter);
static void add_filter_to_list(gpointer filter_arg, gpointer list_arg);
static void color_clear_cb(GtkWidget *button, gpointer user_data);
static void color_import_cb(GtkButton *button, gpointer user_data );
-static void edit_color_filter_dialog_new(GtkWidget *color_filters,
- GtkWidget **colorize_filter_name,
- GtkWidget **colorize_filter_text);
+static void edit_color_filter_dialog(GtkWidget *color_filters,
+ GtkWidget **colorize_filter_name,
+ GtkWidget **colorize_filter_text,
+ guchar is_new_filter);
+
#if GTK_MAJOR_VERSION < 2
static void edit_color_filter_destroy_cb(GtkObject *object, gpointer user_data);
#else
static void edit_color_filter_fg_cb(GtkButton *button, gpointer user_data);
static void edit_color_filter_bg_cb(GtkButton *button, gpointer user_data);
static void edit_color_filter_ok_cb(GtkButton *button, gpointer user_data);
-static void edit_color_filter_cancel_cb(GtkObject *object, gpointer user_data);
+static void edit_new_color_filter_cancel_cb(GtkButton *button, gpointer user_data);
static GtkWidget* color_sel_win_new(color_filter_t *colorf, gboolean);
static void color_sel_ok_cb(GtkButton *button, gpointer user_data);
static gint num_of_filters; /* number of filters being displayed */
static gint row_selected; /* row in color_filters that is selected */
-static gchar *titles[2] = { "Name", "String" };
-
#define COLOR_UP_LB "color_up_lb"
#define COLOR_DOWN_LB "color_down_lb"
#define COLOR_PROPS_LB "color_props_lb"
{
int count = 0;
- g_slist_foreach(filter_list, count_this_mark, &count);
+ g_slist_foreach(color_filter_list, count_this_mark, &count);
return count;
}
GtkWidget *color_apply;
GtkWidget *color_save;
GtkWidget *color_cancel;
+ GtkWidget *color_help;
#if GTK_MAJOR_VERSION >= 2
GtkListStore *store;
GtkTreeViewColumn *column;
GtkTreeSelection *selection;
#endif
+ gchar *titles[] = { "Name", "String" };
+
row_selected = -1; /* no row selected */
tooltips = gtk_tooltips_new ();
* All other widgets are always packed depending on the current window size. */
color_win = dlg_window_new ("Ethereal: Coloring Rules");
OBJECT_SET_DATA(color_win, "color_win", color_win);
- gtk_window_set_default_size(GTK_WINDOW(color_win), 600, 350);
+ gtk_window_set_default_size(GTK_WINDOW(color_win), DEF_WIDTH, DEF_HEIGHT * 2/3);
dlg_vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_ref (dlg_vbox);
- OBJECT_SET_DATA_FULL(color_win, "dlg_vbox", dlg_vbox, gtk_widget_unref);
gtk_container_set_border_width (GTK_CONTAINER (dlg_vbox), 5);
- gtk_widget_show (dlg_vbox);
gtk_container_add (GTK_CONTAINER (color_win), dlg_vbox);
main_hbox = gtk_hbox_new (FALSE, 0);
- gtk_widget_ref (main_hbox);
- OBJECT_SET_DATA_FULL(color_win, "main_hbox", main_hbox, gtk_widget_unref);
- gtk_widget_show (main_hbox);
gtk_box_pack_start (GTK_BOX (dlg_vbox), main_hbox, TRUE, TRUE, 0);
ctrl_vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_ref (ctrl_vbox);
- OBJECT_SET_DATA_FULL(color_win, "ctrl_vbox", ctrl_vbox, gtk_widget_unref);
- gtk_widget_show (ctrl_vbox);
gtk_box_pack_start (GTK_BOX (main_hbox), ctrl_vbox, FALSE, FALSE, 0);
/* edit buttons frame */
edit_fr = gtk_frame_new("Edit");
gtk_box_pack_start (GTK_BOX (ctrl_vbox), edit_fr, TRUE, TRUE, 0);
- gtk_widget_show(edit_fr);
/* edit_vbox is first button column (containing: new, edit and such) */
edit_vbox = gtk_vbutton_box_new();
- gtk_widget_ref (edit_vbox);
- OBJECT_SET_DATA_FULL(color_win, "edit_vbox", edit_vbox, gtk_widget_unref);
gtk_button_box_set_child_size(GTK_BUTTON_BOX(edit_vbox), 50, 20);
gtk_container_set_border_width (GTK_CONTAINER (edit_vbox), 5);
- gtk_widget_show (edit_vbox);
gtk_container_add(GTK_CONTAINER(edit_fr), edit_vbox);
color_new = BUTTON_NEW_FROM_STOCK(GTK_STOCK_NEW);
- gtk_widget_ref (color_new);
- OBJECT_SET_DATA_FULL(color_win, "color_new", color_new, gtk_widget_unref);
- gtk_widget_show (color_new);
#if GTK_MAJOR_VERSION < 2
WIDGET_SET_SIZE(color_new, 50, 20);
#endif
gtk_box_pack_start (GTK_BOX (edit_vbox), color_new, FALSE, FALSE, 5);
- gtk_tooltips_set_tip (tooltips, color_new, ("Create a new filter after the selected filter"), NULL);
+ gtk_tooltips_set_tip (tooltips, color_new, ("Create a new filter at the end of the list"), NULL);
- color_props = BUTTON_NEW_FROM_STOCK(GTK_STOCK_PROPERTIES);
- gtk_widget_ref (color_props);
- OBJECT_SET_DATA_FULL(color_win, "color_props", color_props, gtk_widget_unref);
- gtk_widget_show (color_props);
+ color_props = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_EDIT);
#if GTK_MAJOR_VERSION < 2
WIDGET_SET_SIZE(color_props, 50, 20);
#endif
gtk_box_pack_start (GTK_BOX (edit_vbox), color_props, FALSE, FALSE, 5);
- gtk_tooltips_set_tip (tooltips, color_props, ("Edit the selected filter properties"), NULL);
+ gtk_tooltips_set_tip (tooltips, color_props, ("Edit the properties of the selected filter"), NULL);
gtk_widget_set_sensitive (color_props, FALSE);
color_delete = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE);
- gtk_widget_ref (color_delete);
- OBJECT_SET_DATA_FULL(color_win, "color_delete", color_delete, gtk_widget_unref);
gtk_box_pack_start (GTK_BOX (edit_vbox), color_delete, FALSE, FALSE, 5);
#if GTK_MAJOR_VERSION < 2
WIDGET_SET_SIZE(color_delete, 50, 20);
#endif
- gtk_widget_show (color_delete);
gtk_tooltips_set_tip (tooltips, color_delete, ("Delete the selected filter"), NULL);
gtk_widget_set_sensitive (color_delete, FALSE);
/* End edit buttons frame */
/* manage buttons frame */
manage_fr = gtk_frame_new("Manage");
gtk_box_pack_start (GTK_BOX (ctrl_vbox), manage_fr, FALSE, FALSE, 0);
- gtk_widget_show(manage_fr);
manage_vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_ref (manage_vbox);
- OBJECT_SET_DATA_FULL(color_win, "manage_vbox", manage_vbox, gtk_widget_unref);
gtk_container_set_border_width (GTK_CONTAINER (manage_vbox), 5);
- gtk_widget_show (manage_vbox);
gtk_container_add(GTK_CONTAINER(manage_fr), manage_vbox);
- color_export = gtk_button_new_with_label (("Export..."));
- gtk_widget_ref(color_export);
+ color_export = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_EXPORT);
gtk_box_pack_start (GTK_BOX (manage_vbox), color_export, FALSE, FALSE, 5);
#if GTK_MAJOR_VERSION < 2
WIDGET_SET_SIZE(color_export, 50, 20);
#endif
- gtk_widget_show(color_export);
- gtk_tooltips_set_tip(tooltips, color_export, ("Save all/marked filters to specified file"), NULL);
+ gtk_tooltips_set_tip(tooltips, color_export, ("Save all/marked filters to a file"), NULL);
- color_import = gtk_button_new_with_label (("Import..."));
- gtk_widget_ref(color_import);
+ color_import = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_IMPORT);
gtk_box_pack_start (GTK_BOX (manage_vbox), color_import, FALSE, FALSE, 5);
#if GTK_MAJOR_VERSION < 2
WIDGET_SET_SIZE(color_import, 50, 20);
#endif
- gtk_widget_show(color_import);
- gtk_tooltips_set_tip(tooltips, color_import, ("Include filters from specified file"), NULL);
+ gtk_tooltips_set_tip(tooltips, color_import, ("Load filters from a file"), NULL);
color_clear = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLEAR);
- gtk_widget_ref(color_clear);
- OBJECT_SET_DATA_FULL(color_win, "color_clear", color_clear, gtk_widget_unref);
gtk_box_pack_start(GTK_BOX (manage_vbox), color_clear, FALSE, FALSE, 5);
#if GTK_MAJOR_VERSION < 2
WIDGET_SET_SIZE(color_clear, 50, 20);
#endif
- gtk_widget_show(color_clear);
- gtk_tooltips_set_tip(tooltips, color_clear, ("Clear all filters in user specific file and revert to system-wide default filter set"), NULL);
+ gtk_tooltips_set_tip(tooltips, color_clear, ("Clear all filters in the user's colorfilters file and revert to system-wide default filter set"), NULL);
/* filter list frame */
list_fr = gtk_frame_new("Filter");
gtk_box_pack_start (GTK_BOX (main_hbox), list_fr, TRUE, TRUE, 0);
- gtk_widget_show(list_fr);
list_vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_ref (list_vbox);
- OBJECT_SET_DATA_FULL(color_win, "list_vbox", list_vbox, gtk_widget_unref);
gtk_container_set_border_width (GTK_CONTAINER (list_vbox), 5);
- gtk_widget_show (list_vbox);
gtk_container_add(GTK_CONTAINER(list_fr), list_vbox);
list_label = gtk_label_new (("[List is processed in order until match is found]"));
- gtk_widget_ref (list_label);
- OBJECT_SET_DATA_FULL(color_win, "list_label", list_label, gtk_widget_unref);
- gtk_widget_show (list_label);
gtk_box_pack_start (GTK_BOX (list_vbox), list_label, FALSE, FALSE, 0);
/* create the list of filters */
- scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+ scrolledwindow1 = scrolled_window_new(NULL, NULL);
#if GTK_MAJOR_VERSION >= 2
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow1),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow1),
+ GTK_SHADOW_IN);
#endif
- gtk_widget_ref (scrolledwindow1);
- OBJECT_SET_DATA_FULL(color_win, "scrolledwindow1", scrolledwindow1, gtk_widget_unref);
- gtk_widget_show (scrolledwindow1);
gtk_box_pack_start (GTK_BOX (list_vbox), scrolledwindow1, TRUE, TRUE, 0);
#if GTK_MAJOR_VERSION < 2
#endif
num_of_filters = 0;
- g_slist_foreach(filter_list, add_filter_to_list, color_filters);
-#if GTK_MAJOR_VERSION >= 2
+ g_slist_foreach(color_filter_list, add_filter_to_list, color_filters);
+
+#if GTK_MAJOR_VERSION < 2
+ gtk_clist_set_selection_mode (GTK_CLIST (color_filters),GTK_SELECTION_EXTENDED);
+#else
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(color_filters));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
-#else
- gtk_clist_set_selection_mode (GTK_CLIST (color_filters),GTK_SELECTION_EXTENDED);
#endif
- gtk_widget_show (color_filters);
gtk_container_add (GTK_CONTAINER (scrolledwindow1), color_filters);
#if GTK_MAJOR_VERSION < 2
gtk_clist_set_column_width (GTK_CLIST (color_filters), 0, 80);
/* order frame */
order_fr = gtk_frame_new("Order");
gtk_box_pack_start (GTK_BOX (main_hbox), order_fr, FALSE, FALSE, 0);
- gtk_widget_show(order_fr);
order_vbox = gtk_vbox_new (TRUE, 0);
- gtk_widget_ref (order_vbox);
- OBJECT_SET_DATA_FULL(color_win, "order_vbox", order_vbox, gtk_widget_unref);
gtk_container_set_border_width (GTK_CONTAINER (order_vbox), 5);
- gtk_widget_show (order_vbox);
gtk_container_add(GTK_CONTAINER(order_fr), order_vbox);
color_filter_up = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_UP);
- gtk_widget_ref (color_filter_up);
- OBJECT_SET_DATA_FULL(color_win, "color_filter_up", color_filter_up, gtk_widget_unref);
#if GTK_MAJOR_VERSION < 2
WIDGET_SET_SIZE(color_filter_up, 50, 20);
#endif
- gtk_widget_show (color_filter_up);
gtk_box_pack_start (GTK_BOX (order_vbox), color_filter_up, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, color_filter_up, ("Move filter higher in list"), NULL);
gtk_widget_set_sensitive (color_filter_up, FALSE);
order_move_label = gtk_label_new (("Move\nselected filter\nup or down"));
- gtk_widget_ref (order_move_label);
- OBJECT_SET_DATA_FULL(color_win, "order_move_label", order_move_label, gtk_widget_unref);
- gtk_widget_show (order_move_label);
gtk_box_pack_start (GTK_BOX (order_vbox), order_move_label, FALSE, FALSE, 0);
color_filter_down = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_DOWN);
- gtk_widget_ref (color_filter_down);
- OBJECT_SET_DATA_FULL(color_win, "color_filter_down", color_filter_down,
- gtk_widget_unref);
#if GTK_MAJOR_VERSION < 2
WIDGET_SET_SIZE(color_filter_down, 50, 20);
#endif
- gtk_widget_show (color_filter_down);
gtk_box_pack_start (GTK_BOX (order_vbox), color_filter_down, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, color_filter_down, ("Move filter lower in list"), NULL);
gtk_widget_set_sensitive (color_filter_down, FALSE);
- /* button_ok_hbox is bottom button row */
- button_ok_hbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout (GTK_BUTTON_BOX (button_ok_hbox), GTK_BUTTONBOX_END);
- gtk_widget_ref (button_ok_hbox);
- OBJECT_SET_DATA_FULL(color_win, "button_ok_hbox", button_ok_hbox, gtk_widget_unref);
- gtk_widget_show (button_ok_hbox);
+ /* Button row: OK and cancel buttons */
+ if(topic_available(HELP_COLORING_RULES_DIALOG)) {
+ button_ok_hbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
+ } else {
+ button_ok_hbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CLOSE/*, GTK_STOCK_CANCEL*/, NULL);
+ }
gtk_box_pack_start (GTK_BOX (dlg_vbox), button_ok_hbox, FALSE, FALSE, 5);
- color_ok = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
- gtk_widget_ref (color_ok);
- OBJECT_SET_DATA_FULL(color_win, "color_ok", color_ok, gtk_widget_unref);
- gtk_widget_show (color_ok);
- gtk_box_pack_start (GTK_BOX (button_ok_hbox), color_ok, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, color_ok, ("Accept filter list; apply changes"), NULL);
-
- color_apply = BUTTON_NEW_FROM_STOCK(GTK_STOCK_APPLY);
- gtk_widget_ref (color_apply);
- OBJECT_SET_DATA_FULL(color_win, "color_apply", color_apply, gtk_widget_unref);
- gtk_widget_show (color_apply);
- gtk_box_pack_start (GTK_BOX (button_ok_hbox), color_apply, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, color_apply, ("Apply filters in list"), NULL);
-
- color_save = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE);
- gtk_widget_ref(color_save);
- OBJECT_SET_DATA_FULL(color_win, "color_save", color_save, gtk_widget_unref);
- gtk_widget_show(color_save);
- gtk_box_pack_start(GTK_BOX (button_ok_hbox), color_save, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, color_save, ("Save all filters to disk"), NULL);
-
- /* button changed from cancel to close, as changes are currently not reverted */
- /* color_cancel = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL); */
- color_cancel = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
- gtk_widget_ref (color_cancel);
- OBJECT_SET_DATA_FULL(color_win, "color_cancel", color_cancel, gtk_widget_unref);
- gtk_widget_show (color_cancel);
- gtk_box_pack_start (GTK_BOX (button_ok_hbox), color_cancel, TRUE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, color_cancel, ("No more filter changes; don't apply"), NULL);
+ color_ok = OBJECT_GET_DATA(button_ok_hbox, GTK_STOCK_OK);
+ gtk_tooltips_set_tip (tooltips, color_ok, ("Apply the color filters to the display and close this dialog"), NULL);
+
+ color_apply = OBJECT_GET_DATA(button_ok_hbox, GTK_STOCK_APPLY);
+ gtk_tooltips_set_tip (tooltips, color_apply, ("Apply the color filters to the display but keep this dialog open"), NULL);
+
+ color_save = OBJECT_GET_DATA(button_ok_hbox, GTK_STOCK_SAVE);
+ gtk_tooltips_set_tip (tooltips, color_save, ("Save the color filters permanently and keep this dialog open"), NULL);
+
+ color_cancel = OBJECT_GET_DATA(button_ok_hbox, GTK_STOCK_CLOSE);
+ window_set_cancel_button(color_win, color_cancel, color_cancel_cb);
+ gtk_tooltips_set_tip (tooltips, color_cancel, ("Close this dialog but don't apply the color filter changes to the display"), NULL);
+
+ if(topic_available(HELP_COLORING_RULES_DIALOG)) {
+ color_help = OBJECT_GET_DATA(button_ok_hbox, GTK_STOCK_HELP);
+ gtk_tooltips_set_tip (tooltips, color_help, ("Get help about this dialog"), NULL);
+ SIGNAL_CONNECT(color_help, "clicked", topic_cb, HELP_COLORING_RULES_DIALOG);
+ }
+
+ gtk_widget_grab_default(color_ok);
/* signals and such */
SIGNAL_CONNECT(color_win, "destroy", color_destroy_cb, NULL);
SIGNAL_CONNECT(color_clear, "clicked", color_clear_cb, NULL);
SIGNAL_CONNECT(color_ok, "clicked", color_ok_cb, NULL);
SIGNAL_CONNECT(color_apply, "clicked", color_apply_cb, NULL);
- SIGNAL_CONNECT(color_cancel, "clicked", color_cancel_cb, NULL);
+
+ SIGNAL_CONNECT(color_win, "delete_event", window_delete_event_cb, NULL);
gtk_widget_grab_focus(color_filters);
- OBJECT_SET_DATA(color_win, "tooltips", tooltips);
- gtk_widget_show (color_win);
- dlg_set_cancel(color_win, color_cancel);
+ gtk_widget_show_all(color_win);
+ window_present(color_win);
if(filter){
/* if we specified a preset filter string, open the new dialog and
store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list_arg)));
gtk_list_store_append(store, &iter);
- sprintf(fg_str, "#%04X%04X%04X",
+ g_snprintf(fg_str, 14, "#%04X%04X%04X",
colorf->fg_color.red, colorf->fg_color.green, colorf->fg_color.blue);
- sprintf(bg_str, "#%04X%04X%04X",
+ g_snprintf(bg_str, 14, "#%04X%04X%04X",
colorf->bg_color.red, colorf->bg_color.green, colorf->bg_color.blue);
gtk_list_store_set(store, &iter, 0, colorf->filter_name,
1, colorf->filter_text, 2, fg_str, 3, bg_str,
num_of_filters++;
}
-void move_this_row (GtkWidget *color_filters,
+static void move_this_row (GtkWidget *color_filters,
gint filter_number,
gint amount) /* only tested with +1(down) and -1(up) */
{
#endif
- filter_list = g_slist_remove(filter_list, colorf);
- filter_list = g_slist_insert(filter_list, colorf, filter_number + amount);
+ color_filter_list = g_slist_remove(color_filter_list, colorf);
+ color_filter_list = g_slist_insert(color_filter_list, colorf, filter_number + amount);
}
/* Move the selected filters up in the list */
};
/* called for each selected row in the tree.
*/
-void remember_this_row (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer arg)
+static void remember_this_row (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer arg)
{
gint *path_index;
color_filter_t *colorf;
data.count = 0;
data.color_filters = color_filters;
- g_slist_foreach(filter_list, clear_mark, NULL);
+ g_slist_foreach(color_filter_list, clear_mark, NULL);
gtk_tree_selection_selected_foreach(sel,remember_this_row, &data);
if (data.count > 0)
gpointer user_data _U_)
{
/* Destroy any edit dialogs we have open. */
- g_slist_foreach(filter_list, destroy_edit_dialog_cb, NULL);
+ g_slist_foreach(color_filter_list, destroy_edit_dialog_cb, NULL);
colorize_win = NULL;
}
color_filter_t *colorf = (color_filter_t *)filter_arg;
if (colorf->edit_dialog != NULL)
- gtk_widget_destroy(colorf->edit_dialog);
+ window_destroy(colorf->edit_dialog);
}
/* XXX - we don't forbid having more than one "Edit color filter" dialog
}
void
-color_add_filter_cb (color_filter_t *colorf, gpointer arg)
+color_filter_add_cb(color_filter_t *colorf, gpointer arg)
{
GtkWidget *color_filters = arg;
create_new_color_filter(GtkButton *button, char *filter)
{
color_filter_t *colorf;
+ GtkStyle *style;
+ color_t bg_color, fg_color;
GtkWidget *color_filters;
#if GTK_MAJOR_VERSION >= 2
GtkTreeSelection *sel;
gtk_clist_unselect_all (GTK_CLIST(color_filters));
#endif
- colorf = new_color_filter("name", filter); /* Adds at end! */
+ /* Use the default background and foreground colors as the colors. */
+ style = gtk_widget_get_style(packet_list);
+ gdkcolor_to_color_t(&bg_color, &style->base[GTK_STATE_NORMAL]);
+ gdkcolor_to_color_t(&fg_color, &style->text[GTK_STATE_NORMAL]);
+ colorf = color_filter_new("name", filter, &bg_color, &fg_color); /* Adds at end! */
color_add_colorf(color_filters, colorf);
- edit_color_filter_dialog_new(color_filters, &filt_name_entry,
- &filt_text_entry);
+ edit_color_filter_dialog(color_filters, &filt_name_entry, &filt_text_entry, TRUE);
+ /* Show the (in)validity of the default filter string */
+ filter_te_syntax_check_cb(filt_text_entry);
+
+
+
#if GTK_MAJOR_VERSION >= 2
gtk_widget_grab_focus(color_filters);
#endif
color_filters = (GtkWidget *)OBJECT_GET_DATA(button, COLOR_FILTERS_CL);
g_assert(row_selected != -1);
- edit_color_filter_dialog_new(color_filters, &filt_name_entry,
- &filt_text_entry);
+ edit_color_filter_dialog(color_filters, &filt_name_entry, &filt_text_entry, FALSE);
}
/* Delete a color from the list. */
/* Destroy any "Edit color filter" dialog boxes editing it. */
if (colorf->edit_dialog != NULL)
- gtk_widget_destroy(colorf->edit_dialog);
+ window_destroy(colorf->edit_dialog);
/* Remove the color filter from the list of color filters. */
- remove_color_filter(colorf);
+ color_filter_remove(colorf);
/* If we grab the focus after updating the selection, the first
* row is always selected, so we do it before */
/* Destroy any "Edit color filter" dialog boxes editing it. */
if (colorf->edit_dialog != NULL)
- gtk_widget_destroy(colorf->edit_dialog);
+ window_destroy(colorf->edit_dialog);
/* Remove the color filter from the list of color filters. */
- remove_color_filter(colorf);
+ color_filter_remove(colorf);
#endif
}
static void
color_save_cb(GtkButton *button _U_, gpointer user_data _U_)
{
- if (!write_filters())
- simple_dialog(ESD_TYPE_CRIT, NULL, "Could not open filter file: %s",
- strerror(errno));
-
+ if (!color_filters_write())
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Could not open filter file: %s", strerror(errno));
}
/* Remove all user defined color filters and revert to the global file. */
static void
-color_clear_cb(GtkWidget *widget, gpointer user_data _U_)
+color_clear_cmd(GtkWidget *widget)
{
GtkWidget * color_filters;
color_delete (num_of_filters-1, color_filters);
}
- if (!revert_filters())
- simple_dialog(ESD_TYPE_CRIT, NULL, "Could not delete filter file: %s",
- strerror(errno));
+ if (!color_filters_revert())
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Could not delete filter file: %s", strerror(errno));
/* colorize list */
- colorize_packets(&cfile);
+ cf_colorize_packets(&cfile);
/* Destroy the dialog box. */
- gtk_widget_destroy(colorize_win);
+ /* XXX: is this useful? user might want to continue with editing new colors */
+ window_destroy(colorize_win);
+}
+
+/* clear button: user responded to question */
+static void color_clear_answered_cb(gpointer dialog _U_, gint btn, gpointer data)
+{
+ switch(btn) {
+ case(ESD_BTN_CLEAR):
+ color_clear_cmd(data);
+ break;
+ case(ESD_BTN_CANCEL):
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
+
+/* clear button: ask user before really doing it */
+void
+color_clear_cb(GtkWidget *widget, gpointer data _U_) {
+ gpointer dialog;
+
+ /* ask user, if he/she is really sure */
+ dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTN_CLEAR | ESD_BTN_CANCEL,
+ PRIMARY_TEXT_START "Remove all your personal color settings?" PRIMARY_TEXT_END "\n\n"
+ "This will revert the color settings to global defaults.\n\n"
+ "Are you really sure?");
+
+ simple_dialog_set_cb(dialog, color_clear_answered_cb, widget);
}
/* Exit dialog and apply new list of color filters to the capture. */
color_ok_cb(GtkButton *button _U_, gpointer user_data _U_)
{
/* colorize list */
- colorize_packets(&cfile);
+ cf_colorize_packets(&cfile);
/* Destroy the dialog box. */
- gtk_widget_destroy(colorize_win);
+ window_destroy(colorize_win);
}
/* Exit dialog without colorizing packets with the new list.
color_cancel_cb(GtkWidget *widget _U_, gpointer user_data _U_)
{
/* Destroy the dialog box. */
- gtk_widget_destroy(colorize_win);
+ window_destroy(colorize_win);
}
/* Apply new list of color filters to the capture. */
static void
color_apply_cb(GtkButton *button _U_, gpointer user_data _U_)
{
- colorize_packets(&cfile);
+ cf_colorize_packets(&cfile);
}
/* Create an "Edit Color Filter" dialog for a given color filter, and
associate it with that color filter. */
static void
-edit_color_filter_dialog_new(GtkWidget *color_filters,
- GtkWidget **colorize_filter_name,
- GtkWidget **colorize_filter_text)
+edit_color_filter_dialog(GtkWidget *color_filters,
+ GtkWidget **colorize_filter_name,
+ GtkWidget **colorize_filter_text,
+ guchar is_new_filter)
{
color_filter_t *colorf;
GtkWidget *edit_dialog;
GtkWidget *colorize_filter_fg;
GtkWidget *colorize_filter_bg;
- GtkWidget *button_hbox;
+ GtkWidget *bbox;
GtkWidget *edit_color_filter_ok;
GtkWidget *edit_color_filter_cancel;
/* dialog window */
edit_dialog = dlg_window_new ("Ethereal: Edit Color Filter");
gtk_window_set_default_size(GTK_WINDOW(edit_dialog), 500, -1);
- /* gtk_window_set_position(GTK_WINDOW(edit_dialog), GTK_WIN_POS_MOUSE); */
OBJECT_SET_DATA(edit_dialog, "edit_dialog", edit_dialog);
colorf->edit_dialog = edit_dialog;
dialog_vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_ref (dialog_vbox);
- OBJECT_SET_DATA_FULL(edit_dialog, "dialog_vbox", dialog_vbox, gtk_widget_unref);
gtk_container_set_border_width (GTK_CONTAINER (dialog_vbox), 5);
- gtk_widget_show (dialog_vbox);
gtk_container_add (GTK_CONTAINER (edit_dialog), dialog_vbox);
/* Filter frame */
filter_fr = gtk_frame_new("Filter");
gtk_box_pack_start (GTK_BOX (dialog_vbox), filter_fr, FALSE, FALSE, 0);
- gtk_widget_show(filter_fr);
filter_fr_vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_ref (filter_fr_vbox);
- OBJECT_SET_DATA_FULL(edit_dialog, "filter_fr_vbox", filter_fr_vbox, gtk_widget_unref);
gtk_container_set_border_width (GTK_CONTAINER (filter_fr_vbox), 5);
- gtk_widget_show (filter_fr_vbox);
gtk_container_add(GTK_CONTAINER(filter_fr), filter_fr_vbox);
/* filter name hbox */
filter_name_hbox = gtk_hbox_new (FALSE, 0);
- gtk_widget_ref (filter_name_hbox);
- OBJECT_SET_DATA_FULL(edit_dialog, "filter_name_hbox", filter_name_hbox,
- gtk_widget_unref);
- gtk_widget_show (filter_name_hbox);
gtk_box_pack_start (GTK_BOX (filter_fr_vbox), filter_name_hbox, TRUE, FALSE, 3);
color_filter_name = gtk_label_new (("Name: "));
- gtk_widget_ref (color_filter_name);
- OBJECT_SET_DATA_FULL(edit_dialog, "color_filter_name", color_filter_name,
- gtk_widget_unref);
- gtk_widget_show (color_filter_name);
gtk_box_pack_start (GTK_BOX (filter_name_hbox), color_filter_name, FALSE, FALSE, 0);
*colorize_filter_name = gtk_entry_new ();
- gtk_widget_ref (*colorize_filter_name);
- OBJECT_SET_DATA_FULL(edit_dialog, "*colorize_filter_name", *colorize_filter_name,
- gtk_widget_unref);
gtk_entry_set_text(GTK_ENTRY(*colorize_filter_name), colorf->filter_name);
style = gtk_style_copy(gtk_widget_get_style(*colorize_filter_name));
#endif
gtk_widget_set_style(*colorize_filter_name, style);
- gtk_widget_show (*colorize_filter_name);
gtk_box_pack_start (GTK_BOX (filter_name_hbox), *colorize_filter_name, TRUE, TRUE, 0);
gtk_tooltips_set_tip (tooltips, *colorize_filter_name, ("This is the editable name of the filter. (No @ characters allowed.)"), NULL);
/* filter string hbox */
filter_string_hbox = gtk_hbox_new (FALSE, 0);
- gtk_widget_ref (filter_string_hbox);
- OBJECT_SET_DATA_FULL(edit_dialog, "filter_string_hbox", filter_string_hbox,
- gtk_widget_unref);
- gtk_widget_show (filter_string_hbox);
gtk_box_pack_start (GTK_BOX (filter_fr_vbox), filter_string_hbox, TRUE, FALSE, 3);
color_filter_text = gtk_label_new (("String: "));
- gtk_widget_ref (color_filter_text);
- OBJECT_SET_DATA_FULL(edit_dialog, "color_filter_text", color_filter_text,
- gtk_widget_unref);
- gtk_widget_show (color_filter_text);
gtk_box_pack_start (GTK_BOX (filter_string_hbox), color_filter_text, FALSE, FALSE, 0);
*colorize_filter_text = gtk_entry_new ();
- gtk_widget_ref (*colorize_filter_text);
- OBJECT_SET_DATA_FULL(edit_dialog, "*colorize_filter_text", *colorize_filter_text,
- gtk_widget_unref);
+ SIGNAL_CONNECT(*colorize_filter_text, "changed", filter_te_syntax_check_cb, NULL);
gtk_entry_set_text(GTK_ENTRY(*colorize_filter_text), colorf->filter_text);
-
#if 0
style = gtk_style_copy(gtk_widget_get_style(*colorize_filter_text));
style->base[GTK_STATE_NORMAL] = colorf->bg_color;
style->fg[GTK_STATE_NORMAL] = colorf->fg_color;
#endif
gtk_widget_set_style(*colorize_filter_text, style);
- gtk_widget_show (*colorize_filter_text);
+ gtk_style_unref(style);
gtk_box_pack_start (GTK_BOX (filter_string_hbox), *colorize_filter_text, TRUE, TRUE, 0);
gtk_tooltips_set_tip (tooltips, *colorize_filter_text, ("This is the editable text of the filter"), NULL);
/* Create the "Add Expression..." button, to pop up a dialog
for constructing filter comparison expressions. */
- add_expression_bt = gtk_button_new_with_label("Add Expression...");
+ add_expression_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_ADD_EXPRESSION);
SIGNAL_CONNECT(add_expression_bt, "clicked", filter_expr_cb, *colorize_filter_text);
gtk_box_pack_start (GTK_BOX(filter_string_hbox), add_expression_bt, FALSE, FALSE, 3);
- gtk_widget_show(add_expression_bt);
gtk_tooltips_set_tip (tooltips, add_expression_bt, ("Add an expression to the filter string"), NULL);
/* choose color frame */
colorize_fr = gtk_frame_new("Display Colors");
gtk_box_pack_start (GTK_BOX (dialog_vbox), colorize_fr, FALSE, FALSE, 0);
- gtk_widget_show(colorize_fr);
colorize_hbox = gtk_hbox_new (FALSE, 0);
- gtk_widget_ref (colorize_hbox);
- OBJECT_SET_DATA_FULL(edit_dialog, "colorize_hbox", colorize_hbox, gtk_widget_unref);
gtk_container_set_border_width (GTK_CONTAINER (colorize_hbox), 5);
- gtk_widget_show (colorize_hbox);
gtk_container_add(GTK_CONTAINER(colorize_fr), colorize_hbox);
colorize_filter_fg = gtk_button_new_with_label (("Foreground Color..."));
- gtk_widget_ref (colorize_filter_fg);
- OBJECT_SET_DATA_FULL(edit_dialog, "colorize_filter_fg", colorize_filter_fg,
- gtk_widget_unref);
- gtk_widget_show (colorize_filter_fg);
gtk_box_pack_start (GTK_BOX (colorize_hbox), colorize_filter_fg, TRUE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, colorize_filter_fg, ("Select foreground color for data display"), NULL);
colorize_filter_bg = gtk_button_new_with_label (("Background Color..."));
- gtk_widget_ref (colorize_filter_bg);
- OBJECT_SET_DATA_FULL(edit_dialog, "colorize_filter_bg", colorize_filter_bg,
- gtk_widget_unref);
- gtk_widget_show (colorize_filter_bg);
gtk_box_pack_start (GTK_BOX (colorize_hbox), colorize_filter_bg, TRUE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, colorize_filter_bg, ("Select background color for data display"), NULL);
- /* button hbox (placement defaults coming from main.c) */
- button_hbox = gtk_hbutton_box_new();
- gtk_widget_ref (button_hbox);
- OBJECT_SET_DATA_FULL(edit_dialog, "button_hbox", button_hbox, gtk_widget_unref);
- gtk_container_set_border_width (GTK_CONTAINER (button_hbox), 0);
- gtk_widget_show (button_hbox);
- gtk_box_pack_start (GTK_BOX (dialog_vbox), button_hbox, FALSE, FALSE, 5);
-
- edit_color_filter_ok = gtk_button_new_with_label (("OK"));
- gtk_widget_ref (edit_color_filter_ok);
- OBJECT_SET_DATA_FULL(edit_dialog, "edit_color_filter_ok", edit_color_filter_ok,
- gtk_widget_unref);
- gtk_widget_show (edit_color_filter_ok);
- gtk_box_pack_start (GTK_BOX (button_hbox), edit_color_filter_ok, TRUE, FALSE, 0);
+ /* button box */
+ bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
+ gtk_box_pack_start(GTK_BOX(dialog_vbox), bbox, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (bbox), 0);
+
+ edit_color_filter_ok = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
gtk_tooltips_set_tip (tooltips, edit_color_filter_ok, ("Accept filter color change"), NULL);
- edit_color_filter_cancel = gtk_button_new_with_label (("Cancel"));
- gtk_widget_ref (edit_color_filter_cancel);
- OBJECT_SET_DATA_FULL(edit_dialog, "edit_color_filter_cancel",
- edit_color_filter_cancel, gtk_widget_unref);
- gtk_widget_show (edit_color_filter_cancel);
- gtk_box_pack_start (GTK_BOX (button_hbox), edit_color_filter_cancel, TRUE, FALSE, 0);
+ edit_color_filter_cancel = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
gtk_tooltips_set_tip (tooltips, edit_color_filter_cancel, ("Reject filter color change"), NULL);
+ gtk_widget_grab_default(edit_color_filter_ok);
/* signals and such */
OBJECT_SET_DATA(edit_dialog, COLOR_FILTER, colorf);
OBJECT_SET_DATA(edit_color_filter_ok, COLOR_FILTERS_CL, color_filters);
OBJECT_SET_DATA(edit_color_filter_ok, COLOR_FILTER, colorf);
SIGNAL_CONNECT(edit_color_filter_ok, "clicked", edit_color_filter_ok_cb, edit_dialog);
- SIGNAL_CONNECT(edit_color_filter_cancel, "clicked", edit_color_filter_cancel_cb,
- edit_dialog);
- OBJECT_SET_DATA(edit_dialog, "tooltips", tooltips);
+ /* set callback to delete new filters if cancel chosen */
+ if (is_new_filter)
+ {
+ OBJECT_SET_DATA(edit_color_filter_cancel, COLOR_FILTERS_CL, color_filters);
+ SIGNAL_CONNECT(edit_color_filter_cancel, "clicked",
+ edit_new_color_filter_cancel_cb, edit_dialog);
+ }
+ /* escape will select cancel */
+ window_set_cancel_button(edit_dialog, edit_color_filter_cancel, window_cancel_button_cb);
- dlg_set_cancel(edit_dialog, edit_color_filter_cancel);
+ SIGNAL_CONNECT(edit_dialog, "delete_event", window_delete_event_cb, NULL);
- gtk_widget_show (edit_dialog);
+ gtk_widget_show_all(edit_dialog);
+ window_present(edit_dialog);
}
/* Called when the dialog box is being destroyed; destroy any color
/* Destroy any color selection dialogs this dialog had open. */
color_sel = (GtkWidget *)OBJECT_GET_DATA(object, COLOR_SELECTION_FG);
if (color_sel != NULL)
- gtk_widget_destroy(color_sel);
+ window_destroy(color_sel);
color_sel = (GtkWidget *)OBJECT_GET_DATA(object, COLOR_SELECTION_BG);
if (color_sel != NULL)
- gtk_widget_destroy(color_sel);
+ window_destroy(color_sel);
}
/* Pop up a color selection box to choose the foreground color. */
filter_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(filt_text_entry)));
if(strchr(filter_name,'@') || strchr(filter_text,'@')){
- simple_dialog(ESD_TYPE_CRIT, NULL, "Filter names and strings must not"
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Filter names and strings must not"
" use the '@' character. Filter unchanged.");
g_free(filter_name);
g_free(filter_text);
}
if(!dfilter_compile(filter_text, &compiled_filter)) {
- simple_dialog(ESD_TYPE_CRIT, NULL, "Filter \"%s\" did not compile correctly.\n"
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Filter \"%s\" didn't compile correctly.\n"
" Please try again. Filter unchanged.\n%s\n", filter_name,
dfilter_error_msg);
} else {
gtk_clist_set_background(GTK_CLIST(color_filters), row_selected,
&new_bg_color);
#else
- sprintf(fg_str, "#%04X%04X%04X",
+ g_snprintf(fg_str, 14, "#%04X%04X%04X",
new_fg_color.red, new_fg_color.green, new_fg_color.blue);
- sprintf(bg_str, "#%04X%04X%04X",
+ g_snprintf(bg_str, 14, "#%04X%04X%04X",
new_bg_color.red, new_bg_color.green, new_bg_color.blue);
model = gtk_tree_view_get_model(GTK_TREE_VIEW(color_filters));
gtk_tree_model_iter_nth_child(model, &iter, NULL, row_selected);
#endif
/* Destroy the dialog box. */
- gtk_widget_destroy(dialog);
+ window_destroy(dialog);
}
}
-/* Exit dialog and do not process list */
+/* reject new color filter addition */
static void
-edit_color_filter_cancel_cb(GtkObject *object _U_, gpointer user_data)
+edit_new_color_filter_cancel_cb(GtkButton *button, gpointer user_data _U_)
{
- GtkWidget *dialog;
-
- dialog = (GtkWidget *)user_data;
-
- /* Destroy the dialog box. */
- gtk_widget_destroy(dialog);
+ /* Delete the entry. N.B. this already destroys the edit_dialog window. */
+ color_delete(num_of_filters-1, (GtkWidget*)OBJECT_GET_DATA(button, COLOR_FILTERS_CL));
}
static GtkWidget*
color_sel_win_new(color_filter_t *colorf, gboolean is_bg)
{
- gint title_len;
gchar *title;
- static const gchar fg_title_format[] = "Ethereal: Choose foreground color for \"%s\"";
- static const gchar bg_title_format[] = "Ethereal: Choose background color for \"%s\"";
GtkWidget *color_sel_win;
color_t *color;
#if GTK_MAJOR_VERSION >= 2
if (is_bg) {
color = &colorf->bg_color;
- title_len = strlen(bg_title_format) + strlen(colorf->filter_name);
- title = g_malloc(title_len + 1);
- sprintf(title, bg_title_format, colorf->filter_name);
+ title = g_strdup_printf("Ethereal: Choose background color for \"%s\"",
+ colorf->filter_name);
} else {
color = &colorf->fg_color;
- title_len = strlen(fg_title_format) + strlen(colorf->filter_name);
- title = g_malloc(title_len + 1);
- sprintf(title, fg_title_format, colorf->filter_name);
+ title = g_strdup_printf("Ethereal: Choose foreground color for \"%s\"",
+ colorf->filter_name);
}
color_sel_win = gtk_color_selection_dialog_new(title);
g_free(title);
color_sel_ok = GTK_COLOR_SELECTION_DIALOG (color_sel_win)->ok_button;
OBJECT_SET_DATA(color_sel_win, "color_sel_ok", color_sel_ok);
- gtk_widget_show (color_sel_ok);
GTK_WIDGET_SET_FLAGS (color_sel_ok, GTK_CAN_DEFAULT);
color_sel_cancel = GTK_COLOR_SELECTION_DIALOG (color_sel_win)->cancel_button;
OBJECT_SET_DATA(color_sel_win, "color_sel_cancel", color_sel_cancel);
- gtk_widget_show (color_sel_cancel);
GTK_WIDGET_SET_FLAGS (color_sel_cancel, GTK_CAN_DEFAULT);
color_sel_help = GTK_COLOR_SELECTION_DIALOG (color_sel_win)->help_button;
OBJECT_SET_DATA(color_sel_win, "color_sel_help", color_sel_help);
- gtk_widget_show (color_sel_help);
GTK_WIDGET_SET_FLAGS (color_sel_help, GTK_CAN_DEFAULT);
- SIGNAL_CONNECT(color_sel_win, "destroy", color_sel_cancel_cb, color_sel_win);
SIGNAL_CONNECT(color_sel_ok, "clicked", color_sel_ok_cb, color_sel_win);
SIGNAL_CONNECT(color_sel_cancel, "clicked", color_sel_cancel_cb, color_sel_win);
- gtk_widget_show(color_sel_win);
+ gtk_widget_show_all(color_sel_win);
return color_sel_win;
}
}
/* Now destroy it. */
- gtk_widget_destroy(sel_win);
+ window_destroy(sel_win);
}
/* Retrieve selected color */
#endif
if ( ! get_color(&new_color) ){
- simple_dialog(ESD_TYPE_CRIT, NULL, "Could not allocate color. Try again.");
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+ "Could not allocate color. Try again.");
} else {
/* Find the "Edit color filter" dialog box with which this is
associated. */
#endif
gtk_widget_set_style(filt_name_entry, style);
gtk_widget_set_style(filt_text_entry, style);
+ gtk_style_unref(style);
}
}
git.samba.org / obnox / wireshark / wip.git / blobdiff