aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/main.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-07-03 08:36:52 +0000
committerGuy Harris <guy@alum.mit.edu>2000-07-03 08:36:52 +0000
commit9e42b3a4edee724033766982c633e70bc621be87 (patch)
tree1932df4d63878c2e67a4f415016755d869d3ec60 /gtk/main.c
parent6f4d2c0cb873797918499197c45362535aaab885 (diff)
downloadwireshark-9e42b3a4edee724033766982c633e70bc621be87.tar.gz
wireshark-9e42b3a4edee724033766982c633e70bc621be87.tar.bz2
wireshark-9e42b3a4edee724033766982c633e70bc621be87.zip
Remove the progress bar from the status line, and, instead, for any
potentially long-running operation that has a progress indicator, pop up a modal dialog box with an indication of what is being done; a progress bar; a "Cancel" button to stop the operation. This: leaves more room on the status line for a filter expression; provides a mechanism to allow the user to cancel long-running operations (although the way we do so may not back out of them as nicely as the user might like, if it's not obvious what the "right" way is or if the "right" way is difficult to implement or involves doing as much work as letting the operation continue); means that, because the dialog box is modal, we don't have to worry about the user performing arbitrary UI operations out from under the operation and changing arbitrary bits of state being used by that operation. svn path=/trunk/; revision=2103
Diffstat (limited to 'gtk/main.c')
-rw-r--r--gtk/main.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/gtk/main.c b/gtk/main.c
index d7258ac449..a89b4c63b5 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.125 2000/06/27 07:13:25 guy Exp $
+ * $Id: main.c,v 1.126 2000/07/03 08:36:02 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -121,7 +121,7 @@ FILE *data_out_file = NULL;
packet_info pi;
capture_file cfile;
GtkWidget *top_level, *packet_list, *tree_view, *byte_view,
- *prog_bar, *info_bar, *tv_scrollw, *pkt_scrollw;
+ *info_bar, *tv_scrollw, *pkt_scrollw;
static GtkWidget *bv_scrollw;
GdkFont *m_r_font, *m_b_font;
guint main_ctx, file_ctx;
@@ -1785,16 +1785,12 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
create_byte_view(bv_size, l_pane, &byte_view, &bv_scrollw,
prefs->gui_scrollbar_on_right);
- /* Progress/filter/info box */
+ /* Filter/info box */
stat_hbox = gtk_hbox_new(FALSE, 1);
gtk_container_border_width(GTK_CONTAINER(stat_hbox), 0);
gtk_box_pack_start(GTK_BOX(main_vbox), stat_hbox, FALSE, TRUE, 0);
gtk_widget_show(stat_hbox);
- prog_bar = gtk_progress_bar_new();
- gtk_box_pack_start(GTK_BOX(stat_hbox), prog_bar, FALSE, TRUE, 3);
- gtk_widget_show(prog_bar);
-
filter_bt = gtk_button_new_with_label("Filter:");
gtk_signal_connect(GTK_OBJECT(filter_bt), "clicked",
GTK_SIGNAL_FUNC(filter_browse_cb), NULL);