/* layout_prefs.c
* Dialog box for layout preferences
*
- * $Id: layout_prefs.c,v 1.3 2004/04/30 00:40:45 guy Exp $
+ * $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
#include "globals.h"
#include "layout_prefs.h"
#include "gtkglobals.h"
-/*#include <epan/resolv.h>*/
-#include "prefs.h"
-/*#include "prefs_dlg.h"*/
-/*#include "ui_util.h"*/
+#include <epan/prefs.h>
+#include "prefs_dlg.h"
+#include "gui_utils.h"
#include "main.h"
#include "compat_macros.h"
-/*#include "dlg_utils.h"*/
+#include "dlg_utils.h"
+#include "../ui_util.h"
#include "../image/icon_layout_1.xpm"
#include "../image/icon_layout_2.xpm"
#include "../image/icon_layout_5.xpm"
#include "../image/icon_layout_6.xpm"
-#define LAYOUT_QTY 6
+#define LAYOUT_QTY (layout_type_max - 1)
static void layout_validate_cb(GtkWidget *w _U_, gpointer data);
-
+static gint fetch_enum_value(gpointer control, const enum_val_t *enumvals);
typedef struct {
#define LAYOUT_CONTENT3_VB_KEY "layout_content3_vbox"
-/* be sure to use a parent widget which is already being displayed */
-static GtkWidget *xpm_to_widget(GtkWidget *parent, const char ** xpm) {
-#if GTK_MAJOR_VERSION < 2
- GdkPixmap *icon;
- GdkBitmap * mask;
-
-
- icon = gdk_pixmap_create_from_xpm_d(parent->window, &mask, &parent->style->white, (char **) xpm);
- return gtk_pixmap_new(icon, mask);
-#else
- GdkPixbuf * pixbuf;
- GdkPixmap * pixmap;
- GdkBitmap * bitmap;
-
-
- pixbuf = gdk_pixbuf_new_from_xpm_data(xpm);
- gdk_pixbuf_render_pixmap_and_mask_for_colormap (pixbuf, gtk_widget_get_colormap(parent), &pixmap, &bitmap, 128);
-
- return gtk_image_new_from_pixmap (pixmap, bitmap);
-#endif
-}
-
-
static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, GtkTooltips *tooltips, int i, layout_pane_content_e content) {
GtkWidget *radio_vb, *radio_lb;
GtkWidget *radio_none_rb, *radio_plist_rb, *radio_pdetails_rb, *radio_pbytes_rb;
layout_set(data, &default_layout);
}
+#define SCROLLBAR_PLACEMENT_KEY "scrollbar_placement"
+#if GTK_MAJOR_VERSION < 2
+#define PTREE_LINE_STYLE_KEY "ptree_line_style"
+#define PTREE_EXPANDER_STYLE_KEY "ptree_expander_style"
+#else
+#define ALTERN_COLORS_KEY "altern_colors"
+#endif
+#define HEX_DUMP_HIGHLIGHT_STYLE_KEY "hex_dump_highlight_style"
+#define FILTER_TOOLBAR_PLACEMENT_KEY "filter_toolbar_show_in_statusbar"
+#define GUI_TOOLBAR_STYLE_KEY "toolbar_style"
+#define GUI_WINDOW_TITLE_KEY "window_title"
+
+
+#if GTK_MAJOR_VERSION < 2
+#define GUI_TABLE_ROWS 6
+#else
+#define GUI_TABLE_ROWS 5
+#endif
+
+static const enum_val_t scrollbar_placement_vals[] = {
+ { "FALSE", "Left", FALSE },
+ { "TRUE", "Right", TRUE },
+ { NULL, NULL, 0 }
+};
+#if GTK_MAJOR_VERSION < 2
+static const enum_val_t line_style_vals[] = {
+ { "NONE", "None", 0 },
+ { "SOLID", "Solid", 1 },
+ { "DOTTED", "Dotted", 2 },
+ { "TABBED", "Tabbed", 3 },
+ { NULL, NULL, 0 }
+};
+
+static const enum_val_t expander_style_vals[] = {
+ { "NONE", "None", 0 },
+ { "SQUARE", "Square", 1 },
+ { "TRIANGLE", "Triangle", 2 },
+ { "CIRCULAR", "Circular", 3 },
+ { NULL, NULL, 0 }
+};
+#else
+static const enum_val_t altern_colors_vals[] = {
+ { "FALSE", "No", FALSE },
+ { "TRUE", "Yes", TRUE },
+ { NULL, NULL, 0 }
+};
+#endif
+static const enum_val_t highlight_style_vals[] = {
+ { "FALSE", "Bold", FALSE },
+ { "TRUE", "Inverse", TRUE },
+ { NULL, NULL, 0 }
+};
+static const enum_val_t filter_toolbar_placement_vals[] = {
+ { "FALSE", "Below the main toolbar", FALSE },
+ { "TRUE", "Insert into statusbar", TRUE },
+ { NULL, NULL, 0 }
+};
+static const enum_val_t toolbar_style_vals[] = {
+ { "ICONS", "Icons only", TB_STYLE_ICONS },
+ { "TEXT", "Text only", TB_STYLE_TEXT },
+ { "BOTH", "Icons & Text", TB_STYLE_BOTH },
+ { NULL, NULL, 0 }
+};
GtkWidget*
layout_prefs_show(void)
#if GTK_MAJOR_VERSION < 2
GtkAccelGroup *accel_group;
#endif
- GtkTooltips *tooltips;
GtkWidget *main_vb, *button_hb, *type_tb;
+ GtkWidget *pane_fr, *pane_vb;
GtkWidget *radio_hb, *radio_vb;
GtkWidget *default_vb, *default_bt;
+ GtkWidget *main_tb, *hbox;
+ GtkWidget *scrollbar_om;
+#if GTK_MAJOR_VERSION < 2
+ GtkWidget *expander_style_om, *line_style_om;
+#else
+ GtkWidget *altern_colors_om;
+#endif
+ GtkWidget *highlight_style_om;
+ GtkWidget *toolbar_style_om;
+ GtkWidget *filter_toolbar_placement_om;
+ GtkWidget *window_title_te;
+
+ GtkTooltips *tooltips = gtk_tooltips_new();
const char ** inline_txt [LAYOUT_QTY] = {
icon_layout_5_xpm, icon_layout_2_xpm, icon_layout_1_xpm,
icon_layout_4_xpm, icon_layout_3_xpm, icon_layout_6_xpm };
GtkWidget ** layout_type_buttons = g_malloc (sizeof(GtkWidget*) * LAYOUT_QTY);
- guint i;
+ int pos = 0;
+ int i;
/* main vertical box */
/*gtk_window_add_accel_group(GTK_WINDOW(main_win), accel_group);*/
#endif
- /* Enable tooltips */
- tooltips = gtk_tooltips_new();
+ /* pane frame */
+ pane_fr = gtk_frame_new("Panes");
+ gtk_box_pack_start(GTK_BOX(main_vb), pane_fr, FALSE, FALSE, 0);
+ gtk_widget_show(pane_fr);
+ /* pane vertical box */
+ pane_vb = gtk_vbox_new(FALSE, 7);
+ gtk_container_set_border_width(GTK_CONTAINER(pane_vb), 5);
+ gtk_container_add(GTK_CONTAINER(pane_fr), pane_vb);
+ gtk_widget_show(pane_vb);
/* button hbox */
button_hb = gtk_hbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(button_hb), 6);
- gtk_box_pack_start (GTK_BOX(main_vb), button_hb, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(pane_vb), button_hb, FALSE, FALSE, 0);
/* pane layout */
for (i=0; i<LAYOUT_QTY; ++i)
{
type_tb = gtk_toggle_button_new ();
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(type_tb), (i + 1) == prefs.gui_layout_type);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(type_tb),
+ (layout_type_e)(i + 1) == prefs.gui_layout_type);
- gtk_container_add (GTK_CONTAINER(type_tb), xpm_to_widget(top_level, inline_txt[i]));
+ gtk_container_add (GTK_CONTAINER(type_tb), xpm_to_widget(inline_txt[i]));
SIGNAL_CONNECT(type_tb, "toggled", layout_type_changed_cb, layout_type_buttons);
layout_type_buttons[i] = type_tb;
/* radio hbox */
radio_hb = gtk_hbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(radio_hb), 6);
- gtk_box_pack_start (GTK_BOX(main_vb), radio_hb, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(pane_vb), radio_hb, FALSE, FALSE, 0);
radio_vb = layout_content_radio_vbox(main_vb, tooltips, 1, prefs.gui_layout_content_1);
gtk_container_set_border_width(GTK_CONTAINER(radio_vb), 6);
OBJECT_SET_DATA(main_vb, LAYOUT_CONTENT3_VB_KEY, radio_vb);
default_vb = gtk_vbox_new(FALSE, 0);
- default_bt = gtk_button_new_with_label("Defaults");
- gtk_tooltips_set_tip (tooltips, default_bt, "Reset the pane layout settings to default values.", NULL);
+ default_bt = gtk_button_new_with_label("Default panes");
+ gtk_tooltips_set_tip (tooltips, default_bt,
+ "Reset the pane layout settings to default values.", NULL);
SIGNAL_CONNECT(default_bt, "clicked", layout_defaults_cb, main_vb);
gtk_box_pack_end(GTK_BOX(default_vb), default_bt, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(radio_hb), default_vb, FALSE, FALSE, 0);
+ /* Main horizontal box */
+ /* XXX - Is there a better way to center the table? */
+ hbox = gtk_hbox_new(FALSE, 7);
+ gtk_box_pack_start (GTK_BOX(main_vb), hbox, TRUE, FALSE, 0);
+
+ /* Main table */
+ main_tb = gtk_table_new(GUI_TABLE_ROWS, 2, FALSE);
+ gtk_box_pack_start( GTK_BOX(hbox), 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 );
+
+ /* Scrollbar placement */
+ scrollbar_om = create_preference_option_menu(main_tb, pos++,
+ "Vertical scrollbar placement:", NULL, scrollbar_placement_vals,
+ prefs.gui_scrollbar_on_right);
+ gtk_tooltips_set_tip(tooltips, scrollbar_om,
+ "Select where the vertical scrollbar "
+ "will be displayed in the panes.", NULL);
+ OBJECT_SET_DATA(main_vb, SCROLLBAR_PLACEMENT_KEY, scrollbar_om);
+
+#if GTK_MAJOR_VERSION < 2
+ /* Tree line style */
+ line_style_om = create_preference_option_menu(main_tb, pos++,
+ "Tree line style:", NULL, line_style_vals,
+ prefs.gui_ptree_line_style);
+ gtk_tooltips_set_tip(tooltips, line_style_om,
+ "Select the style in which trees "
+ "will be displayed in the packet "
+ "detail pane.", NULL);
+ OBJECT_SET_DATA(main_vb, PTREE_LINE_STYLE_KEY, line_style_om);
+
+ /* Tree expander style */
+ expander_style_om = create_preference_option_menu(main_tb, pos++,
+ "Tree expander style:", NULL, expander_style_vals,
+ prefs.gui_ptree_expander_style);
+ gtk_tooltips_set_tip(tooltips, expander_style_om,
+ "Select the style in which the "
+ "expander will be displayed in "
+ "the panes displayed.", NULL);
+ OBJECT_SET_DATA(main_vb, PTREE_EXPANDER_STYLE_KEY, expander_style_om);
+#else
+ /* Alternating row colors in list and tree views */
+ altern_colors_om = create_preference_option_menu(main_tb, pos++,
+ "Alternating row colors in lists and trees:", NULL,
+ altern_colors_vals, prefs.gui_altern_colors);
+ gtk_tooltips_set_tip(tooltips, altern_colors_om,
+ "Select whether or not the rows of "
+ "lists and trees have alternating color.", NULL);
+ OBJECT_SET_DATA(main_vb, ALTERN_COLORS_KEY, altern_colors_om);
+#endif
+
+ /* Hex Dump highlight style */
+ highlight_style_om = create_preference_option_menu(main_tb, pos++,
+ "Hex display highlight style:", NULL, highlight_style_vals,
+ prefs.gui_hex_dump_highlight_style);
+ gtk_tooltips_set_tip(tooltips, highlight_style_om,
+ "Select the style in which the "
+ "hex dump will be displayed.", NULL);
+ OBJECT_SET_DATA(main_vb, HEX_DUMP_HIGHLIGHT_STYLE_KEY, highlight_style_om);
+
+ /* Toolbar prefs */
+ toolbar_style_om = create_preference_option_menu(main_tb, pos++,
+ "Toolbar style:", NULL, toolbar_style_vals,
+ prefs.gui_toolbar_main_style);
+ gtk_tooltips_set_tip(tooltips, toolbar_style_om,
+ "Select the style in which the "
+ "toolbar will be displayed.", NULL);
+ OBJECT_SET_DATA(main_vb, GUI_TOOLBAR_STYLE_KEY, toolbar_style_om);
+
+ /* Placement of Filter toolbar */
+ filter_toolbar_placement_om = create_preference_option_menu(main_tb, pos++,
+ "Filter toolbar placement:", NULL,
+ filter_toolbar_placement_vals, prefs.filter_toolbar_show_in_statusbar);
+ gtk_tooltips_set_tip(tooltips, filter_toolbar_placement_om,
+ "Select where the filter "
+ "toolbar will be displayed." , NULL);
+ OBJECT_SET_DATA(main_vb, FILTER_TOOLBAR_PLACEMENT_KEY, filter_toolbar_placement_om);
+
+ /* Window title */
+ window_title_te = create_preference_entry(main_tb, pos++,
+ "Custom window title (prepended to existing titles):",
+ NULL, prefs.gui_window_title);
+ gtk_entry_set_text(GTK_ENTRY(window_title_te), prefs.gui_window_title);
+ gtk_tooltips_set_tip(tooltips, window_title_te,
+ "Enter the text to be prepended to the "
+ "window title.", NULL);
+ OBJECT_SET_DATA(main_vb, GUI_WINDOW_TITLE_KEY, window_title_te);
+
/* Show 'em what we got */
gtk_widget_show_all(main_vb);
return(main_vb);
}
+static gint
+fetch_enum_value(gpointer control, const enum_val_t *enumvals)
+{
+ return fetch_preference_option_menu_val(GTK_WIDGET(control), enumvals);
+}
+
void
layout_prefs_fetch(GtkWidget *w)
{
prefs.gui_layout_content_1 = layout_fetched.content[0];
prefs.gui_layout_content_2 = layout_fetched.content[1];
prefs.gui_layout_content_3 = layout_fetched.content[2];
+
+ prefs.gui_scrollbar_on_right = fetch_enum_value(
+ OBJECT_GET_DATA(w, SCROLLBAR_PLACEMENT_KEY),
+ scrollbar_placement_vals);
+
+#if GTK_MAJOR_VERSION < 2
+ prefs.gui_ptree_line_style = fetch_enum_value(
+ OBJECT_GET_DATA(w, PTREE_LINE_STYLE_KEY), line_style_vals);
+ prefs.gui_ptree_expander_style = fetch_enum_value(
+ OBJECT_GET_DATA(w, PTREE_EXPANDER_STYLE_KEY), expander_style_vals);
+#else
+ prefs.gui_altern_colors = fetch_enum_value(
+ OBJECT_GET_DATA(w, ALTERN_COLORS_KEY), altern_colors_vals);
+#endif
+ prefs.filter_toolbar_show_in_statusbar = fetch_enum_value(
+ OBJECT_GET_DATA(w, FILTER_TOOLBAR_PLACEMENT_KEY), filter_toolbar_placement_vals);
+ prefs.gui_hex_dump_highlight_style = fetch_enum_value(
+ OBJECT_GET_DATA(w, HEX_DUMP_HIGHLIGHT_STYLE_KEY), highlight_style_vals);
+ prefs.gui_toolbar_main_style = fetch_enum_value(
+ OBJECT_GET_DATA(w, GUI_TOOLBAR_STYLE_KEY), toolbar_style_vals);
+
+ if (prefs.gui_window_title != NULL)
+ g_free(prefs.gui_window_title);
+ prefs.gui_window_title = g_strdup(gtk_entry_get_text(
+ GTK_ENTRY(OBJECT_GET_DATA(w, GUI_WINDOW_TITLE_KEY))));
}
void
layout_prefs_apply(GtkWidget *w _U_)
{
+ update_main_window_name();
main_widgets_rearrange();
}
git.samba.org / obnox / wireshark / wip.git / blobdiff