Commit Graph

107 Commits

Author SHA1 Message Date
Bill Meier 7b01915b6b Fix various gcc -Wshadow warnings.
svn path=/trunk/; revision=31730
2010-01-29 16:13:26 +00:00
Stig Bjørlykke 0dbfde8b6d Removed some unused variables and unused assignments.
svn path=/trunk/; revision=30918
2009-11-10 12:05:25 +00:00
Stig Bjørlykke 64fb3eb496 Small indent fix.
svn path=/trunk/; revision=30102
2009-09-23 18:36:50 +00:00
Anders Broman 012a6c12e4 Adding new color rules should work now.
svn path=/trunk/; revision=29672
2009-09-02 17:52:14 +00:00
Anders Broman 1858d86612 Prepare abillity to add color filters with new packet list.
(Packets not recolored yet).

svn path=/trunk/; revision=29664
2009-09-02 15:07:03 +00:00
Stephen Fisher e6d0686f7b Introduce experimental new feature: GTK2 tree view based packet list
To use the GTK2 based packet list, define NEW_PACKET_LIST when compiling.
To do this with gcc, set the environment variable CPPFLAGS to
"-DNEW_PACKET_LIST" and re-run configure.

Many features do not yet work.  This work began with prototypes by Ulf
quite a while back.  I've put quite a bit of work into this so far and
as discussed with a few of the core team members at Sharkfest09 and it was
decided that it would be best to commit what I have so far to allow others to
help work on this.


svn path=/trunk/; revision=28892
2009-06-30 18:05:04 +00:00
Guy Harris 54c159cb41 Turn on -Wshorten-64-to-32 by default, and fix some issues that turned
up (99 44/100% of which were assignments of double-precision
floating-point constants to floats).  Hopefully this will catch at least
some P64 issues on UN*X.

svn path=/trunk/; revision=28108
2009-04-21 16:57:52 +00:00
Bill Meier a34a055c17 color filters dialog: Remove use of deprecated gtk_button_box_set_child_size().
Also:
 - Handle buttons in the several vboxes in a consistent manner;
 - Use consistent indentation;
 - Fix some spelling in comments.

svn path=/trunk/; revision=28029
2009-04-10 17:34:30 +00:00
Bill Meier 27024a1d5a As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places;
svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
Anders Broman 830f6a59a3 Indentation changes.
svn path=/trunk/; revision=27479
2009-02-18 06:42:35 +00:00
Stig Bjørlykke 860028c634 Removed the usage of topic_available() as we now have all topics.
svn path=/trunk/; revision=25505
2008-06-21 13:36:31 +00:00
Ulf Lamping ed7018b6e4 flip the import and export button "sequence", that the import button comes first. So we have the same sequence as the usual open/save menu.
svn path=/trunk/; revision=25076
2008-04-16 09:57:21 +00:00
Sake Blok a287b0f3f5 From Jim Young (bug 2212):
Add the profile name to the title of all the configuration windows.
(this is a rewrite of Jim's patch)


svn path=/trunk/; revision=25016
2008-04-14 15:01:34 +00:00
Ulf Lamping 38c4ebeb4a move all code from color.c into color_utils.c
remove color.c
rename colors.h into color_utils.h (hopefully this reduces confusion to /color.h)

svn path=/trunk/; revision=24974
2008-04-13 12:41:22 +00:00
Ulf Lamping 0b97c4211e sort #includes by directories
svn path=/trunk/; revision=24967
2008-04-13 00:55:59 +00:00
Ulf Lamping b4f3c5fd40 compat_macros.h is gone now!!!
all GTK1 compatibility code was removed, so this file can simply be dropped

svn path=/trunk/; revision=24923
2008-04-12 01:41:53 +00:00
Ulf Lamping 55c2be83db move stock icon code from toolbar.c into specific stock_icons file(s)
svn path=/trunk/; revision=24921
2008-04-12 00:49:20 +00:00
Ulf Lamping 9af9a0e619 first round to replace SIGNAL_CONNECT with g_signal_connect
This requires some casts to be added and I just don't want to add casts at all possible places. So I compile and only add casts where the (MSVC) compiler has a hard time. 

Unfortunately this won't find any problems in Linux/Unix only code - I'll keep an eye on the buildbot and try to fix things as I'm going on ...

svn path=/trunk/; revision=24912
2008-04-11 21:20:51 +00:00
Ulf Lamping ae5f841083 replace all appearances of BUTTON_NEW_FROM_STOCK with GTK2's gtk_button_new_from_stock
svn path=/trunk/; revision=24904
2008-04-11 18:58:19 +00:00
Bill Meier 42acebd42c OBECT_..._DATA --> g_object_..._data
svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
Ulf Lamping 74ea542da0 remove GTK1 code
svn path=/trunk/; revision=24813
2008-04-06 22:50:12 +00:00
Sake Blok db2f6ce546 Fixes crashing when opening color filters and pressing OK
(introduced in SVN 23560)


svn path=/trunk/; revision=23582
2007-11-25 12:36:33 +00:00
Sake Blok 9b6f806089 This patch adds (ten) temporary coloring rules which will only live until Wireshark is
quit. Temporary coloring filters can be set by:

- pressing <ctrl>-<digit> will create a conversation coloring filter based on the
  addresses of the currently selected packet (order TCP/UDP/IP/Ethernet)
  This can also be achieved from the "View|Colorize Conversation" menu.

- Rightclicking on a packet in the packet-list will give the option to
  "Colorize Conversation" just as "Conversation Filter" does.

- Rightclicking on an item in the packet-detail-list will give the option to
  "Colorize with filter" which works similar to "Apply as filter"

Temporary filters can be cleared from the same menus or by pressing <ctrl>-<space>.

This patch also adds an item to the above mentioned menu's to add a permanent color filter
in the same way.


The colors for the temporary coloring rules are now hardcoded as I do not know
how to change the color of menu-items and therefore I chose to use icons to
show the actual color of each of the ten temporary coloring rules. Is it at all
possible to have different menu items in different colors?

One other way of solving this is to recreate the icons on the fly after changing
the colors. I will have a look into that once it is clear whether I can use 
different colors within the menu structure.


svn path=/trunk/; revision=23560
2007-11-24 11:38:16 +00:00
Sake Blok de5a407bbb Open the coloring rule edit dialog when the coloring rule is
double-clicked.


svn path=/trunk/; revision=23427
2007-11-11 00:59:19 +00:00
Sake Blok adefd3367c Make the enable/disable buttons on the coloring rule list follow
the selection. There is a little difference between the behaviour
in GTK1 and GTK2 (As long as either one row or a block of rows with 
the same status is selected, GTK1 and GTK2 behave the same way):

GTK1:
- if the last selected row is disabled, grey out the disable button
- if the last selected row is enabled, grey out the enable button

GTK2:
- grey out both buttons when no rule is selected
- grey out the enable button when *all* selected rules are enabled
- grey out the disable button when *all* selected rules are disabled
- leave both buttons active if there is a mix of disabled and enabled
  rules



svn path=/trunk/; revision=23426
2007-11-10 23:05:35 +00:00
Sake Blok 508e268063 This patch makes it possible to disable individual coloring rules
without having to delete them. The patch has been tested on
Fedora-7 with GTK+ 1.2.10 and GTK+ 2.10.11.

Since I don't know how to use "strikethrough" in clists in GTK1
there is a little difference in how the disabled coloring rules
are displayed. In GTK2 they are striked through and in GTK1
they are shown in lightgrey on a white background.

Any info on how to use strikthrough in clists within GTK1 is more
than welcome :-)


svn path=/trunk/; revision=23421
2007-11-10 15:18:49 +00:00
Gerald Combs f7c4b26cb4 In newer versions of GTK+ 2.x, if you have the mouse positioned above a
button that goes from insensitive to sensitive, the button won't respond
to mouse clicks.

This caused the Coloring Rules dialog behavior reported in bug 699.  Work 
around it by not making the up/down buttons insensitive while we're moving
a rule.

Fixup whitespace.

svn path=/trunk/; revision=22946
2007-09-25 05:12:44 +00:00
Guy Harris 1873df7b1e Get rid of declarations of functions that are no longer defined or used
in this file.

svn path=/trunk/; revision=19476
2006-10-10 08:13:16 +00:00
Ulf Lamping 57be028caf As Stephen Fisher noted, the Apply button should also save the changed settings (if the Save button is disabled)
svn path=/trunk/; revision=19418
2006-10-03 21:03:08 +00:00
Ulf Lamping 1468c0b253 fix a bug in the export function
svn path=/trunk/; revision=19417
2006-10-03 20:11:08 +00:00
Ulf Lamping cdb57f37a2 now: Don't have a Save button in the following settings dialogs:
- Edit/Preferences
- View/Coloring Rules
- Capture/Capture Filters
- Analyze/Display Filters
- Analyze/Enabled Protocols

The settings will be automatically saved when pressing the Ok button.

If someone really wants the explicit Save buttons as before - you can get them back at the Edit/Preferences/User Interface page.

svn path=/trunk/; revision=19415
2006-10-03 19:53:10 +00:00
Ulf Lamping 9e6c7b11ae Implement a real "Cancel" button for the coloring rules dialog - this was a hard one! It seems to be working without bugs and as designed now.
As this was a huge internal change, new bugs are very probable - please report.

The implementation isn't still perfect, a new dialog internal list could possibly be removed again. 

However, I want to check in at this condition, just in case I make things worse - again.

svn path=/trunk/; revision=19413
2006-10-03 18:39:36 +00:00
Ulf Lamping 59d206d18e further code cleanup: don't use the term "marked" for the color filters, the right term is "selected". That caused me "concerns" wether the marked feature of the packet list was involved - which is actually not
svn path=/trunk/; revision=19399
2006-10-02 23:01:33 +00:00
Ulf Lamping 589b473e41 various (huge) code cleanup incl. splitting of the coloring dialog and the actual color rule edit dialog into two files - this makes the things much more clearer now (at least for me)
svn path=/trunk/; revision=19392
2006-10-02 00:13:14 +00:00
Ulf Lamping 905b6b7d12 ugly workaround for bug #699 (Up/Down buttons don't work properly)
After experimenting a bit, this is a GTK bug IMHO, I don't see a better way to simply use the GTK1.x code for now, which is working ok.

GTK2.4 was working properly, GTK2.6 and 2.8 has this bug, hopefully GTK2.10 will fix it again.

svn path=/trunk/; revision=19025
2006-08-25 08:04:38 +00:00
Anders Broman 05448fcc3d Ethereal->Wireshark
svn path=/trunk/; revision=18232
2006-05-28 17:19:08 +00:00
Guy Harris 92552c2d76 Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI
strings, and function names.

svn path=/trunk/; revision=18205
2006-05-22 07:29:40 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Guy Harris 0ce9a23b25 Most of the stuff in file_dlg.c is specific to capture files, so rename
it to capture_file_dlg.c, and rename its header file.  We might want to
move the generic file dialog stuff to a file_dlg.c file (it's currently
in dlg_utils.c), and move the non-capture-file dialog stuff in
capture_file_dlg.c to another file.

svn path=/trunk/; revision=18034
2006-04-29 23:03:57 +00:00
Ulf Lamping eafbbbcabb renamed ui_util.c/.h to gui_utils.c/.h to prevent confusion with identical named ui_util.h in / dir
svn path=/trunk/; revision=15465
2005-08-20 12:09:48 +00:00
Ulf Lamping d28861b607 removed tons of MSVC const related warnings.
This might at some places interfere with the changes for gcc4, we might have to negotiate in that case :-)

Please note that a lot of these warnings were GTK1.x related only!

svn path=/trunk/; revision=15286
2005-08-10 19:49:45 +00:00
Jörg Mayer 4e1f4b18ab More char -> const char warning fixes.
Removed (very few) casts that only change the warning message
  but don't remove it (with gcc-4).

svn path=/trunk/; revision=15227
2005-08-05 20:59:08 +00:00
Jörg Mayer e9ea42eed9 Fix more "no previous declaration" warnings
svn path=/trunk/; revision=15173
2005-08-02 04:47:15 +00:00
Ulf Lamping ccff84dbdf code cleanup: use common prefix for all functions in color_filters.h
svn path=/trunk/; revision=13910
2005-03-26 01:09:14 +00:00
Ulf Lamping 008d4b8106 code cleanup: the term filter_list was used with different meanings throughout the code, and the filter_list of the color_filters is "global".
use appropriate prefixes to avoid confusion and bugs

svn path=/trunk/; revision=13905
2005-03-25 22:52:45 +00:00
Guy Harris b598c79446 GtkStyles are reference-counted, and a style returned by
"gtk_style_copy()" has a reference count of 1; release the reference
when we're finished setting other widgets' styles to it.

svn path=/trunk/; revision=13890
2005-03-24 03:58:38 +00:00
Ulf Lamping 0861927ce3 huge cleanup of capture file API (functions in file.c/file.h).
This includes: all functions in file.h now have a cf_ prefix, will have doxygen tags, will have the capture_file *cf as the first parameter and I tried to generalize the return values for non trivial functions.

Hopefully, I didn't introduced any new bugs, as I had to change a lot of files...

svn path=/trunk/; revision=13289
2005-02-04 18:44:44 +00:00
Ulf Lamping 66ce7f3623 add some more online help functionality and help buttons at various dialog boxes, if a help page *is* available. However, the new help system needs a lot more work before completed.
svn path=/trunk/; revision=13152
2005-01-20 23:17:23 +00:00
Guy Harris f1deabed56 Make the tone of the error messages a bit less formal, by using
contractions.  (Safari does, at least when you're trying to open a file
to which you don't have read access.)

svn path=/trunk/; revision=12852
2004-12-29 01:08:20 +00:00
Guy Harris bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00