aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/main_toolbar.c
diff options
context:
space:
mode:
authorsfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>2009-06-30 18:05:04 +0000
committersfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>2009-06-30 18:05:04 +0000
commite0df3657f295cbd7dc7bf49be97026236e9168a4 (patch)
tree3aaafc6ab6cc9e1bda6c0b3103c5279e9eda2fa4 /gtk/main_toolbar.c
parentcc14d6d3ca5cecd876aca09f4732794b16651838 (diff)
Introduce experimental new feature: GTK2 tree view based packet list
To use the GTK2 based packet list, define NEW_PACKET_LIST when compiling. To do this with gcc, set the environment variable CPPFLAGS to "-DNEW_PACKET_LIST" and re-run configure. Many features do not yet work. This work began with prototypes by Ulf quite a while back. I've put quite a bit of work into this so far and as discussed with a few of the core team members at Sharkfest09 and it was decided that it would be best to commit what I have so far to allow others to help work on this. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28892 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/main_toolbar.c')
-rw-r--r--gtk/main_toolbar.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/gtk/main_toolbar.c b/gtk/main_toolbar.c
index 0994171995..a32f004558 100644
--- a/gtk/main_toolbar.c
+++ b/gtk/main_toolbar.c
@@ -76,7 +76,10 @@ static GtkToolItem *open_button, *save_button, *close_button, *reload_button;
static GtkToolItem *print_button, *find_button, *history_forward_button, *history_back_button;
static GtkToolItem *go_to_button, *go_to_top_button, *go_to_bottom_button;
static GtkToolItem *display_filter_button;
-static GtkToolItem *zoom_in_button, *zoom_out_button, *zoom_100_button, *colorize_button, *resize_columns_button;
+static GtkToolItem *zoom_in_button, *zoom_out_button, *zoom_100_button, *colorize_button;
+#ifndef NEW_PACKET_LIST
+static GtkToolItem *resize_columns_button;
+#endif
static GtkToolItem *color_display_button, *prefs_button, *help_button;
#define SAVE_BUTTON_TOOLTIP_TEXT "Save this capture file..."
@@ -202,8 +205,10 @@ void set_toolbar_for_captured_packets(gboolean have_captured_packets) {
have_captured_packets);
gtk_widget_set_sensitive(GTK_WIDGET(zoom_100_button),
have_captured_packets);
+#ifndef NEW_PACKET_LIST
gtk_widget_set_sensitive(GTK_WIDGET(resize_columns_button),
have_captured_packets);
+#endif
/* XXX - I don't see a reason why this should be done (as it is in the
* menus) */
/* gtk_widget_set_sensitive(GTK_WIDGET(color_display_button),
@@ -381,8 +386,10 @@ toolbar_new(void)
toolbar_item(zoom_100_button, main_tb,
GTK_STOCK_ZOOM_100, tooltips, "Zoom 100%", view_zoom_100_cb, NULL);
+#ifndef NEW_PACKET_LIST
toolbar_item(resize_columns_button, main_tb,
WIRESHARK_STOCK_RESIZE_COLUMNS, tooltips, "Resize All Columns", packet_list_resize_columns_cb, NULL);
+#endif
toolbar_append_separator(main_tb);