Commit graph

71 commits

Author SHA1 Message Date
Ronnie Sahlberg
757e72e177 If not building for gtk 2.4.0, if out a function that is only used when
building for 2.4.0


svn path=/trunk/; revision=23830
2007-12-10 20:40:31 +00:00
Bill Meier
2b73cb3e19 Fix conversions so compiles for both 32-bit and 64-bit
svn path=/trunk/; revision=23826
2007-12-10 18:09:52 +00:00
Bill Meier
df4f2f604e Fix Bug #2055: "File Save not working properly";
Change SVN #23487 patch to not use signal_connect each time the
the function of the save button is changed since that
results in multiple callbacks attached to the save button.
Intead: associate data with the save button which species its
current function.
(It sure would be nice if the original problem causing the 
 blank spot on the toolbar could be resolved; the work-around 
is starting to get messy).

svn path=/trunk/; revision=23821
2007-12-10 03:27:40 +00:00
Ronnie Sahlberg
abb4bc4fae no need to include those xpm's unless we are building for gtk2
svn path=/trunk/; revision=23637
2007-11-28 01:27:07 +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
Stephen Fisher
94af1b4929 Rest of fix for SVN revision 23487. This change also changes the callback
function for the Save/Save As button as necessary.


svn path=/trunk/; revision=23506
2007-11-20 00:34:16 +00:00
Stephen Fisher
64fe05e583 Fix my last commit (23487) to work with GTK 2.4 - 2.11+. I had accidently
used a GTK 2.12+ function in the last commit.


svn path=/trunk/; revision=23488
2007-11-19 04:37:45 +00:00
Stephen Fisher
854790d061 Fix a problem introduced with the GTK 2.4+ Toolbar API whereby the save/
save as button would disappear (leaving a blank spot on the toolbar) after
starting & stopping a capture session more than once.

This fix gets rid of the second save_as_button when using GTK 2.4+ in favor
of converting the stock id / tooltip text of the save_button to that of
the save as button when necessary and reverting it back to just save when
necessary.


svn path=/trunk/; revision=23487
2007-11-19 04:24:00 +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
Stephen Fisher
eae32f15eb Back out part of revision 23395 - leave the toolbar arrow, but remove the
preference to turn it on / off per discussion on -dev list.


svn path=/trunk/; revision=23407
2007-11-09 02:08:00 +00:00
Stephen Fisher
d7c1ba361f Add an arrow with drop-down menu including any toolbar buttons that do not
fit on the top of the screen.  This only works in GTK 2.4+ and there is
a layout preference setting to disable it.


svn path=/trunk/; revision=23395
2007-11-07 21:50:48 +00:00
Stephen Fisher
487abcdf5b Remove empty #if / #endif block
svn path=/trunk/; revision=23283
2007-10-27 05:11:50 +00:00
Jeff Morriss
535f6af89c autoscroll_button is not used if we don't HAVE_LIBPCAP so put it inside the #ifdef
svn path=/trunk/; revision=22589
2007-08-22 18:58:26 +00:00
Jaap Keuter
686c6b394c Damn qqq-bird. ;)
svn path=/trunk/; revision=21551
2007-04-24 06:16:58 +00:00
Ronnie Sahlberg
c1d76f9465 oncly include capture_details_24.xpm IFF we have pcap and if we have gtk>=2 to supress a warning if compiling for gtk 1
svn path=/trunk/; revision=21550
2007-04-24 05:52:01 +00:00
Ulf Lamping
0fcfd360e9 capture interfaces dialog: use capture stock icons instead of plain text buttons
capture info dialog: add a "Help" and use stock buttons

svn path=/trunk/; revision=19020
2006-08-24 21:40:53 +00:00
Tomas Kukosa
62179dd08f eicon3d*.xpm -> wsicon*.xpm
svn path=/trunk/; revision=18309
2006-06-02 05:43: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
c858e7e993 add a help button to the "Follow TCP Stream" dialog (and use standard button row for it too)
svn path=/trunk/; revision=17931
2006-04-20 19:58:50 +00:00
Guy Harris
177dc6902c Skip some toolbar #includes if we're not using GTK+ 2.x.
svn path=/trunk/; revision=16454
2005-11-10 03:00:43 +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
Ulf Lamping
f3407856f4 fix some MSVC const warnings
svn path=/trunk/; revision=15263
2005-08-08 17:22:55 +00:00
Guy Harris
5fb6e97fb4 Squelch more const warnings (and fix some memory leaks that found).
_U_-ify some unused arguments, rather than assigning them to themselves.

Un-constify one variable that gets assigned a mallocated pointer.

Clean up indentation.

svn path=/trunk/; revision=15236
2005-08-06 03:44:55 +00:00
Ulf Lamping
8087f8ccb7 add icons for the "File Set" menu items
svn path=/trunk/; revision=14326
2005-05-07 20:47:39 +00:00
Ulf Lamping
38b423ec6b fix labels of the two toggle toolbar buttons
svn path=/trunk/; revision=14138
2005-04-19 20:53:22 +00:00
Ulf Lamping
f315d0976c add "Decode As" and "Checkbox" (Enabled Protocols) Icons
svn path=/trunk/; revision=14116
2005-04-17 21:38:52 +00:00
Ulf Lamping
3625956f52 disable some toolbar icons, if no capture packets loaded
svn path=/trunk/; revision=14106
2005-04-16 20:39:18 +00:00
Ulf Lamping
83dc83abd8 rename capture_clear() to capture_restart()
statusbar update should work now even in capture error case

svn path=/trunk/; revision=14105
2005-04-16 20:08:00 +00:00
Ulf Lamping
e571cbfa9d add 12 new toolbar/menu icons
add two toolbar toggle buttons
add icons to various menu items

create new Statistics telephony group and put telephony and alike protocols in it

svn path=/trunk/; revision=14098
2005-04-16 10:53:09 +00:00
Ulf Lamping
9718569b63 add some new capture and filter related handcrafted (toolbar) icons
add "new" capture options feature, which will act like old capture start, and change capture start option (for immediately capture)

rename Capture/Clear to Capture/Restart

svn path=/trunk/; revision=14083
2005-04-15 07:41:15 +00:00
Ulf Lamping
854c387c0b add clear toolbar icon (from GTK stock icons)
svn path=/trunk/; revision=14061
2005-04-12 22:55:40 +00:00
Ulf Lamping
7e9cedfed8 capture engine:
add a new feature to clear the currently captured packets and restart the capture with the previous parameters

various code cleanup and minor bugfixes

Win32: use millisecond resolution in capture_loop, to smooth screen update a bit (500ms instead of 1000ms)

svn path=/trunk/; revision=14059
2005-04-12 21:44:55 +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
Ulf Lamping
a309bf0a8a first implementation of the packet history function
svn path=/trunk/; revision=12460
2004-11-01 11:42:08 +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
Guy Harris
0e3e50e1f7 "ethereal_stock_icons()" isn't used outside "gtk/toolbar.c" (and should
presumably only be called once in any case), so make it static.

svn path=/trunk/; revision=12114
2004-09-27 22:32:09 +00:00
Ulf Lamping
bfd6ace52e renamed filter_prefs to filter_dlg, as the filter settings are (well, for a long time) no longer part of the preferences dialog.
svn path=/trunk/; revision=11436
2004-07-19 21:42:01 +00:00
Guy Harris
8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Ulf Lamping
357ebbca5a add a new dialog box to menu "Capture/Interfaces..." to show the current state of the interfaces and a quick way to start a capture.
added the IP address of the currently selected interface to the capture options dialog

svn path=/trunk/; revision=11396
2004-07-17 13:50:07 +00:00
Guy Harris
fd262f1b97 From Daniel Thompson: add additional message/alert box options to
display "Save", "Continue without Saving", and "Cancel", for the "do you
want to save?" messages.

svn path=/trunk/; revision=11372
2004-07-13 07:15:45 +00:00
Ulf Lamping
1b9bef2743 bugfix: init the toolbar's Save icons correctly
svn path=/trunk/; revision=10016
2004-02-09 18:32:41 +00:00
Ulf Lamping
b9cf9aeb0b added a comment
svn path=/trunk/; revision=9808
2004-01-23 16:08:38 +00:00
Ulf Lamping
a0f78e3b8f moved GTK specific parts from capture.c to ui_util.c,
implemented Win32 "Capture Stop" when using
"update list of packets in realtime" while capturing

svn path=/trunk/; revision=9777
2004-01-22 18:13:57 +00:00
Guy Harris
e338b18e4f Don't include some xpm's when built with GTK+ 1.2[.x] - the icons they
define aren't used with 1.2[.x].

svn path=/trunk/; revision=9768
2004-01-21 09:02:09 +00:00
Ulf Lamping
e3dd2f5472 use stock buttons whereever possible,
added some ethereal specific stock icons

svn path=/trunk/; revision=9763
2004-01-21 03:54:32 +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
Guy Harris
618c0e5e8b Get rid of declaration of no-longer-extant routine.
svn path=/trunk/; revision=9750
2004-01-20 02:36:04 +00:00