diff options
| -rw-r--r-- | gtk/layout_prefs.c | 4 | ||||
| -rw-r--r-- | gtk/layout_prefs.h | 20 | ||||
| -rw-r--r-- | prefs.c | 8 | ||||
| -rw-r--r-- | prefs.h | 34 |
4 files changed, 36 insertions, 30 deletions
diff --git a/gtk/layout_prefs.c b/gtk/layout_prefs.c index f158834c1a..c915dd03bd 100644 --- a/gtk/layout_prefs.c +++ b/gtk/layout_prefs.c @@ -1,7 +1,7 @@ /* layout_prefs.c * Dialog box for layout preferences * - * $Id: layout_prefs.c,v 1.2 2004/04/30 00:22:45 guy Exp $ + * $Id: layout_prefs.c,v 1.3 2004/04/30 00:40:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -286,7 +286,7 @@ layout_prefs_show(void) icon_layout_4_xpm, icon_layout_3_xpm, icon_layout_6_xpm }; GtkWidget ** layout_type_buttons = g_malloc (sizeof(GtkWidget*) * LAYOUT_QTY); - int i; + guint i; /* main vertical box */ diff --git a/gtk/layout_prefs.h b/gtk/layout_prefs.h index 3f7e918905..8d53c923f4 100644 --- a/gtk/layout_prefs.h +++ b/gtk/layout_prefs.h @@ -1,7 +1,7 @@ /* layout_prefs.h * Definitions for layout preferences window * - * $Id: layout_prefs.h,v 1.1 2004/04/29 17:03:27 ulfl Exp $ + * $Id: layout_prefs.h,v 1.2 2004/04/30 00:40:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -25,24 +25,6 @@ #ifndef __LAYOUT_PREFS_H__ #define __LAYOUT_PREFS_H__ -typedef enum { - layout_unused, /* entry currently unused */ - layout_type_5, - layout_type_2, - layout_type_1, - layout_type_4, - layout_type_3, - layout_type_6 -} layout_type_e; - -typedef enum { - layout_pane_content_none, - layout_pane_content_plist, - layout_pane_content_pdetails, - layout_pane_content_pbytes -} layout_pane_content_e; - - GtkWidget *layout_prefs_show(void); void layout_prefs_fetch(GtkWidget *w); void layout_prefs_apply(GtkWidget *w); @@ -1,7 +1,7 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c,v 1.129 2004/04/29 17:03:26 ulfl Exp $ + * $Id: prefs.c,v 1.130 2004/04/30 00:40:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -994,9 +994,9 @@ read_prefs(int *gpf_errno_return, int *gpf_read_errno_return, prefs.gui_recent_files_count_max = 10; prefs.gui_fileopen_dir = g_strdup(""); prefs.gui_layout_type = 1; - prefs.gui_layout_content_1 = 0; - prefs.gui_layout_content_2 = 1; - prefs.gui_layout_content_3 = 2; + prefs.gui_layout_content_1 = layout_pane_content_plist; + prefs.gui_layout_content_2 = layout_pane_content_pdetails; + prefs.gui_layout_content_3 = layout_pane_content_pbytes; /* set the default values for the capture dialog box */ prefs.capture_device = NULL; @@ -1,7 +1,7 @@ /* prefs.h * Definitions for preference handling routines * - * $Id: prefs.h,v 1.58 2004/04/29 17:03:26 ulfl Exp $ + * $Id: prefs.h,v 1.59 2004/04/30 00:40:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -66,6 +66,30 @@ char string_to_name_resolve(char *string, guint32 *name_resolve); #define TB_STYLE_TEXT 1 #define TB_STYLE_BOTH 2 +/* + * Types of layout of summary/details/hex panes. + */ +typedef enum { + layout_unused, /* entry currently unused */ + layout_type_5, + layout_type_2, + layout_type_1, + layout_type_4, + layout_type_3, + layout_type_6 +} layout_type_e; + +/* + * Types of pane. + */ +typedef enum { + layout_pane_content_none, + layout_pane_content_plist, + layout_pane_content_pdetails, + layout_pane_content_pbytes +} layout_pane_content_e; + + typedef struct _e_prefs { gint pr_format; gint pr_dest; @@ -93,10 +117,10 @@ typedef struct _e_prefs { guint gui_fileopen_style; guint gui_recent_files_count_max; gchar *gui_fileopen_dir; - gint gui_layout_type; - gint gui_layout_content_1; - gint gui_layout_content_2; - gint gui_layout_content_3; + layout_type_e gui_layout_type; + layout_pane_content_e gui_layout_content_1; + layout_pane_content_e gui_layout_content_2; + layout_pane_content_e gui_layout_content_3; guint32 name_resolve; gint name_resolve_concurrency; gchar *capture_device; |