Split the color manipulation stuff into "color_dlg.[ch]", containing the

dialog boxes for editing color filtes, and "colors.[ch]", containing the
toolkit-dependent code to manipulate colors.

svn path=/trunk/; revision=1622
This commit is contained in:
Guy Harris 2000-02-12 08:31:49 +00:00
parent c80a7fd1d5
commit 55c8a368b8
6 changed files with 1163 additions and 1088 deletions

View File

@ -1,7 +1,7 @@
# Makefile.am
# Automake file for the GTK interface routines for Ethereal
#
# $Id: Makefile.am,v 1.23 2000/02/12 08:15:30 guy Exp $
# $Id: Makefile.am,v 1.24 2000/02/12 08:31:45 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@ -31,6 +31,8 @@ CLEANFILES = \
libui_a_SOURCES = \
capture_dlg.c \
capture_dlg.h \
color_dlg.c \
color_dlg.h \
colors.c \
colors.h \
column_prefs.c \

1116
gtk/color_dlg.c Normal file

File diff suppressed because it is too large Load Diff

31
gtk/color_dlg.h Normal file
View File

@ -0,0 +1,31 @@
/* color_dlg.h
* Definitions for dialog boxes for color filters
*
* $Id: color_dlg.h,v 1.1 2000/02/12 08:31:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* 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
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
*/
#ifndef __COLOR_DLG_H__
#define __COLOR_DLG_H__
void color_display_cb(GtkWidget *w, gpointer d);
#endif /* color_dlg.h */

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
/* colors.h
* Definitions for color structures and routines
*
* $Id: colors.h,v 1.1 2000/02/12 08:15:31 guy Exp $
* $Id: colors.h,v 1.2 2000/02/12 08:31:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -64,10 +64,12 @@ typedef struct _colfilter {
colfilter *colfilter_new(void);
/* ===================== USER INTERFACE ====================== */
gboolean write_filters(colfilter *filter);
void
color_display_cb(GtkWidget *w, gpointer d);
color_filter_t *new_color_filter(colfilter *filters, gchar *name,
gchar *filter_string);
void delete_color_filter(color_filter_t *colorf);
gboolean get_color (GdkColor *new_color);
#endif

View File

@ -1,7 +1,7 @@
/* menu.c
* Menu routines
*
* $Id: menu.c,v 1.23 2000/02/12 06:58:42 guy Exp $
* $Id: menu.c,v 1.24 2000/02/12 08:31:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -43,6 +43,7 @@
#include "menu.h"
#include "packet.h"
#include "capture_dlg.h"
#include "color_dlg.h"
#include "file_dlg.h"
#include "filter_prefs.h"
#include "find_dlg.h"
@ -52,7 +53,6 @@
#include "prefs_dlg.h"
#include "print.h"
#include "follow.h"
#include "colors.h"
#include "keys.h"
#include "plugins.h"