Add stream window color preferences. We don't (yet) use cmaps, so this

may not work with pseudocolor systems.

svn path=/trunk/; revision=1179

1 files changed, 15 insertions, 9 deletions

diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 40e9891f7b..a3bd6250fd 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.2 1999/09/10 06:53:31 guy Exp $
+ * $Id: prefs_dlg.c,v 1.3 1999/12/02 04:30:15 gerald Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -52,6 +52,7 @@
 #include "prefs_dlg.h"
 #include "print_prefs.h"
 #include "filter_prefs.h"
+#include "stream_prefs.h"
 #include "util.h"
 
 e_prefs prefs;
@@ -65,12 +66,13 @@ static gboolean prefs_main_delete_cb(GtkWidget *, gpointer);
 #define E_PRINT_PAGE_KEY  "printer_options_page"
 #define E_FILTER_PAGE_KEY "filter_options_page"
 #define E_COLUMN_PAGE_KEY "column_options_page"
+#define E_STREAM_PAGE_KEY "tcp_stream_options_page"
 
 void
 prefs_cb(GtkWidget *w, gpointer sp) {
   GtkWidget *prefs_w, *main_vb, *top_hb, *bbox, *prefs_nb,
             *ok_bt, *save_bt, *cancel_bt;
-  GtkWidget *print_pg, *filter_pg, *column_pg, *filter_te, *label;
+  GtkWidget *print_pg, *filter_pg, *column_pg, *stream_pg, *filter_te, *label;
 
 /*  GtkWidget *nlabel; */
   gint       start_page = (gint) sp;
@@ -98,13 +100,6 @@ prefs_cb(GtkWidget *w, gpointer sp) {
   gtk_container_add(GTK_CONTAINER(main_vb), prefs_nb);
   gtk_widget_show(prefs_nb);
   
-  /* General prefs */
-/*   nlabel = gtk_label_new("Nothing here yet...");
-  gtk_widget_show (nlabel);
-
-  label = gtk_label_new ("General");
-  gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), nlabel, label);
- */  
   /* Printing prefs */
   print_pg = printer_prefs_show();
   gtk_object_set_data(GTK_OBJECT(prefs_w), E_PRINT_PAGE_KEY, print_pg);
@@ -121,12 +116,19 @@ prefs_cb(GtkWidget *w, gpointer sp) {
   gtk_object_set_data(GTK_OBJECT(prefs_w), E_FILTER_PAGE_KEY, filter_pg);
   label = gtk_label_new ("Filters");
   gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), filter_pg, label);
+
   /* Column prefs */
   column_pg = column_prefs_show();
   gtk_object_set_data(GTK_OBJECT(prefs_w), E_COLUMN_PAGE_KEY, column_pg);
   label = gtk_label_new ("Columns");
   gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), column_pg, label);
   
+  /* Column prefs */
+  stream_pg = stream_prefs_show();
+  gtk_object_set_data(GTK_OBJECT(prefs_w), E_STREAM_PAGE_KEY, stream_pg);
+  label = gtk_label_new ("TCP Streams");
+  gtk_notebook_append_page (GTK_NOTEBOOK(prefs_nb), stream_pg, label);
+
   /* Jump to the specified page, if it was supplied */
   if (start_page > E_PR_PG_NONE)
     gtk_notebook_set_page(GTK_NOTEBOOK(prefs_nb), start_page);
@@ -169,6 +171,7 @@ prefs_main_ok_cb(GtkWidget *ok_bt, gpointer parent_w)
   printer_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
   filter_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
   column_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
+  stream_prefs_ok(gtk_object_get_data(GTK_OBJECT(parent_w), E_STREAM_PAGE_KEY));
   gtk_widget_destroy(GTK_WIDGET(parent_w));
 }
 
@@ -178,6 +181,7 @@ prefs_main_save_cb(GtkWidget *save_bt, gpointer parent_w)
   printer_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
   filter_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
   column_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
+  stream_prefs_save(gtk_object_get_data(GTK_OBJECT(parent_w), E_STREAM_PAGE_KEY));
   write_prefs();
 }
 
@@ -187,6 +191,7 @@ prefs_main_cancel_cb(GtkWidget *cancel_bt, gpointer parent_w)
   printer_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_PRINT_PAGE_KEY));
   filter_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_FILTER_PAGE_KEY));
   column_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_COLUMN_PAGE_KEY));
+  stream_prefs_cancel(gtk_object_get_data(GTK_OBJECT(parent_w), E_STREAM_PAGE_KEY));
   gtk_widget_destroy(GTK_WIDGET(parent_w));
 }
 
@@ -196,5 +201,6 @@ prefs_main_delete_cb(GtkWidget *prefs_w, gpointer dummy)
   printer_prefs_delete(gtk_object_get_data(GTK_OBJECT(prefs_w), E_PRINT_PAGE_KEY));
   filter_prefs_delete(gtk_object_get_data(GTK_OBJECT(prefs_w), E_FILTER_PAGE_KEY));
   column_prefs_delete(gtk_object_get_data(GTK_OBJECT(prefs_w), E_COLUMN_PAGE_KEY));
+  stream_prefs_delete(gtk_object_get_data(GTK_OBJECT(prefs_w), E_STREAM_PAGE_KEY));
   return FALSE;
 }