Commit Graph

1412 Commits

Author SHA1 Message Date
Gerald Combs 469232d062 Update our column information even if we don't have a capture file loaded.
svn path=/trunk/; revision=47232
2013-01-23 19:28:08 +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
Gerald Combs 8189823b73 Update the ignore shortcuts to match r47194.
svn path=/trunk/; revision=47200
2013-01-21 17:12:07 +00:00
Alexis La Goutte cbdd3ca090 And (Q_)init resources (otherwise the images don't display when build with CMake)
svn path=/trunk/; revision=47199
2013-01-21 16:59:00 +00:00
Alexis La Goutte 980edc7034 Add UI_FILES list (more easy to use when add a new ui files...)
svn path=/trunk/; revision=47198
2013-01-21 16:58:51 +00:00
Alexis La Goutte 1e06850bb3 Add layout.qrc to QRC_FILES (otherwise it is not include to compressed source files)
svn path=/trunk/; revision=47197
2013-01-21 16:58:42 +00:00
Alexis La Goutte 6343c57d21 Add layout.qrc to CMake Build
svn path=/trunk/; revision=47196
2013-01-21 16:58:33 +00:00
Alexis La Goutte ca854d396e Modify name of Preferences window
svn path=/trunk/; revision=47195
2013-01-21 16:58:22 +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 5143a55a7a Add layout_preferences_frame.ui.
svn path=/trunk/; revision=47191
2013-01-21 06:51:07 +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
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
Alexis La Goutte b99b912916 Update French translations with last change and update of Qtshark
svn path=/trunk/; revision=47184
2013-01-20 18:33:23 +00:00
Alexis La Goutte 1c68363ba2 tr() not work with #define
svn path=/trunk/; revision=47183
2013-01-20 18:33:15 +00:00
Alexis La Goutte bba1a7a599 Add Some missing text to translate
svn path=/trunk/; revision=47182
2013-01-20 18:33:06 +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 a377c7c38d Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates.
svn path=/trunk/; revision=47143
2013-01-18 01:37:27 +00:00
Gerald Combs 5efca1b8e1 Add more AirPcap code, disabled for now.
svn path=/trunk/; revision=47142
2013-01-18 01:36:37 +00:00
Gerald Combs 36884ea203 Don't call prefs_airpcap_update() for now. Remove some debugging code.
svn path=/trunk/; revision=47141
2013-01-18 01:08:44 +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 09a4761179 Add some routines to wsutil to, at least on some platforms, add
information to crash dumps and the like.  (Currently, we only handle OS
X's CrashReporter, but we should do this on other platforms where this
information can be added and would be helpful.)

svn path=/trunk/; revision=47109
2013-01-16 00:13:33 +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
Bill Meier 786d870f1f Cleanup:
- localize some vars; remove some unneeded initializers;
- indentation & white space & etc.

svn path=/trunk/; revision=47100
2013-01-15 17:54:47 +00:00