Commit graph

1006 commits

Author SHA1 Message Date
Guy Harris
569aebade2 strlen() returns a size_t, so assign its return value to a size_t.
gtk_selection_data_set() takes an int, rather than a size_t, as its last
argument, so cast away that bit of "ZOMG ARENT SIZE_T AND INT THE SAME
SIZE!!!!!!!111ONE!!!!!"

svn path=/trunk/; revision=47628
2013-02-11 06:57:58 +00:00
Gerald Combs
d21f62b73b Add a directory name preference type (PREF_DIRNAME) and registration
routine (prefs_register_directory_preference). Add PREF_FILENAME and
PREF_DIRNAME support to the Qt module preferences. Change a couple of
preferences to directory names.

Clean up some names and default settings.

svn path=/trunk/; revision=47573
2013-02-08 18:07:34 +00:00
Chris Maynard
73b49715c9 Fix Coverity CID 973548: Dereference null return value.
#BACKPORT(1.8, 1.6)


svn path=/trunk/; revision=47568
2013-02-08 16:23:02 +00:00
Guy Harris
922a57753b Constify the second argument to uat_load(), to squelch some warnings.
svn path=/trunk/; revision=47560
2013-02-08 09:06:08 +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
Jeff Morriss
446926fa34 Move the get-runtime-version stuff back outside of #ifdef WIN32.
svn path=/trunk/; revision=47454
2013-02-03 18:31:23 +00:00
Anders Broman
d7b98a02d1 call load_wpcap before collecting the run-time version information.
svn path=/trunk/; revision=47451
2013-02-03 15:11:53 +00:00
Guy Harris
6ebabce7b5 Move the GUI-independent window geometry stuff to ui/recent.c, so we
only have one copy.

svn path=/trunk/; revision=47440
2013-02-02 05:34:31 +00:00
Gerald Combs
52baba10a2 Update some tooltips.
svn path=/trunk/; revision=47404
2013-02-01 00:21:35 +00:00
Martin Kaiser
b451f267b6 for an interface that does not support monitor mode, make sure that
monitor mode is not enabled

(this fixes the gui part but there's probably more to do)

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

svn path=/trunk/; revision=47399
2013-01-31 22:30:56 +00:00
Anders Broman
80d3245f4a Try to detect duplicated packets due to mirroring/span ports by comparing src MAC addresses.
svn path=/trunk/; revision=47324
2013-01-28 15:41:45 +00:00
Anders Broman
317ccb2ff9 Whitespace and doxygen comment changes.
svn path=/trunk/; revision=47322
2013-01-28 12:04:15 +00:00
Chris Maynard
703263901b When searching for hex bytes from the "Find Packet" dialog, highlight the correct number of bytes. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8085
#BACKPORT
1.8: ui/gtk/main_proto_draw.c:packet_hex_print()
1.6: gtk/main_proto_draw.c:packet_hex_print()

svn path=/trunk/; revision=47277
2013-01-25 19:01:57 +00:00
Bill Meier
92bc64a2ac Use ws_gtk_grid...() in place of gtk_table...().
This completes the process of replacing
     Wireshark gtk_table...() usage !!

(However: the prefs dialogs still have a few Gtk3
          related Expand/Fill issues which need to be fixed).

svn path=/trunk/; revision=47262
2013-01-24 21:21:51 +00:00
Chris Maynard
fae8a2aeb5 Separate Time Shift item from Time Reference items. From Cal Turney via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8176 with qt change from me.

svn path=/trunk/; revision=47261
2013-01-24 20:06:20 +00:00
Bill Meier
4670080829 Use ws_gtk_grid...() in place of gtk_table...();
Also: minor cleanup:
- use gtk_window_set_default_size() iso gtk_window_resize();
- change grid row numbers to start at 0 (not 1);
- fix some formatting/whitespace.

svn path=/trunk/; revision=47260
2013-01-24 18:28:31 +00:00
Gerald Combs
2dff8d7605 Add font and color preferences. Unfortunately Qt doesn't have a color
picker widget so we're back to popping up dialogs. Move the contents of
monospace_font.{cpp,h} to wireshark_application.{cpp,h}.

Pango and Qt use completely different string representations for fonts.
Add a separate gui.qt.font_name preference so that they don't clobber
each other.

svn path=/trunk/; revision=47240
2013-01-24 01:10:12 +00:00
Gerald Combs
21e66f0c6f Add column preferences.
svn path=/trunk/; revision=47231
2013-01-23 19:04:36 +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
Chris Maynard
394b6c1c00 Fix VS Studio Analysis warning C6244: Local declaration of 'iftype' hides previous declaration at line '1046'
svn path=/trunk/; revision=47213
2013-01-22 17:31:07 +00:00
Chris Maynard
d85feecdd8 For menu consistency and shortcut simplification, change some "Ignore" related shortcuts to match "Mark" and "Time Reference" shortcuts. Specifically:
Ignore All Displayed Packets <alt><shift><control>D ==> <shift><control>D
Unignore All Packets         <shift><control>D      ==> <alt><control>D

svn path=/trunk/; revision=47203
2013-01-22 02:03:41 +00:00
Chris Maynard
aed63758a1 Avoid using *<control>X shortcuts. In this case, using *<control>D instead.
From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8176

svn path=/trunk/; revision=47194
2013-01-21 16:36:40 +00:00
Gerald Combs
3f3040b345 Increase the background opacity.
svn path=/trunk/; revision=47189
2013-01-21 02:47:32 +00:00
Jaap Keuter
3c6ff474fa Fix for CID 715142.
Be aware that the short-circuit evaluation only applies to the 
first operand of a logical AND expression.

svn path=/trunk/; revision=47188
2013-01-20 21:45:43 +00:00
Gerald Combs
6e8c33d01c Use the correct image sequence.
svn path=/trunk/; revision=47185
2013-01-20 18:52:40 +00:00
Gerald Combs
8f62d93328 Add layouts.h
svn path=/trunk/; revision=47166
2013-01-19 17:17:01 +00:00
Bill Meier
3026b7c324 Add a rule to create layouts.h (using gdk-pixbuf-csource
in a similar manner as done in Makefile.am)

(On my Windows 7 system gdk-pixbuf-csource gives an error
message about "...Couldn't recognize the image file format...".
Let's see what happens in the Windows buildbots).

svn path=/trunk/; revision=47165
2013-01-19 16:39:28 +00:00
Jaap Keuter
179016c9cb There is no wireless layout.
svn path=/trunk/; revision=47161
2013-01-19 13:01:00 +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
2c5ce01f33 Add an "Appearance" (aka "User Interface") preference pane. Having an
"Advanced" pane gives us the luxury of omitting some items in favor of
simplicity so do that.

svn path=/trunk/; revision=47158
2013-01-19 00:57:57 +00:00
Bill Meier
2dda8659ef Fix two issues related to conversion to use ws_gtk_grid...() [svn #47002].
svn path=/trunk/; revision=47154
2013-01-18 20:55:11 +00:00
Gerald Combs
7f70a5e438 Fix compilation on Windows.
svn path=/trunk/; revision=47140
2013-01-18 00:59:47 +00:00
Gerald Combs
ae7ee61e84 Rename the "saved_val" preference element to "stashed_val" in order to
more clearly indicate that it's a copy of a preference value rather than
something we've saved in the preferences file. Update
prefs_pref_to_str() to handle default, stashed, and current prefs.

Create ui/preference_utils.[ch] and move some common routines there. Use
prefs_pref_type_name() in the GTK+ preferences dialog.

Make the "OK" button in the Qt preferences dialog work. We simply write
the prefs and redissect on "OK" and do nothing on "Cancel". This is
intentionally different from the Apply/OK/Cancel behavior in the GTK+
version.

Add a general "emitAppSignal" method to wsApp and use it for packet
dissection and preference changes.

Suggest that we might want to create a WsString class to make conversion
between QStrings, gchar *s, and GStrings easier.

svn path=/trunk/; revision=47139
2013-01-18 00:50:14 +00:00
Bill Meier
7a9095ee15 Minor cleanup:
- Whitespace;
  - Long lines.

svn path=/trunk/; revision=47138
2013-01-17 22:38:51 +00:00
Bill Meier
26f1bad60c General cleanup:
Indentation: Use 4 spaces;
  parens;
  unneeded initializers;
  whitespace.

svn path=/trunk/; revision=47137
2013-01-17 22:26:37 +00:00
Bill Meier
e19db35fab Use gtk_box_pack_start() instead of gtk_container_add()
when packing into a [v|h]box so that Gtk2 & Gtk3 behavior is
 the same.

Also: Add an XXX comment:
        "progess" rendering doesn't seem to work for Gtk3 ??


svn path=/trunk/; revision=47135
2013-01-17 21:34:23 +00:00
Bill Meier
f06b4b62bf Use gtk_box_pack_start() instead of gtk_container_add()
when packing into a [v|h]box so that Gtk2 & Gtk3 behavior is
 the same.

Also: Add an XXX comment:
        "progess" rendering doesn't seem to work for Gtk3 ??

svn path=/trunk/; revision=47134
2013-01-17 20:56:13 +00:00
Anders Broman
402906be13 Opening the capture options triggers a rescan of all the packets caused by the call to update_decryption_mode_list() for airpcap.
If we don't get the airpcap_if_list, don't do anything regarding air_pcap.

update_decryption_mode_list() should probably check if a change is taking place before rescaning all packets.

svn path=/trunk/; revision=47131
2013-01-17 12:21:57 +00:00
Bill Meier
88c3c64b0a Fix Gtk3 window resize behavior to match Gtk2.
Specifically: use gtk_box_pack_start() instead
 of gtk_container_add() in a number of places.

Also: do some whitespace cleanup.

svn path=/trunk/; revision=47129
2013-01-16 23:18:53 +00:00
Bill Meier
f0f5583ce4 Remove redundant call to gtk_box_set_child_packing().
svn path=/trunk/; revision=47128
2013-01-16 22:43:58 +00:00
Bill Meier
c90956edb4 General cleanup: whitespace, parens & etc.
svn path=/trunk/; revision=47126
2013-01-16 22:32:29 +00:00
Bill Meier
8d41249753 Use gdk_cairo_set_source_rgba() and GdkRGBA.
svn path=/trunk/; revision=47124
2013-01-16 21:51:20 +00:00
Bill Meier
128f123d7f Use gdk_cairo_set_source_rgba() and GdkRGBA.
svn path=/trunk/; revision=47121
2013-01-16 21:07:52 +00:00
Bill Meier
aed95072b4 Replace gtk_table...() with ws_gtk_grid...();
Also; do some whitespace cleanuyp.

svn path=/trunk/; revision=47118
2013-01-16 17:09:22 +00:00
Bill Meier
185f323231 Replace gtk_table...() with ws_gtk_grid...();
Use gtk_box_pack_start() instead of
 gtk_container_add() in a few places so that
 window resize behavior is the same for
 Gtk2 and Gtk3.

Also: do some whitespace cleanup.

svn path=/trunk/; revision=47117
2013-01-16 16:52:32 +00:00
Bill Meier
03101e015e (Trivial) whitespace cleanup;
svn path=/trunk/; revision=47116
2013-01-16 16:24:32 +00:00
Bill Meier
8d385b0b75 Fix a Gtk2 vs Gtk3 issue;
Specifically: use gtk_box_pack_start()
 instead of gtk_container_add() in one case
 so that (for Gtk3) a window component properly
  expands when the window is resized vertically.

svn path=/trunk/; revision=47115
2013-01-16 16:19:05 +00:00
Guy Harris
a694ccd013 Set the crash info as early as possible in main(), so that it shows up
in crashes that happen early in the process.

Clean up white space.

svn path=/trunk/; revision=47108
2013-01-16 00:12:27 +00:00
Bill Meier
f4e862fb1a Cleanup:
- "localize" some variables; remove some unneeded initializers;
- indentation, whitespace, long lines & etc.

svn path=/trunk/; revision=47103
2013-01-15 21:52:23 +00:00
Bill Meier
026c798c98 Fix several window resize behavior differences between Gtk2 & Gtk3.
Specifically: replace several gtk_container_add() calls by
              gtk_box_pack_start() calls.

svn path=/trunk/; revision=47102
2013-01-15 21:09:12 +00:00