osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add filter autocomplete for more places we use filter entries. 

svn path=/trunk/; revision=26491
This commit is contained in:
Stig Bjørlykke 2008-10-19 13:40:52 +00:00
parent 51ac347364
commit 381285f61c
8 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/dcerpc_stat.c
View File

@ -56,6 +56,7 @@
#include "gtk/service_response_time_table.h"
#include "gtk/gtkglobals.h"
#include "gtk/main.h"
#include "gtk/filter_autocomplete.h"
/* used to keep track of the statistics for an entire program interface */
@ -635,6 +636,9 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
/* Filter entry */
filter_entry=gtk_entry_new();
g_signal_connect(filter_entry, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
g_object_set_data(G_OBJECT(filter_box), E_FILT_AUTOCOMP_PTR_KEY, NULL);
g_signal_connect(filter_entry, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
g_signal_connect(dlg, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
if(filter){

8
gtk/io_stat.c
View File

@ -59,6 +59,7 @@
#include "gtk/help_dlg.h"
#include "gtk/pixmap_save.h"
#include "gtk/main.h"
#include "gtk/filter_autocomplete.h"
#define MAX_GRAPHS 5
@ -1960,6 +1961,10 @@ create_advanced_field(io_stat_graph_t *gio, GtkWidget *box)
g_signal_connect(gio->calc_field, "activate", G_CALLBACK(filter_callback), gio);
g_object_set_data (G_OBJECT(gio->calc_field), E_FILT_FIELD_NAME_ONLY_KEY, "");
g_signal_connect(gio->calc_field, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
/* HERE */
g_object_set_data(G_OBJECT(box), E_FILT_AUTOCOMP_PTR_KEY, NULL);
g_signal_connect(gio->calc_field, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
g_signal_connect(gio->io->window, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
colorize_filter_te_as_empty(gio->calc_field);
}
@ -2050,6 +2055,9 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
gtk_widget_show(gio->filter_field);
g_signal_connect(gio->filter_field, "activate", G_CALLBACK(filter_callback), gio);
g_signal_connect(gio->filter_field, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
g_object_set_data(G_OBJECT(box), E_FILT_AUTOCOMP_PTR_KEY, NULL);
g_signal_connect(gio->filter_field, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
g_signal_connect(gio->io->window, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
colorize_filter_te_as_empty(gio->filter_field);
create_advanced_box(gio, hbox);

6
gtk/prefs_column.c
View File

@ -39,6 +39,7 @@
#include "gtk/gui_utils.h"
#include "gtk/main_packet_list.h"
#include "gtk/filter_dlg.h"
#include "gtk/filter_autocomplete.h"
static GtkWidget *column_l, *del_bt, *title_te, *field_te, *field_lb, *fmt_cmb, *up_bt, *dn_bt;
@ -60,7 +61,7 @@ void column_set_arrow_button_sensitivity(GList *);
/* Create and display the column selection widgets. */
/* Called when the 'Columns' preference notebook page is selected. */
GtkWidget *
column_prefs_show() {
column_prefs_show(GtkWidget *prefs_window) {
GtkWidget *main_vb, *top_hb, *new_bt,
*tb, *lb;
GtkWidget *order_fr, *order_vb, *order_lb;
@ -245,6 +246,9 @@ column_prefs_show() {
field_te = gtk_entry_new();
g_object_set_data (G_OBJECT(field_te), E_FILT_FIELD_NAME_ONLY_KEY, "");
g_signal_connect(field_te, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
g_object_set_data(G_OBJECT(main_vb), E_FILT_AUTOCOMP_PTR_KEY, NULL);
g_signal_connect(field_te, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
g_signal_connect(prefs_window, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
colorize_filter_te_as_empty(field_te);
gtk_table_attach_defaults(GTK_TABLE(tb), field_te, 3, 4, 1, 2);
gtk_widget_set_sensitive(field_te, FALSE);

2
gtk/prefs_column.h
View File

@ -35,7 +35,7 @@
*
* @return the new column preferences page
*/
GtkWidget *column_prefs_show(void);
GtkWidget *column_prefs_show(GtkWidget *prefs_window);
/** Fetch preference values from page.
*

2
gtk/prefs_dlg.c
View File

@ -518,7 +518,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
/* GUI Column prefs */
g_strlcpy(label_str, "Columns", MAX_TREE_NODE_NAME_LEN);
prefs_nb_page_add(prefs_nb, label_str, column_prefs_show(), E_GUI_COLUMN_PAGE_KEY);
prefs_nb_page_add(prefs_nb, label_str, column_prefs_show(prefs_w), E_GUI_COLUMN_PAGE_KEY);
prefs_tree_page_add(label_str, cts.page, store, &gui_iter, FALSE);
cts.page++;

4
gtk/rpc_stat.c
View File

@ -53,6 +53,7 @@
#include "gtk/stock_icons.h"
#include "gtk/service_response_time_table.h"
#include "gtk/gtkglobals.h"
#include "gtk/filter_autocomplete.h"
/* used to keep track of the statistics for an entire program interface */
@ -499,6 +500,9 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
/* Filter entry */
filter_entry=gtk_entry_new();
g_signal_connect(filter_entry, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
g_object_set_data(G_OBJECT(filter_box), E_FILT_AUTOCOMP_PTR_KEY, NULL);
g_signal_connect(filter_entry, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
g_signal_connect(dlg, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
/* filter prefs dialog */
g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_entry);

4
gtk/scsi_stat.c
View File

@ -57,6 +57,7 @@
#include "gtk/stock_icons.h"
#include "gtk/service_response_time_table.h"
#include "gtk/gtkglobals.h"
#include "gtk/filter_autocomplete.h"
static GtkWidget *dlg=NULL;
@ -392,6 +393,9 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_)
/* Filter entry */
filter_entry=gtk_entry_new();
g_signal_connect(filter_entry, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
g_object_set_data(G_OBJECT(filter_box), E_FILT_AUTOCOMP_PTR_KEY, NULL);
g_signal_connect(filter_entry, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
g_signal_connect(dlg, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
/* filter prefs dialog */
g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, filter_entry);

6
gtk/tap_dfilter_dlg.c
View File

@ -50,6 +50,7 @@
#include "gtk/tap_dfilter_dlg.h"
#include "gtk/gui_utils.h"
#include "gtk/gtkglobals.h"
#include "gtk/filter_autocomplete.h"
typedef struct _tap_dfilter_dlg_list_item {
@ -211,7 +212,10 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
/* Filter entry */
current_dlg->filter_entry=gtk_entry_new();
g_signal_connect(current_dlg->filter_entry, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
g_object_set_data(G_OBJECT(filter_box), E_FILT_AUTOCOMP_PTR_KEY, NULL);
g_signal_connect(current_dlg->filter_entry, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
g_signal_connect(current_dlg->dlg, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
/* filter prefs dialog */
g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_PTR_KEY, current_dlg->filter_entry);
/* filter prefs dialog */