aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/capture_prefs.c3
-rw-r--r--gtk/column_prefs.c6
-rw-r--r--gtk/filter_prefs.c3
-rw-r--r--gtk/follow_dlg.c10
-rw-r--r--gtk/goto_dlg.c6
-rw-r--r--gtk/gui_prefs.c8
-rw-r--r--gtk/help_dlg.c17
-rw-r--r--gtk/main.c9
-rw-r--r--gtk/menu.c3
-rw-r--r--gtk/packet_win.c4
-rw-r--r--gtk/prefs_dlg.c6
-rw-r--r--gtk/prefs_dlg.h7
-rw-r--r--gtk/print_dlg.c4
-rw-r--r--gtk/print_prefs.c41
-rw-r--r--gtk/proto_dlg.c10
-rw-r--r--gtk/proto_draw.c10
-rw-r--r--gtk/stream_prefs.c4
-rw-r--r--gtk/tcp_graph.c10
-rw-r--r--gtk/ui_util.c90
-rw-r--r--gtk/ui_util.h22
20 files changed, 118 insertions, 155 deletions
diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
index c93d7fef6d..388ebcc2b5 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.c
@@ -1,7 +1,7 @@
/* capture_prefs.c
* Dialog box for capture preferences
*
- * $Id: capture_prefs.c,v 1.2 2002/01/10 09:51:23 guy Exp $
+ * $Id: capture_prefs.c,v 1.3 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,7 +37,6 @@
#include "globals.h"
#include "capture_prefs.h"
#include "gtkglobals.h"
-#include "prefs_dlg.h"
#include "prefs.h"
#include "prefs-int.h"
#include "ui_util.h"
diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index 9a33d9213f..e5991571a3 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -1,12 +1,11 @@
/* column_prefs.c
* Dialog box for column preferences
*
- * $Id: column_prefs.c,v 1.6 2001/07/22 21:50:47 guy Exp $
+ * $Id: column_prefs.c,v 1.7 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -34,7 +33,6 @@
#include "globals.h"
#include "column_prefs.h"
#include "gtkglobals.h"
-#include "prefs_dlg.h"
#include "prefs.h"
#include "column.h"
diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c
index 44f0b391a3..778273d740 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.32 2001/10/24 06:13:06 guy Exp $
+ * $Id: filter_prefs.c,v 1.33 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -40,7 +40,6 @@
#include "dlg_utils.h"
#include "ui_util.h"
#include "simple_dialog.h"
-#include "prefs_dlg.h"
#include "dfilter_expr_dlg.h"
#define E_FILT_PARENT_FILTER_TE_KEY "filter_parent_filter_te"
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index 69f3e0ab63..3f09ddde86 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -1,9 +1,9 @@
/* follow_dlg.c
*
- * $Id: follow_dlg.c,v 1.16 2001/12/18 19:09:07 gram Exp $
+ * $Id: follow_dlg.c,v 1.17 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -19,7 +19,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
#ifdef HAVE_CONFIG_H
@@ -243,14 +242,11 @@ follow_stream_cb(GtkWidget * w, gpointer data)
gtk_container_add(GTK_CONTAINER(streamwindow), vbox);
/* create a scrolled window for the text */
- txt_scrollw = gtk_scrolled_window_new(NULL, NULL);
+ txt_scrollw = scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(vbox), txt_scrollw, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
GTK_POLICY_NEVER,
GTK_POLICY_ALWAYS);
- set_scrollbar_placement_scrollw(txt_scrollw,
- prefs.gui_scrollbar_on_right);
- remember_scrolled_window(txt_scrollw);
/* create a text box */
text = gtk_text_new(NULL, NULL);
diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index 3ee5576317..6fde232e79 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.c
@@ -1,12 +1,11 @@
/* goto_dlg.c
* Routines for "go to frame" window
*
- * $Id: goto_dlg.c,v 1.12 2001/01/04 04:54:14 gram Exp $
+ * $Id: goto_dlg.c,v 1.13 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,7 +41,6 @@
#include "globals.h"
#include "goto_dlg.h"
-#include "prefs_dlg.h"
#include "simple_dialog.h"
#include "dlg_utils.h"
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 4da7659fa7..c9dafda6f8 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -1,7 +1,7 @@
/* gui_prefs.c
* Dialog box for GUI preferences
*
- * $Id: gui_prefs.c,v 1.29 2002/01/11 06:43:17 guy Exp $
+ * $Id: gui_prefs.c,v 1.30 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,7 +34,6 @@
#include "globals.h"
#include "gui_prefs.h"
#include "gtkglobals.h"
-#include "prefs_dlg.h"
#include "follow_dlg.h"
#include "help_dlg.h"
#include "prefs.h"
@@ -514,11 +513,10 @@ gui_prefs_apply(GtkWidget *w)
or the colors to use changed. */
follow_redraw_all();
- set_scrollbar_placement_all(prefs.gui_scrollbar_on_right);
+ set_scrollbar_placement_all();
set_plist_sel_browse(prefs.gui_plist_sel_browse);
set_ptree_sel_browse_all(prefs.gui_ptree_sel_browse);
- set_ctree_styles_all(prefs.gui_ptree_line_style,
- prefs.gui_ptree_expander_style);
+ set_ctree_styles_all();
if (colors_changed)
update_marked_frames();
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index ad9963b99d..9d6941502e 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -1,6 +1,6 @@
/* help_dlg.c
*
- * $Id: help_dlg.c,v 1.19 2001/12/12 21:38:58 gerald Exp $
+ * $Id: help_dlg.c,v 1.20 2002/01/11 07:40:31 guy Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
@@ -114,13 +114,11 @@ void help_cb(GtkWidget *w, gpointer data)
overview_vb = gtk_vbox_new(FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(overview_vb), 1);
- txt_scrollw = gtk_scrolled_window_new(NULL, NULL);
+ txt_scrollw = scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(overview_vb), txt_scrollw, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
GTK_POLICY_NEVER,
GTK_POLICY_ALWAYS);
- set_scrollbar_placement_scrollw(txt_scrollw, prefs.gui_scrollbar_on_right);
- remember_scrolled_window(txt_scrollw);
overview_text = gtk_text_new(NULL, NULL );
gtk_text_set_editable(GTK_TEXT(overview_text), FALSE);
gtk_text_set_word_wrap(GTK_TEXT(overview_text), TRUE);
@@ -140,13 +138,11 @@ void help_cb(GtkWidget *w, gpointer data)
proto_vb = gtk_vbox_new(FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(proto_vb), 1);
- txt_scrollw = gtk_scrolled_window_new(NULL, NULL);
+ txt_scrollw = scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(proto_vb), txt_scrollw, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
GTK_POLICY_ALWAYS,
GTK_POLICY_ALWAYS);
- set_scrollbar_placement_scrollw(txt_scrollw, prefs.gui_scrollbar_on_right);
- remember_scrolled_window(txt_scrollw);
proto_text = gtk_text_new(NULL, NULL);
gtk_text_set_editable(GTK_TEXT(proto_text), FALSE);
gtk_text_set_line_wrap(GTK_TEXT(proto_text), FALSE);
@@ -169,11 +165,10 @@ void help_cb(GtkWidget *w, gpointer data)
gtk_table_set_row_spacing (GTK_TABLE (dfilter_tb), 0, 3);
gtk_container_border_width(GTK_CONTAINER(dfilter_tb), 1);
- txt_scrollw = gtk_scrolled_window_new(NULL, NULL);
+ txt_scrollw = scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
GTK_POLICY_ALWAYS,
GTK_POLICY_NEVER);
- remember_scrolled_window(txt_scrollw);
dfilter_text = gtk_text_new(NULL, NULL);
dfilter_vsb = gtk_vscrollbar_new(GTK_TEXT(dfilter_text)->vadj);
if (prefs.gui_scrollbar_on_right) {
@@ -205,13 +200,11 @@ void help_cb(GtkWidget *w, gpointer data)
cfilter_vb = gtk_vbox_new(FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(cfilter_vb), 1);
- txt_scrollw = gtk_scrolled_window_new(NULL, NULL);
+ txt_scrollw = scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(cfilter_vb), txt_scrollw, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scrollw),
GTK_POLICY_NEVER,
GTK_POLICY_ALWAYS);
- set_scrollbar_placement_scrollw(txt_scrollw, prefs.gui_scrollbar_on_right);
- remember_scrolled_window(txt_scrollw);
cfilter_text = gtk_text_new(NULL, NULL );
gtk_text_set_editable(GTK_TEXT(cfilter_text), FALSE);
gtk_text_set_word_wrap(GTK_TEXT(cfilter_text), TRUE);
diff --git a/gtk/main.c b/gtk/main.c
index db96b2af6a..c59570fbb1 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.226 2002/01/11 06:43:17 guy Exp $
+ * $Id: main.c,v 1.227 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -122,12 +122,12 @@
#include "summary.h"
#include "file.h"
#include "filters.h"
+#include "prefs.h"
#include "menu.h"
#include "../menu.h"
#include "color.h"
#include "color_utils.h"
#include "filter_prefs.h"
-#include "prefs_dlg.h"
#include "file_dlg.h"
#include "column.h"
#include "print.h"
@@ -146,7 +146,6 @@
#include "colors.h"
#include "strutil.h"
#include "register.h"
-#include "prefs.h"
#include "ringbuffer.h"
#include "ui_util.h"
#include "image/clist_ascend.xpm"
@@ -1933,11 +1932,9 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
gtk_widget_show(u_pane);
/* Packet list */
- pkt_scrollw = gtk_scrolled_window_new(NULL, NULL);
+ pkt_scrollw = scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(pkt_scrollw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- set_scrollbar_placement_scrollw(pkt_scrollw, prefs->gui_scrollbar_on_right);
- remember_scrolled_window(pkt_scrollw);
gtk_widget_show(pkt_scrollw);
gtk_paned_add1(GTK_PANED(u_pane), pkt_scrollw);
diff --git a/gtk/menu.c b/gtk/menu.c
index b66d278c40..d9cf44cbd6 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
/* menu.c
* Menu routines
*
- * $Id: menu.c,v 1.58 2001/12/18 19:09:08 gram Exp $
+ * $Id: menu.c,v 1.59 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,6 +42,7 @@
#include "menu.h"
#include "packet.h"
#include "resolv.h"
+#include "prefs.h"
#include "capture_dlg.h"
#include "color_dlg.h"
#include "file_dlg.h"
diff --git a/gtk/packet_win.c b/gtk/packet_win.c
index 29ebccbcad..302eefa327 100644
--- a/gtk/packet_win.c
+++ b/gtk/packet_win.c
@@ -3,7 +3,7 @@
*
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet_win.c,v 1.30 2001/12/18 19:09:08 gram Exp $
+ * $Id: packet_win.c,v 1.31 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -51,9 +51,9 @@
#include "packet.h"
#include "summary.h"
#include "file.h"
+#include "prefs.h"
#include "menu.h"
#include "../menu.h"
-#include "prefs_dlg.h"
#include "column.h"
#include "print.h"
#include "resolv.h"
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 00e97c12f9..9712545cfc 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
/* prefs_dlg.c
* Routines for handling preferences
*
- * $Id: prefs_dlg.c,v 1.36 2002/01/11 06:43:18 guy Exp $
+ * $Id: prefs_dlg.c,v 1.37 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -309,11 +309,9 @@ prefs_cb(GtkWidget *w, gpointer dummy) {
gtk_widget_show(top_hb);
/* Place a Ctree on the left for preference categories */
- ct_sb = gtk_scrolled_window_new(NULL, NULL);
+ ct_sb = scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ct_sb),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- set_scrollbar_placement_scrollw(ct_sb, prefs.gui_scrollbar_on_right);
- remember_scrolled_window(ct_sb);
gtk_container_add(GTK_CONTAINER(top_hb), ct_sb);
gtk_widget_show(ct_sb);
diff --git a/gtk/prefs_dlg.h b/gtk/prefs_dlg.h
index 44a7fb45f9..bc7a316e98 100644
--- a/gtk/prefs_dlg.h
+++ b/gtk/prefs_dlg.h
@@ -1,12 +1,11 @@
/* prefs_dlg.h
* Definitions for preference handling routines
*
- * $Id: prefs_dlg.h,v 1.5 2000/08/15 20:41:59 deniel Exp $
+ * $Id: prefs_dlg.h,v 1.6 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -26,8 +25,6 @@
#ifndef __PREFS_DLG_H__
#define __PREFS_DLG_H__
-#include "prefs.h"
-
void prefs_cb(GtkWidget *, gpointer);
void properties_cb(GtkWidget *, gpointer);
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index 88ded60e5c..09de73e4eb 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -1,7 +1,7 @@
/* print_dlg.c
* Dialog boxes for printing
*
- * $Id: print_dlg.c,v 1.27 2001/12/18 19:09:08 gram Exp $
+ * $Id: print_dlg.c,v 1.28 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,7 +33,7 @@
#include "globals.h"
#include "keys.h"
#include "print.h"
-#include "prefs_dlg.h"
+#include "prefs.h"
#include "simple_dialog.h"
#include "ui_util.h"
#include "dlg_utils.h"
diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index 8f9a029a46..bb547fb8ee 100644
--- a/gtk/print_prefs.c
+++ b/gtk/print_prefs.c
@@ -1,12 +1,11 @@
/* print_prefs.c
* Dialog boxes for preferences for printing
*
- * $Id: print_prefs.c,v 1.8 2000/10/20 04:26:40 gram Exp $
+ * $Id: print_prefs.c,v 1.9 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -34,7 +33,7 @@
#include "print_prefs.h"
#include "keys.h"
#include "print.h"
-#include "prefs_dlg.h"
+#include "prefs.h"
#include "util.h"
#include "ui_util.h"
#include "dlg_utils.h"
@@ -49,7 +48,7 @@ static void printer_opts_toggle_dest(GtkWidget *widget, gpointer data);
#define E_FS_CALLER_PTR_KEY "fs_caller_ptr"
#define E_FILE_SEL_DIALOG_PTR_KEY "file_sel_dialog_ptr"
-GtkWidget * printer_prefs_show()
+GtkWidget * printer_prefs_show(void)
{
GtkWidget *main_vb, *main_tb, *button;
GtkWidget *format_hb, *format_lb;
@@ -59,23 +58,23 @@ GtkWidget * printer_prefs_show()
GSList *format_grp, *dest_grp;
/* Enclosing containers for each row of widgets */
- main_vb = gtk_vbox_new(FALSE, 5);
- gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
+ main_vb = gtk_vbox_new(FALSE, 5);
+ gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
main_tb = gtk_table_new(4, 2, FALSE);
gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0);
- gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
- gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
- gtk_widget_show(main_tb);
+ gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
+ gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
+ gtk_widget_show(main_tb);
/* Output format */
format_lb = gtk_label_new("Format:");
- gtk_misc_set_alignment(GTK_MISC(format_lb), 1.0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(main_tb), format_lb, 0, 1, 0, 1);
+ gtk_misc_set_alignment(GTK_MISC(format_lb), 1.0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), format_lb, 0, 1, 0, 1);
gtk_widget_show(format_lb);
format_hb = gtk_hbox_new(FALSE, 0);
- gtk_table_attach_defaults(GTK_TABLE(main_tb), format_hb, 1, 2, 0, 1);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), format_hb, 1, 2, 0, 1);
gtk_widget_show(format_hb);
button = gtk_radio_button_new_with_label(NULL, "Plain Text");
@@ -97,12 +96,12 @@ GtkWidget * printer_prefs_show()
/* Output destination */
dest_lb = gtk_label_new("Print to:");
- gtk_misc_set_alignment(GTK_MISC(dest_lb), 1.0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(main_tb), dest_lb, 0, 1, 1, 2);
+ gtk_misc_set_alignment(GTK_MISC(dest_lb), 1.0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), dest_lb, 0, 1, 1, 2);
gtk_widget_show(dest_lb);
dest_hb = gtk_hbox_new(FALSE, 0);
- gtk_table_attach_defaults(GTK_TABLE(main_tb), dest_hb, 1, 2, 1, 2);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), dest_hb, 1, 2, 1, 2);
gtk_widget_show(dest_hb);
button = gtk_radio_button_new_with_label(NULL, "Command");
@@ -124,19 +123,19 @@ GtkWidget * printer_prefs_show()
/* Command text entry */
cmd_lb = gtk_label_new("Command:");
- gtk_misc_set_alignment(GTK_MISC(cmd_lb), 1.0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(main_tb), cmd_lb, 0, 1, 2, 3);
+ gtk_misc_set_alignment(GTK_MISC(cmd_lb), 1.0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), cmd_lb, 0, 1, 2, 3);
gtk_widget_show(cmd_lb);
cmd_te = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(main_vb), PRINT_CMD_TE_KEY, cmd_te);
if (prefs.pr_cmd) gtk_entry_set_text(GTK_ENTRY(cmd_te), prefs.pr_cmd);
- gtk_table_attach_defaults(GTK_TABLE(main_tb), cmd_te, 1, 2, 2, 3);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), cmd_te, 1, 2, 2, 3);
gtk_widget_show(cmd_te);
/* File button and text entry */
file_bt_hb = gtk_hbox_new(FALSE, 0);
- gtk_table_attach_defaults(GTK_TABLE(main_tb), file_bt_hb, 0, 1, 3, 4);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), file_bt_hb, 0, 1, 3, 4);
gtk_widget_show(file_bt_hb);
file_bt = gtk_button_new_with_label("File:");
@@ -146,7 +145,7 @@ GtkWidget * printer_prefs_show()
file_te = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(main_vb), PRINT_FILE_TE_KEY, file_te);
if (prefs.pr_file) gtk_entry_set_text(GTK_ENTRY(file_te), prefs.pr_file);
- gtk_table_attach_defaults(GTK_TABLE(main_tb), file_te, 1, 2, 3, 4);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), file_te, 1, 2, 3, 4);
gtk_widget_show(file_te);
gtk_signal_connect(GTK_OBJECT(file_bt), "clicked",
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index e94906a375..4a137a78a9 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -1,11 +1,11 @@
/* proto_dlg.c
*
- * $Id: proto_dlg.c,v 1.8 2001/03/01 21:34:09 gram Exp $
+ * $Id: proto_dlg.c,v 1.9 2002/01/11 07:40:31 guy Exp $
*
* Laurent Deniel <deniel@worldnet.fr>
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -21,7 +21,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
#ifdef HAVE_CONFIG_H
@@ -39,7 +38,6 @@
#include "prefs.h"
#include "globals.h"
-#include "gtkglobals.h"
#include "main.h"
#include "util.h"
#include "ui_util.h"
@@ -112,13 +110,11 @@ void proto_cb(GtkWidget *w, gpointer data)
label = gtk_label_new("Button pressed: protocol decoding is enabled");
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(selection_vb), label, FALSE, FALSE, 0);
- scrolled_w = gtk_scrolled_window_new(NULL, NULL);
+ scrolled_w = scrolled_window_new(NULL, NULL);
gtk_container_set_border_width(GTK_CONTAINER(scrolled_w), 1);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_w),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
- set_scrollbar_placement_scrollw(scrolled_w, prefs.gui_scrollbar_on_right);
- remember_scrolled_window(scrolled_w);
gtk_box_pack_start(GTK_BOX(selection_vb), scrolled_w, TRUE, TRUE, 0);
show_proto_selection(proto_w, scrolled_w);
gtk_widget_show(scrolled_w);
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index 23afe73113..9f99842786 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1,7 +1,7 @@
/* proto_draw.c
* Routines for GTK+ packet display
*
- * $Id: proto_draw.c,v 1.43 2002/01/11 06:43:18 guy Exp $
+ * $Id: proto_draw.c,v 1.44 2002/01/11 07:40:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -382,7 +382,7 @@ add_byte_tab(GtkWidget *byte_nb, const char *name, const guint8 *data, int len,
gchar *name_ptr;
/* Byte view. Create a scrolled window for the text. */
- byte_scrollw = gtk_scrolled_window_new(NULL, NULL);
+ byte_scrollw = scrolled_window_new(NULL, NULL);
/* Add scrolled pane to tabbed window */
label = gtk_label_new (name);
gtk_notebook_append_page (GTK_NOTEBOOK(byte_nb), byte_scrollw, label);
@@ -394,8 +394,6 @@ add_byte_tab(GtkWidget *byte_nb, const char *name, const guint8 *data, int len,
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(byte_scrollw),
/* Horizontal */GTK_POLICY_NEVER,
/* Vertical*/ GTK_POLICY_ALWAYS);
- set_scrollbar_placement_scrollw(byte_scrollw, prefs.gui_scrollbar_on_right);
- remember_scrolled_window(byte_scrollw);
gtk_widget_show(byte_scrollw);
byte_view = gtk_text_new(NULL, NULL);
@@ -802,11 +800,9 @@ create_tree_view(gint tv_size, e_prefs *prefs, GtkWidget *pane,
GtkWidget *tv_scrollw, *tree_view;
/* Tree view */
- tv_scrollw = gtk_scrolled_window_new(NULL, NULL);
+ tv_scrollw = scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(tv_scrollw),
GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS);
- set_scrollbar_placement_scrollw(tv_scrollw, pos);
- remember_scrolled_window(tv_scrollw);
gtk_paned_pack1(GTK_PANED(pane), tv_scrollw, TRUE, TRUE);
gtk_widget_set_usize(tv_scrollw, -1, tv_size);
gtk_widget_show(tv_scrollw);
diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c
index 5db8dc5105..6d336833fe 100644
--- a/gtk/stream_prefs.c
+++ b/gtk/stream_prefs.c
@@ -1,7 +1,7 @@
/* stream_prefs.c
* Dialog boxes for preferences for the stream window
*
- * $Id: stream_prefs.c,v 1.9 2001/08/21 06:39:18 guy Exp $
+ * $Id: stream_prefs.c,v 1.10 2002/01/11 07:40:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,7 +35,7 @@
#include "stream_prefs.h"
#include "keys.h"
#include "print.h"
-#include "prefs_dlg.h"
+#include "prefs.h"
static void update_text_color(GtkWidget *, gpointer);
static void update_current_color(GtkWidget *, gpointer);
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 6fd642a788..54ca6f922c 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
- * $Id: tcp_graph.c,v 1.11 2002/01/03 20:01:07 guy Exp $
+ * $Id: tcp_graph.c,v 1.12 2002/01/11 07:40:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -44,9 +44,7 @@
#include "globals.h" /* cfile */
#include "packet.h" /* frame_data */
-#include "prefs_dlg.h" /* prefs */
-#include "gtkglobals.h" /* set_scrollbar_placement_srollw() and
- * remember_scrolled_window() */
+#include "gtkglobals.h" /* packet_list */
#include "simple_dialog.h"
#include "ui_util.h"
#include "tcp_graph.h"
@@ -586,12 +584,10 @@ static void create_text_widget (struct graph *g)
gtk_container_add (GTK_CONTAINER (streamwindow), box);
gtk_widget_show (box);
- txt_scrollw = gtk_scrolled_window_new (NULL, NULL);
+ txt_scrollw = scrolled_window_new (NULL, NULL);
gtk_box_pack_start (GTK_BOX (box), txt_scrollw, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (txt_scrollw),
GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
- set_scrollbar_placement_scrollw (txt_scrollw, prefs.gui_scrollbar_on_right);
- remember_scrolled_window (txt_scrollw);
gtk_widget_show (txt_scrollw);
g->text = gtk_text_new (NULL, NULL);
diff --git a/gtk/ui_util.c b/gtk/ui_util.c
index 1feeaced5f..023de01b52 100644
--- a/gtk/ui_util.c
+++ b/gtk/ui_util.c
@@ -1,7 +1,7 @@
/* ui_util.c
* UI utility routines
*
- * $Id: ui_util.c,v 1.7 2002/01/11 06:43:18 guy Exp $
+ * $Id: ui_util.c,v 1.8 2002/01/11 07:40:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -134,16 +134,33 @@ window_icon_realize_cb (GtkWidget *win, gpointer data)
#endif
}
-/* List of all scrolled windows, so we can globally set the scrollbar
+/* List of all GtkScrolledWindows, so we can globally set the scrollbar
placement of all of them. */
static GList *scrolled_windows;
+static void setup_scrolled_window(GtkWidget *scrollw);
static void forget_scrolled_window(GtkWidget *scrollw, gpointer data);
+static void set_scrollbar_placement_scrollw(GtkWidget *scrollw);
-/* Add a scrolled window to the list of scrolled windows. */
-void
-remember_scrolled_window(GtkWidget *scrollw)
+/* Create a GtkScrolledWindow, set its scrollbar placement appropriately,
+ and remember it. */
+GtkWidget *
+scrolled_window_new(GtkAdjustment *hadjustment, GtkAdjustment *vadjustment)
+{
+ GtkWidget *scrollw;
+
+ scrollw = gtk_scrolled_window_new(hadjustment, vadjustment);
+ setup_scrolled_window(scrollw);
+ return scrollw;
+}
+
+/* Set a GtkScrolledWindow's scrollbar placement and add it to the list
+ of GtkScrolledWindows. */
+static void
+setup_scrolled_window(GtkWidget *scrollw)
{
+ set_scrollbar_placement_scrollw(scrollw);
+
scrolled_windows = g_list_append(scrolled_windows, scrollw);
/* Catch the "destroy" event on the widget, so that we remove it from
@@ -152,19 +169,19 @@ remember_scrolled_window(GtkWidget *scrollw)
GTK_SIGNAL_FUNC(forget_scrolled_window), NULL);
}
-/* Remove a scrolled window from the list of scrolled windows. */
+/* Remove a GtkScrolledWindow from the list of GtkScrolledWindows. */
static void
forget_scrolled_window(GtkWidget *scrollw, gpointer data)
{
scrolled_windows = g_list_remove(scrolled_windows, scrollw);
}
-/* Set the scrollbar placement of a scrolled window based upon pos value:
- 0 = left, 1 = right */
-void
-set_scrollbar_placement_scrollw(GtkWidget *scrollw, int pos) /* 0=left, 1=right */
+/* Set the scrollbar placement of a GtkScrolledWindow based upon user
+ preference. */
+static void
+set_scrollbar_placement_scrollw(GtkWidget *scrollw)
{
- if (pos) {
+ if (prefs.gui_scrollbar_on_right) {
gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW(scrollw),
GTK_CORNER_TOP_LEFT);
} else {
@@ -176,15 +193,15 @@ set_scrollbar_placement_scrollw(GtkWidget *scrollw, int pos) /* 0=left, 1=right
static void
set_scrollbar_placement_cb(gpointer data, gpointer user_data)
{
- set_scrollbar_placement_scrollw((GtkWidget *)data, *(int *)user_data);
+ set_scrollbar_placement_scrollw((GtkWidget *)data);
}
-/* Set the scrollbar placement of all scrolled windows based on pos value:
- 0 = left, 1 = right */
+/* Set the scrollbar placement of all GtkScrolledWindows based on
+ user preference. */
void
-set_scrollbar_placement_all(int pos)
+set_scrollbar_placement_all(void)
{
- g_list_foreach(scrolled_windows, set_scrollbar_placement_cb, &pos);
+ g_list_foreach(scrolled_windows, set_scrollbar_placement_cb, NULL);
}
/* List of all GtkCTrees, so we can globally set the line and expander style
@@ -193,8 +210,7 @@ static GList *ctrees;
static void setup_ctree(GtkWidget *ctree);
static void forget_ctree(GtkWidget *ctree, gpointer data);
-static void set_ctree_styles(GtkWidget *ctree, gint line_style,
- gint expander_style);
+static void set_ctree_styles(GtkWidget *ctree);
/* Create a GtkCTree, give it the right styles, and remember it. */
GtkWidget *
@@ -221,8 +237,7 @@ ctree_new_with_titles(gint columns, gint tree_column, gchar *titles[])
static void
setup_ctree(GtkWidget *ctree)
{
- set_ctree_styles(ctree, prefs.gui_ptree_line_style,
- prefs.gui_ptree_expander_style);
+ set_ctree_styles(ctree);
ctrees = g_list_append(ctrees, ctree);
@@ -239,39 +254,28 @@ forget_ctree(GtkWidget *ctree, gpointer data)
ctrees = g_list_remove(ctrees, ctree);
}
-/* Set the styles of a GtkCTree based upon style values. */
-typedef struct {
- gint line_style;
- gint expander_style;
-} ctree_style_arg_t;
-
+/* Set the styles of a GtkCTree based upon user preferences. */
static void
-set_ctree_styles(GtkWidget *ctree, gint line_style, gint expander_style)
+set_ctree_styles(GtkWidget *ctree)
{
- g_assert(line_style >= GTK_CTREE_LINES_NONE &&
- line_style <= GTK_CTREE_LINES_TABBED);
- gtk_ctree_set_line_style(GTK_CTREE(ctree), line_style);
- g_assert(expander_style >= GTK_CTREE_EXPANDER_NONE &&
- expander_style <= GTK_CTREE_EXPANDER_CIRCULAR);
- gtk_ctree_set_expander_style(GTK_CTREE(ctree), expander_style);
+ g_assert(prefs.gui_ptree_line_style >= GTK_CTREE_LINES_NONE &&
+ prefs.gui_ptree_line_style <= GTK_CTREE_LINES_TABBED);
+ gtk_ctree_set_line_style(GTK_CTREE(ctree), prefs.gui_ptree_line_style);
+ g_assert(prefs.gui_ptree_expander_style >= GTK_CTREE_EXPANDER_NONE &&
+ prefs.gui_ptree_expander_style <= GTK_CTREE_EXPANDER_CIRCULAR);
+ gtk_ctree_set_expander_style(GTK_CTREE(ctree),
+ prefs.gui_ptree_expander_style);
}
static void
set_ctree_styles_cb(gpointer data, gpointer user_data)
{
- ctree_style_arg_t *styles = user_data;
-
- set_ctree_styles((GtkWidget *)data, styles->line_style,
- styles->expander_style);
+ set_ctree_styles((GtkWidget *)data);
}
/* Set the styles of all GtkCTrees based upon style values. */
void
-set_ctree_styles_all(gint line_style, gint expander_style)
+set_ctree_styles_all(void)
{
- ctree_style_arg_t styles;
-
- styles.line_style = line_style;
- styles.expander_style = expander_style;
- g_list_foreach(ctrees, set_ctree_styles_cb, &styles);
+ g_list_foreach(ctrees, set_ctree_styles_cb, NULL);
}
diff --git a/gtk/ui_util.h b/gtk/ui_util.h
index df7d67a1e1..259662e6e5 100644
--- a/gtk/ui_util.h
+++ b/gtk/ui_util.h
@@ -1,7 +1,7 @@
/* ui_util.h
* Definitions for UI utility routines
*
- * $Id: ui_util.h,v 1.3 2002/01/11 06:43:18 guy Exp $
+ * $Id: ui_util.h,v 1.4 2002/01/11 07:40:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,23 +35,21 @@ void reactivate_window(GtkWidget *);
/* Set the window icon to the 16x16 3D icon. */
void window_icon_realize_cb (GtkWidget *, gpointer);
-/* Add a scrolled window to the list of scrolled windows. */
-void remember_scrolled_window(GtkWidget *);
+/* Create a GtkScrolledWindow, set its scrollbar placement appropriately,
+ and remember it. */
+GtkWidget *scrolled_window_new(GtkAdjustment *hadjustment,
+ GtkAdjustment *vadjustment);
-/* Set the scrollbar placement of a scrolled window based upon pos value:
- 0 = left, 1 = right */
-void set_scrollbar_placement_scrollw(GtkWidget *, int); /* 0=left, 1=right */
-
-/* Set the scrollbar placement of all scrolled windows based on pos value:
- 0 = left, 1 = right */
-void set_scrollbar_placement_all(int); /* 1=right, 0=left */
+/* Set the scrollbar placement of all scrolled windows based on user
+ preference. */
+void set_scrollbar_placement_all(void);
/* Create a GtkCTree, give it the right styles, and remember it. */
GtkWidget *ctree_new(gint columns, gint tree_column);
GtkWidget *ctree_new_with_titles(gint columns, gint tree_column,
gchar *titles[]);
-/* Set the styles of all GtkCTrees based upon style values. */
-void set_ctree_styles_all(gint, gint);
+/* Set the styles of all GtkCTrees based upon user preferences. */
+void set_ctree_styles_all(void);
#endif /* __GTKGUIUI_UTIL_H__ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 22:47:37 +0000