Commit Graph

402 Commits

Author SHA1 Message Date
Gerald Combs 058dbba4b9 Add support for a "version.conf" file in the main directory which can
be used to adjust version preferences.  It understands two configuration
directives: "enable", which can be 0 or 1, and "format", which can be any
strftime()-compatible string, e.g. "V12-powered on %A %Y-%m-%d %H:%M:%S".

If no configuration file is present, the configuration defaults to

enable: 1
format: CVS %Y%m%d%H%M%S

svn path=/trunk/; revision=10139
2004-02-20 20:36:14 +00:00
Ulf Lamping 6b03887732 minor bugfix from recent check in
svn path=/trunk/; revision=10137
2004-02-20 18:37:00 +00:00
Ulf Lamping ec03b28e12 bugfix: resizing (values from recent) must be done, before the
top_level window is shown, otherwise it has no effect!

svn path=/trunk/; revision=10136
2004-02-20 17:43:50 +00:00
Ulf Lamping fed61823c6 win32 drag-n-drop: corrected handling of UNC filenames "\\host\share\dir..."
svn path=/trunk/; revision=10135
2004-02-20 17:36:37 +00:00
Ulf Lamping d50cbeb79a bugfix: use last_open_dir for the recent file,
instead of the somewhat duplicated value in the recent struct

svn path=/trunk/; revision=10077
2004-02-17 14:49:11 +00:00
Guy Harris 36ece5a17a Add a "window_new()" routine that creates a window of a given type, sets
the title, and arranges to set the icon for it.  Use that instead of
"gtk_window_new()" and separate calls to set the title and arrange to
set the icon.

Regularize #includes a bit.

Clean up white space.

svn path=/trunk/; revision=10054
2004-02-13 00:53:37 +00:00
Guy Harris c5b4dad036 Create only one "About Ethereal" window per process.
svn path=/trunk/; revision=10052
2004-02-13 00:00:25 +00:00
Guy Harris 90cf9a6b7b The HIG's and/or GUI toolkit documentation for:
Mac OS X

	GNOME

	Qt

	KDE

	Windows

all indicate that {message,alert} boxes are modal, at least for the
window to which they apply.  (Presumably the idea is that not forcing
the user to pay attention to the alert box, and allowing more than one
alert box to be up for a given window, causes more problems than not
letting the user do stuff to that window in order to figure out what the
underlying problem is or figure out what to do to fix it - the message
should be sufficient, in most if not all cases, to let you know what the
problem is.)

Make "simple_dialog()" unconditionally make the alert box modal, and get
rid of ESD_TYPE_MODAL.  XXX - we need to make it possible to make an
alert box modal for a given window, rather than just the top-level
window.

svn path=/trunk/; revision=10051
2004-02-12 22:24:28 +00:00
Guy Harris f99bb93e55 Cast "char" values to "guchar" before passing them to <ctype.h> macros,
so that characters with the 8th bit set don't get sign-extended and
cause the macros not to return the right answer.

svn path=/trunk/; revision=10036
2004-02-11 09:19:54 +00:00
Guy Harris 2e4e229739 Get rid of the "Question" alert box type - rename it to "Confirmation",
as that seems to be the name used in the GNOME HIG, at least.  Make it
use the Warning icon (that's what the GNOME HIG says - and it's also
what's used for the equivalent on Windows), and use it for the "Save
current capture?" alert boxes.

svn path=/trunk/; revision=10030
2004-02-11 03:55:48 +00:00
Guy Harris c7fd1b2b13 Add a routine to be used to put up alert boxes for invalid display
filter expressions; use that in a number of places, so we use the same
alert box.  (More work is needed to figure out the right way to handle
some other "dfilter_compile()" failures.)

Use the error message from the display filter as the primary error, as
that's the message that tells you what the underlying problem is.  (The
GNOME HIG says "In most situations the user should only need the primary
text to make a quick decision", so the primary text should tell you
what's wrong with the filter, not just that it's invalid.  If there are
messages from the display filter code that don't give enough
information, or are a bit cryptic, such as "Unexpected end of filter
string," those should be fixed in the display filter code.)

Improve the error used if an empty filter is used for "find frame".

svn path=/trunk/; revision=10025
2004-02-11 00:55:28 +00:00
Jörg Mayer 348c83db8c Fix a few warnings
svn path=/trunk/; revision=9997
2004-02-06 14:59:52 +00:00
Guy Harris 372e6b2da0 Add some comments about the types of alert boxes you get with the
simple_dialog routines (which are really just message box/alert box
routines).

Add some macros for combinations of buttons (corresponding to
combinations that some GUI toolkits, which only support some
combinations, allow).

svn path=/trunk/; revision=9977
2004-02-04 01:10:37 +00:00
Ulf Lamping 1d2c791ab6 enhanced some dialog messages,
close capture file when user told so

svn path=/trunk/; revision=9965
2004-02-03 17:59:01 +00:00
Ulf Lamping 3f2f2929eb added some more info to the statusbar (filesize, packet count, ..),
fixed a minor bug in the cfile handling (file length in summary dialog)

svn path=/trunk/; revision=9961
2004-02-03 00:16:59 +00:00
Guy Harris 7b5e98bf8e Mark the "widget" argument to "main_load_window_geometry()" as unused
when building for GTK+ 1.2[.x].

svn path=/trunk/; revision=9955
2004-02-01 22:43:34 +00:00
Ulf Lamping d11080a09f moved window geometry values from prefs to recent,
added new pref / recent setting: "maximized main window",
which will save, if the main window is maximized or not,
this will take effect on GTK version 2 only, but is saved nonetheless

svn path=/trunk/; revision=9949
2004-02-01 20:28:11 +00:00
Ulf Lamping db13141aab DND: also unescape URI characters (e.g. %20 -> ' ')
svn path=/trunk/; revision=9940
2004-02-01 10:01:19 +00:00
Guy Harris e1e17ea8b2 Konqueror, in KDE 3.0, appears to drop file names of the form
"file:/foo/bar/...", so that only the "file:" should be stripped off.

Note that we should probably look for "file:" followed by an arbitrary
number of "/"s, and, at least on UNIX, strip off all but the last of
those "/"s.

svn path=/trunk/; revision=9932
2004-02-01 02:59:20 +00:00
Ulf Lamping 5b38a022e4 Implemented rudimentary Drag and Drop support.
svn path=/trunk/; revision=9926
2004-01-31 18:32:37 +00:00
Ulf Lamping d244cd82f5 cleanup of new "question dialogs",
using GTK2 primary/secondary message text from GNOME HIG for simple_dialogs,
added a "question dialog" for the coloring rules "Clear" button

svn path=/trunk/; revision=9921
2004-01-31 12:13:23 +00:00
Guy Harris 1980fa5dbf Pass ESD_BTN_OK rather than NULL as a second argument to
"simple_dialog()"; NULL might be #defined to be a pointer expression on
some platforms, causing compiler warnings (and, on platforms where a
null pointer doesn't have all its bits 0, possibly causing misbehavior,
although I don't think there are any such platforms on which Ethereal
runs).

Don't allow 0 as button mask argument to "simple_dialog()".

Squelch a compiler warning.

Report fatal problems as errors, not warnings.

Report file I/O errors with "file_open_error_message()".

Report file write errors (including those reported by "close()", e.g.
some errors writing to an NFS server) when saving raw packet data to a
file.

svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
Ulf Lamping 25edd1c53e renamed ESD_TYPE_CRIT to ESD_TYPE_ERROR to
better reflect the real error text

svn path=/trunk/; revision=9913
2004-01-31 02:25:46 +00:00
Ulf Lamping 3c76ec1aa2 every GUI action, which will erease a currently unsaved capture file,
will now raise a dialog "Save xy before z?" with Yes/No/Cancel buttons.

svn path=/trunk/; revision=9908
2004-01-29 23:11:38 +00:00
Guy Harris a06e94af42 "gtk/main.c" no longer has any code to manage the packet list, so it no
longer needs to define the "column_arrows" structure.

svn path=/trunk/; revision=9894
2004-01-28 09:10:50 +00:00
Ulf Lamping c1a7c24df3 added a tooltip to explain the behaviour of the syntax check in the filter toolbar
svn path=/trunk/; revision=9861
2004-01-26 18:40:44 +00:00
Guy Harris e608fdfda3 In "main_filter_packets()", use the "cf" argument rather than always
passing "&cfile" to "filter_packets()".

Mark the "w" argument to "filter_activate_cb()" as unused.

svn path=/trunk/; revision=9853
2004-01-25 22:20:21 +00:00
Guy Harris d6cd61061e Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors.  Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.

Add messages for cases where those errors were returned without printing
an additional message.

Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.

Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument.  (That handles a lot of the work of putting the info
string into the error message.)

Make some variables in "ascend-grammar.y" static.

Check the return value of "erf_read_header()" in "erf_seek_read()".

Get rid of an unused #define in "i4btrace.c".

svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
Ulf Lamping c890e29a99 apply automatically generated filters strings to the recent dropdown list,
e.g. when applying a "Follow TCP stream",
fix a bug in the recent function, discarding the newest entries when
saving a full list (now discarding the oldest).

svn path=/trunk/; revision=9849
2004-01-25 18:51:26 +00:00
Ulf Lamping 24eb4363ef add syntax check and an "Add Expression" button to the filter toolbar
svn path=/trunk/; revision=9839
2004-01-25 15:10:36 +00:00
Guy Harris 89c529db8e Have "font_apply()" return an indication as to whether it succeeded or
failed and, if it failed, how it failed.  Have it leave up to its caller
the job of reporting that it couldn't load the requested font; have its
callers do that, and have them set the zoom level on failure so that we
have a zoom level that is at least more likely to work.  Make the alert
boxes for "font_apply()" failures be error boxes, not warning boxes.

svn path=/trunk/; revision=9818
2004-01-24 01:02:54 +00:00
Guy Harris 89edd94cb3 Do the font loading code as two larger sections of code, one for GTK+
1.2[.x] and one for GTK+ 2.x, rather than as one section peppered with
#ifdefs.

svn path=/trunk/; revision=9817
2004-01-23 21:22:18 +00:00
Guy Harris b64241c4a6 Include the AddStyleName information in the zoomed font name.
svn path=/trunk/; revision=9816
2004-01-23 20:34:11 +00:00
Guy Harris 32e5a4bdbc If the zoom factor is zero, don't construct a new font name - the
supplied font name is correct.  That lets us handle fonts whose size we
can't change because this is GTK+ 1.2[.x] and the name isn't an XLFD
name so we don't know where the size is.

In "font_zoom()", remove some code from the GTK+ 1.2[.x] vs. GTK+ 2.x
#ifdefs.

Fix the comment for "font_zoom()".

Get rid of a no-longer-used "simple_dialog()" argument.

svn path=/trunk/; revision=9814
2004-01-23 20:11:59 +00:00
Guy Harris d10d0f20f2 Clean up indentation.
Make "font_zoom()" static - it's not used outside gtk/main.c.

Use "g_strdup()" rather than "strdup()", as we use "g_free()" to free
the result.

Put in a little more information when "font_zoom()" fails due to the
font name not being an XLFD font name, and don't continue if it fails.

Don't continue if the attempt to load the fonts fails, either.

svn path=/trunk/; revision=9813
2004-01-23 19:53:10 +00:00
Ulf Lamping 6551f25ee9 fix assert, when failed loading zoomed font,
prepare possibility to put filter toolbar just below the main toolbar

svn path=/trunk/; revision=9807
2004-01-23 16:07:37 +00:00
Ulf Lamping 8e2a930023 implemented dlg_button_row_new to get a standard function for
layouting the dialog buttons, and use it where appropriate.
This will help us with the GTK1/2 conflict on button layouts and
will also result in a more consistent look of the dialogs at all.

svn path=/trunk/; revision=9771
2004-01-21 21:19:34 +00:00
Guy Harris 9c9fd17906 Squelch some compiler warnings.
"font_point_size_l" is a "long", so use "strtol()" to set it (note that
even "strtoul()", for some not-entirely-obvious reason, accepts numbers
starting with a "-" as input - ANSI C requires it!).

svn path=/trunk/; revision=9767
2004-01-21 09:00:48 +00:00
Ulf Lamping 76910636e0 don't try to set font size <= 0
svn path=/trunk/; revision=9762
2004-01-21 03:02:19 +00:00
Ulf Lamping ef57df088f a.) saving GTK1 and GTK2 fontnames in different preference setting, to prevent problems when switching between GTK1 and GTK2 ethereal versions
b.) added new feature "Edit->Go To First Packet" "Edit->Go To Last Packet" with corresponding menu and toolbar items
c.) added new feature "View->Zoom In" / "View->Zoom Out" / View->Normal Size" with corresponding menu and toolbar items
This feature will act as a "size offset" to the current fontsize, so that the packet list/tree view/... will have a larger/smaller font size.
The value is stored inside the recent file.
d.) Win32 only: Try to get the win32 system font and fontsize at program startup and show the menus/dialogs and such with the same font and fontsize like other win32 windows.
This makes the program make a *lot* more feel like a normal win32 program.

svn path=/trunk/; revision=9753
2004-01-20 18:47:25 +00:00
Ulf Lamping 1b852172e2 minor tooltip changes
svn path=/trunk/; revision=9748
2004-01-20 02:26:00 +00:00
Guy Harris d4ab584f0f Move "ts_type_text" out of "epan/timestamp.h into "gtk/recent.c", as
it's only used in the latter; that avoids lots of warnings about
"ts_type_text" being defined but not used in other source files that
include "epan/timestamp.h".  (If it's going to be used in more than one
file, make it non-static and declare it "extern" in "epan/timestamp.h".)

Define TS_NOT_SET as ((ts_type)-1), and use that when initializing
"timestamp_type" in Ethereal and when checking to see whether
"timestamp_type" was set, to avoid signed vs. unsigned comparison
warnings.

Clean up indentation.

svn path=/trunk/; revision=9740
2004-01-19 23:03:20 +00:00
Jörg Mayer da5f6f9472 The current year is 2004
svn path=/trunk/; revision=9731
2004-01-19 18:21:18 +00:00
Ulf Lamping 0353c5823f move timestamp format options from "View->Options" dialog into
menuitems under "View->Time Display Format".
renamed timestamp enum items e.g. from ABSOLUTE to TS_ABSOLUTE,
to prevent conflicting definitions with MSVC

svn path=/trunk/; revision=9729
2004-01-19 03:46:43 +00:00
Ulf Lamping 453309c0c6 added some menuitems "View->Show" including show/hide of all main widgets,
saving the states in the recent file

svn path=/trunk/; revision=9726
2004-01-19 00:42:12 +00:00
Jörg Mayer 5972f31427 Output the result of -h to stdout, not stderr
svn path=/trunk/; revision=9703
2004-01-18 02:19:07 +00:00
Olivier Biot 8db6fb47cd Nice rendering of the CVS version as "(cvs 200401181200003000)".
The make-version.pl script only defines CVSVERSION if this was a build
from CVS.

svn path=/trunk/; revision=9701
2004-01-18 01:41:14 +00:00
Ulf Lamping 59125a7304 no more differences, wether display filter dialog is called from
menu "Analyze->Display Filter" or statusbar "Filter:" button.

svn path=/trunk/; revision=9698
2004-01-18 00:40:39 +00:00
Jörg Mayer 0ac74ed036 In case of CVS sources, add the date of the last change to the version
number.

2do: Add support to Makefile.nmake
     Enforce the generation of cvsversion.h on each run of make

svn path=/trunk/; revision=9679
2004-01-16 20:04:21 +00:00
Guy Harris b97626862e Rename DISSECTOR_HELPER_{SRC,OBJECTS} to
DISSECTOR_SUPPORT_{SRC,OBJECTS}.

Add some additional files, required by dissectors, to those lists.

Extract the stuff to get version information strings for libraries and
the OS, which is *not* needed by dissectors, from "util.c", which
contains routines that *are* needed by dissectors, and put it into a
separate file.

Make "dftest" link only with the dissector support stuff, not with all
of the Ethereal common files.

svn path=/trunk/; revision=9645
2004-01-11 22:17:43 +00:00