Commit graph

260 commits

Author SHA1 Message Date
Gerald Combs
f40586fbaa The merge dialog should probably say "Read filter" as well.
svn path=/trunk/; revision=48267
2013-03-12 20:23:02 +00:00
Chris Maynard
67d195080b Change "Display filter:" to "Read filter:". They are not the same.
#BACKPORT(1.8, 1.6) 

svn path=/trunk/; revision=48047
2013-03-04 06:58:40 +00:00
Gerald Combs
1c0deb0fc8 Add Filter Expressions^WButton^WShortcut^WBookmark preferences.
Add comments noting that

- We might want to do something different when the bookmark button is
  pressed.
- The display filters (dfilters file) and gui.filter_expressions
  preferences should be merged.
- Many buttons on Qt4 + OS X + unifiedTitleAndToolBarOnMac makes the
  main window really wide.

Add a qstring_strdup convenience routine. Add "disabled" display filter
edit icons. Fix up whitespace and descriptions in a couple of places.

svn path=/trunk/; revision=47522
2013-02-06 18:22:54 +00:00
Gerald Combs
6ef1fc5002 GTK+:
Get rid of user-hostile behavior. In the layout preferences pane 2 & 3
radio buttons overrode the user's selection if a duplicate item was
selected. Now we assume that the user knows what he or she is doing and
steal duplicate selections from the other panes.

Qt:

Match the new GTK+ behavior in the layout preferences. Add padding
around the layout images. Add toolbar style preferences to the
Appearance pane (instead of the layout pane).

All:

Remove the selection mode and scrollbar placement prefs and mark them
obsolete as recently discussed on -dev.

Adjust the layout images yet again after more Awful Monitor Testing.

svn path=/trunk/; revision=47214
2013-01-22 18:27:18 +00:00
Gerald Combs
5fcf513161 Add an initial layout preference pane. Set SVN properties.
svn path=/trunk/; revision=47190
2013-01-21 05:29:14 +00:00
Gerald Combs
3f3040b345 Increase the background opacity.
svn path=/trunk/; revision=47189
2013-01-21 02:47:32 +00:00
Gerald Combs
3d280a8c95 Replace more XPMs with PNGs.
svn path=/trunk/; revision=47159
2013-01-19 05:48:43 +00:00
Gerald Combs
f35d5f15f4 Add "+", "-", and "copy" images. Document their origins.
svn path=/trunk/; revision=46807
2012-12-27 17:09:15 +00:00
Gerald Combs
07898cae39 Create 16x16 and 24x24 versions of the document icon with a contrasting
border. Add them as pixbufs to ui/gtk/toolbar_icons.h and use them to
replace the file icon XPM in stock_icons.c. Add modelines.

svn path=/trunk/; revision=46413
2012-12-05 22:28:12 +00:00
Gerald Combs
c0c7a64d71 Replace GTK_STOCK_SAVE with WIRESHARK_STOCK_FILE in a few places,
including the GTK+ and Qt main toolbars.

svn path=/trunk/; revision=46374
2012-12-04 18:00:50 +00:00
Bill Meier
696ea123be Remove svn:executable property
svn path=/trunk/; revision=45593
2012-10-16 19:32:23 +00:00
Gerald Combs
3c1ceabb9d Fix the layout of the "Export Dissected Packets" template and tweak a
few other layouts.

svn path=/trunk/; revision=45434
2012-10-09 17:52:38 +00:00
Gerald Combs
b28da10eec Fix Qt compilation on Windows. Check the user-supplied range syntax
and provide instant feedback in the Win32 file dialog similar to the Qt
code. Tango-ize some colors. Escape a backslash in QtShark.pro.

svn path=/trunk/; revision=45430
2012-10-09 15:34:40 +00:00
Gerald Combs
bcd2cea774 Unify the GTK+ and Win32 versions of "Export Specified Packets". Add a
shared "file_add_extension" routine. We no longer support _MSC_VER <
1400 so get rid of some clutter. Add a gzip checkbox to the Win32 export
packets dialog. Windows code hasn't yet been tested (and is likely
broken). I'll fix it shortly.

svn path=/trunk/; revision=45296
2012-10-03 19:24:14 +00:00
Gerald Combs
3d21e8fdec Adjust the size and location of the "Export Specified Packets" template.
svn path=/trunk/; revision=45271
2012-10-02 21:37:25 +00:00
Martin Mathieson
5a10de0446 Add reordercap to this makefile too.
svn path=/trunk/; revision=45094
2012-09-24 11:25:40 +00:00
Martin Mathieson
60fb63783a From Jim Young, bug 7745.
Add Makefile support for reordercap.

svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
Gerald Combs
3e05236eff Add gzip support to the Win32 "Save As" dialog. Don't crash in the Win32
merge dialog if we cancel. Adjust the size and location of the controls
in the Win32 open and merge file templates.

svn path=/trunk/; revision=45014
2012-09-19 23:06:39 +00:00
Alexis La Goutte
94cbe0ce2c Add Q&A icon for qtshark
svn path=/trunk/; revision=44713
2012-08-31 12:11:44 +00:00
Alexis La Goutte
f332f4b78d Add icon for Q&A (Ask)
The same (fav)icon of Ask Website

svn path=/trunk/; revision=44712
2012-08-31 12:04:35 +00:00
Gerald Combs
dd49262089 Add larger sizes to try to make Windows 8 happy.
svn path=/trunk/; revision=44618
2012-08-22 23:33:43 +00:00
Irene Rüngeler
9fb3d27bee Add green bullet to indicate success.
svn path=/trunk/; revision=44378
2012-08-09 13:23:47 +00:00
Alexis La Goutte
ca5f417aa0 Add icon to Help Menu (Help, Wiki, About)
(Not found a Home icon for Website in Qt framework...)

Add also F1 shortcut for contents and access key

svn path=/trunk/; revision=44166
2012-07-31 20:34:14 +00:00
Gerald Combs
d44f940aaf Add an expert level indicator. Move a bunch of resources to image/.
svn path=/trunk/; revision=44165
2012-07-31 20:00:25 +00:00
Gerald Combs
b0a562b82d Remove the filename from the Win32 file dialog preview. It's already
shown in two places and there's no reason to show it in a third.

Use CommDlg_OpenSave_GetFilePath instead of CommDlg_OpenSave_GetSpec so
that previews work properly for folders.

svn path=/trunk/; revision=43877
2012-07-21 01:14:08 +00:00
Gerald Combs
bdea70585d Use win32_open_file in qtshark on Windows.
svn path=/trunk/; revision=43677
2012-07-12 00:04:53 +00:00
Gerald Combs
c7c73e44b5 MSDN says DIALOG resources are obsolete. Use DIALOGEXes instead. We aren't
adding extra controls to the save dialog any more so remove its template.

svn path=/trunk/; revision=43676
2012-07-11 21:25:42 +00:00
Anders Broman
81531a65dd Change the button order in all places.
svn path=/trunk/; revision=43639
2012-07-10 07:50:34 +00:00
Anders Broman
0696f30690 From Michael Mann:
GUI use external name resolver proliferation

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7380

svn path=/trunk/; revision=43615
2012-07-09 01:36:54 +00:00
Guy Harris
84bfae28e0 Shrink the height of the "Save As" dialog, now that it no longer has
widgets to specify a range.

svn path=/trunk/; revision=42813
2012-05-23 17:17:39 +00:00
Guy Harris
26974768dd No packet range stuff for the "Save As" dialog.
svn path=/trunk/; revision=42799
2012-05-23 01:06:51 +00:00
Gerald Combs
de7c1b3ee0 Update the comment icons and tooltips.
svn path=/trunk/; revision=41440
2012-03-08 19:07:02 +00:00
Gerald Combs
d839a834cb Update and add icons for capture comments / annotations.
svn path=/trunk/; revision=41406
2012-03-07 20:56:01 +00:00
Balint Reczey
9d1c2ec81d Make SVG images useable as icons
svn path=/trunk/; revision=41326
2012-03-02 23:31:48 +00:00
Guy Harris
7ee87d9ae5 Another change for the move of the top-level win32 directory into the ui
directory.

svn path=/trunk/; revision=40535
2012-01-16 01:56:18 +00:00
Gerald Combs
522ab13c8a Network icons from Elliott Aldrich.
svn path=/trunk/; revision=39116
2011-09-24 00:13:32 +00:00
Gerald Combs
fae571b3f8 Make the network_usb.svg image public domain.
svn path=/trunk/; revision=38996
2011-09-14 17:39:19 +00:00
Sake Blok
ba086053c7 Add "File -> Export -> SSL Session Keys..." to be able to save the keyring info for each session in the trace file. This makes it possible to give someone the trace and the exported keys so that they can decrypt the traffic in the trace, but not new sessions to the same server.
(See also: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444)


svn path=/trunk/; revision=37446
2011-05-28 18:17:50 +00:00
Gerald Combs
2009cc6f17 Update some of the "Details" properties in the installer. Remove the
32-bit BMPs from the installer icon; they don't appear to render properly.

svn path=/trunk/; revision=36113
2011-03-01 19:40:51 +00:00
Gerald Combs
5d46856320 Use the correct processor architecture in our manifest. This lets us
create a usable wireshark.exe for x64 using Visual C++ 10.  Change the
name of VCREDIST_DLL to PROCESSOR_ARCHITECTURE to more accurately
reflect what it's used for. Allow MSVC_VARIANT to be set from the
system environment, mainly to keep me from accidentally clobbering it
in the future.

svn path=/trunk/; revision=35687
2011-01-28 00:21:05 +00:00
Stephen Fisher
65926a0e0e Fix the Windows buildbot after r35032
svn path=/trunk/; revision=35033
2010-11-26 20:13:00 +00:00
Anders Broman
5bfb661d23 Add a wireshark file stock icon.
svn path=/trunk/; revision=34496
2010-10-13 11:15:11 +00:00
Gerald Combs
68d6299fc6 Remove the up/down arrow images. They haven't been used in a very long
time.

svn path=/trunk/; revision=33693
2010-08-03 00:08:14 +00:00
Bill Meier
f5ca04fc65 Remove propery svn:eol-style: none of the other .svg files in this dir have this property.
svn path=/trunk/; revision=32281
2010-03-25 20:47:13 +00:00
Stig Bjørlykke
a44fe4937d Added "Remove Ignored packets" to the win32 dialogs.
svn path=/trunk/; revision=31695
2010-01-27 11:45:16 +00:00
Jaap Keuter
4c85037589 Cleanup the SVN properties of the images.
svn path=/trunk/; revision=31515
2010-01-13 18:05:44 +00:00
Gerald Combs
5e1f4c871e From Elliott: Add contrast to the border.
svn path=/trunk/; revision=31505
2010-01-12 18:03:12 +00:00
Gerald Combs
570efc85bd Add the images used to create the new document icon. Remove the old doc
icon files.

svn path=/trunk/; revision=30993
2009-11-17 17:32:56 +00:00
Gerald Combs
4c7a787b3d Update the document icons.
svn path=/trunk/; revision=30990
2009-11-17 17:07:06 +00:00
Anders Broman
b16fab6435 From Alejandro Vaquero:
Add RTP player to "RTP Stream Analysis" and makeover of VoIP flow
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4240

svn path=/trunk/; revision=30967
2009-11-15 20:13:08 +00:00
Gerald Combs
9bee1e4c6c Minor adjustments.
svn path=/trunk/; revision=30959
2009-11-13 23:26:24 +00:00
Gerald Combs
9495754ee8 Add a USB network icon.
svn path=/trunk/; revision=30941
2009-11-12 18:10:34 +00:00
Gerald Combs
3d40778d1b Move the contents of image/expert_*.h to gtk/expert_indicators.h. Add
pixbuf versions of the wired, wireless, and bluetooth interface icons to
gtk/network_icons.h. In the interface list use the new icons in all
their alpha-channel-infested glory. Add Makefile targets for rebuilding
the pixbuf files.

svn path=/trunk/; revision=30922
2009-11-10 18:02:05 +00:00
Gerald Combs
01c31f7d2a Make each level color and the light gradient color in the statusbar match.
svn path=/trunk/; revision=30836
2009-11-05 19:45:51 +00:00
Jaap Keuter
863dfea086 Fix the property list.
svn path=/trunk/; revision=30829
2009-11-05 06:59:27 +00:00
Gerald Combs
4f81e16ed2 Lighten the chat and none icons as suggested by Stig.
svn path=/trunk/; revision=30828
2009-11-05 01:15:50 +00:00
Gerald Combs
66e51792ed Fix the expert_error border.
svn path=/trunk/; revision=30826
2009-11-04 22:35:23 +00:00
Gerald Combs
d54eea534e Add a convenience routine to convert pixbuf data generated by
gdk-pixbuf-csource to a GtkImage. Use it to load the expert indicator
images. Add prettier indicator images. The "chat" indicator is more blue
in order to differentiate it from the "none" indicator; make the chat
text background more blue to match.

svn path=/trunk/; revision=30825
2009-11-04 21:16:38 +00:00
Ulf Lamping
974a0d94a7 add a (Windows only) bluetooth network interface icon
svn path=/trunk/; revision=27447
2009-02-13 21:35:41 +00:00
Ulf Lamping
a75c684a91 use a special icon for "VMware" virtual networks (yes, I know the icon is *not* very good - but I have no better idea how to display that)
svn path=/trunk/; revision=27431
2009-02-11 20:20:10 +00:00
Guy Harris
534fa3d3b3 Get rid of carriage returns, and set the EOL style to "native".
Make some arrays const, to squelch warnings.

svn path=/trunk/; revision=27337
2009-01-31 04:50:29 +00:00
Ulf Lamping
df3c99a109 Windows only: for some typical capture interface names (with a "built in" heuristic), show specific icons in the interface list and the welcome page (this helps to find the right interface)
svn path=/trunk/; revision=27335
2009-01-30 22:55:52 +00:00
Gerald Combs
495ddc2830 Make it obvious that this is a development version. Fix a makefile
dependency on the splash images.

svn path=/trunk/; revision=25594
2008-06-24 22:53:52 +00:00
Jeff Morriss
58459d3fba Create a new "Wireshark utility" library and move the mpeg-audio stuff from
wiretap to this new libwsutil.  This solves
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677 by making libwireshark
no longer depend on libwiretap.

svn path=/trunk/; revision=25330
2008-05-20 21:51:01 +00:00
Ulf Lamping
be75f6fa16 remove the copied xpm stock icon files from SVN and use the "GTK built in" stock icons
this will also prevent us from showing different stock icons for "our" xpm stock icons and the "system defaults". GTK (for Windows?) changed the icon theme somewhere around V2.10 (or later?) and/or the user might use a different icon theme, so this isn't an esoteric case ;-)

svn path=/trunk/; revision=25075
2008-04-16 09:54:55 +00:00
Stephen Fisher
56a638339c "const static char *" -> "static const char *" to fix build
svn path=/trunk/; revision=25013
2008-04-14 03:29:49 +00:00
Ulf Lamping
e7fde0351e add stock icons for expert info and flow graph
svn path=/trunk/; revision=25012
2008-04-14 02:09:54 +00:00
Ulf Lamping
8de6fc7792 fixes related to file_dlg_win32.rc
svn path=/trunk/; revision=24976
2008-04-13 13:45:50 +00:00
Stephen Fisher
75fc454c1c Make expert xpm strings const to avoid warning/error on Unix
svn path=/trunk/; revision=24863
2008-04-09 06:07:06 +00:00
Ulf Lamping
5620f6ff0a use 14*14 pixel icon
svn path=/trunk/; revision=24858
2008-04-09 05:18:23 +00:00
Ulf Lamping
e463cd81c1 prevent unix compilation problems, use "static const char"
svn path=/trunk/; revision=24844
2008-04-08 06:00:02 +00:00
Ulf Lamping
eac1cb1476 improve expert info indicator icons, but still not perfect
svn path=/trunk/; revision=24843
2008-04-08 05:55:56 +00:00
Stephen Fisher
2000fa9fcf Remove more GTK1 code and related xpm files.
svn path=/trunk/; revision=24795
2008-04-05 19:23:07 +00:00
Stephen Fisher
deb0feb343 Make xpm strings const to squelch compiler warnings on Unix.
svn path=/trunk/; revision=24779
2008-04-05 00:33:21 +00:00
Ulf Lamping
0ee0f3ac43 add an "LED" to the statusbar, that indicates the most important level of expert info in the capture file
svn path=/trunk/; revision=24777
2008-04-05 00:13:27 +00:00
Jaap Keuter
68283424ef Replace field values with constants, correcting some values.
Remove the pre-release flag from FILEFLAGS in the resource file.

svn path=/trunk/; revision=24758
2008-03-29 23:40:11 +00:00
Gerald Combs
35a5e1d68b Change the "Filter:" button in the Win32 open and merge dialogs to a
"Display filter" label.

svn path=/trunk/; revision=24734
2008-03-27 17:21:48 +00:00
Gerald Combs
fa42bcbd7b Make the document icon brighter and clean it up.
svn path=/trunk/; revision=24641
2008-03-15 19:46:26 +00:00
Gerald Combs
d63ad769ff Try out a new Windows document icon.
svn path=/trunk/; revision=24629
2008-03-14 17:57:38 +00:00
Gerald Combs
3df577499f Switch to the "oooh shiny" splash image.
svn path=/trunk/; revision=24393
2008-02-19 18:06:57 +00:00
Stig Bjørlykke
4215b61779 Add rawshark.rc.in to tarball.
svn path=/trunk/; revision=24388
2008-02-19 09:45:59 +00:00
Bill Meier
1cd76ad66a Remove svn:executable property
svn path=/trunk/; revision=24384
2008-02-18 23:58:45 +00:00
Gerald Combs
7abeb02747 If we have an SVN revision number, use it as the build number under Windows
instead of "0".

svn path=/trunk/; revision=24376
2008-02-18 18:08:14 +00:00
Gerald Combs
98bacb3556 Add rawshark, a utility that, when given raw pcap-formatted packets and
a list of fields, prints the field values found in each packet.

Packet data can be specified as a libpcap DLT, e.g. "EN10MB" or an upper-layer protocol, e.g. "http".

svn path=/trunk/; revision=24339
2008-02-15 23:20:32 +00:00
Sake Blok
62150ef57e Whoops... forgot the 'svn add' the icons :-)
svn path=/trunk/; revision=23561
2007-11-24 11:41:05 +00:00
Gerald Combs
c1a4caf1b2 Make the lawyer happy - add a registered trademark symbol.
svn path=/trunk/; revision=22366
2007-07-20 21:31:19 +00:00
Stephen Fisher
1909b97d4d Remove all warnings under Unix for the gtk/ directory.
svn path=/trunk/; revision=21160
2007-03-24 00:45:11 +00:00
Gerald Combs
320be55388 Add a Windows installer icon. Remove the ARGB versions from the other
Windows icons.

svn path=/trunk/; revision=20685
2007-02-02 18:45:23 +00:00
Gerald Combs
5d89a093c5 Add an installer icon.
svn path=/trunk/; revision=20684
2007-02-02 18:43:25 +00:00
Gerald Combs
300053d800 Set a transparency threshold for the XPM icons. Have the make-icons script
constify the XPMs.

svn path=/trunk/; revision=19883
2006-11-13 01:15:56 +00:00
Jaap Keuter
9f0da21589 Remove the executable property from this datafile
svn path=/trunk/; revision=19822
2006-11-06 14:20:03 +00:00
Jaap Keuter
7ffd4070df Let the manifest state that we're Wireshark.
svn path=/trunk/; revision=19820
2006-11-06 12:58:14 +00:00
Gerald Combs
4fcbf37533 Update the Windows icons. Use the document icon for capture files.
svn path=/trunk/; revision=19784
2006-11-03 15:54:12 +00:00
Gerald Combs
8239fd24db Touch up the glossy highlight in the main icon. Split "wsiconcap" into
"capture-in-progress" and "document" icons.  Update the highlight in
each of them as well.  Resize and rename the 200-pixel icons to 256.
Add a script to generate icons from their canonical sources.

svn path=/trunk/; revision=19780
2006-11-03 06:30:52 +00:00
Gerald Combs
82b46c7183 Add a glossy highlight.
svn path=/trunk/; revision=19724
2006-10-29 05:55:04 +00:00
Guy Harris
cf858d8336 Squelch some compiler warnings.
svn path=/trunk/; revision=19314
2006-09-24 20:28:16 +00:00
Ulf Lamping
a7ce410506 "Elapsed Time:" is truncated, use "Elapsed:" instead
svn path=/trunk/; revision=19237
2006-09-15 21:59:09 +00:00
Ulf Lamping
8d7690ea23 wireshark.res is generated in the image dir, so the paths for includes should be relative to /image and not to /
svn path=/trunk/; revision=19201
2006-09-12 08:22:02 +00:00
Ulf Lamping
4286f79f59 add a comment, that .res files are generated using an implicit (built in) nmake rule
svn path=/trunk/; revision=19200
2006-09-12 08:19:39 +00:00
Guy Harris
d39ca47b62 Constify the capture details icons, and get rid of the CRs in
capture_details_24.xpm and give it the appropriate Subversion keywords.

svn path=/trunk/; revision=19035
2006-08-25 23:59:25 +00:00