Commit graph

1647 commits

Author SHA1 Message Date
Anders Broman
917661c7cb Get rid of xor_gc altogether, I think it's a remnant from the "old" cross-hair code.
svn path=/trunk/; revision=48140
2013-03-06 18:17:42 +00:00
Anders Broman
7990a0e4d0 Use explicit casts.
svn path=/trunk/; revision=48137
2013-03-06 17:35:11 +00:00
Bill Meier
974c0e18b9 gtk_alignment_new() args are gfloat; use constants of form 0.0F.
(A floating point constant without a suffix (e.g., 0.0) is a 'double'.

svn path=/trunk/; revision=48129
2013-03-06 04:43:12 +00:00
Jeff Morriss
5d21ea33e4 Actually add IPv6 addresses to the display.
svn path=/trunk/; revision=48128
2013-03-06 02:18:23 +00:00
Bill Meier
427790ed8f From Peter Hatina: Fix for: Gtk3 widgets are not properly expanded.
(Part of suggested patch for WIreshark 1.8 applied to trunk instead)

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

From me: Add an XXX xomment about how, on Windows, closing the top_level
Wireshark window while the capture_interfaces dialog window is open
will leave the associated dumpcap process running.


svn path=/trunk/; revision=48122
2013-03-06 00:33:58 +00:00
Anders Broman
b204e38aef Use explicit casts.
svn path=/trunk/; revision=48108
2013-03-05 22:15:20 +00:00
Bill Meier
faa06129a9 Remove a comment left over from the "old days".
Also: Add an XXX comment re one effect of the
      fact that, on Windows, dlg_window_new() does *not*
      set the newly created dialog window as 'transient for'
      the Wireshark top_level window.

svn path=/trunk/; revision=48106
2013-03-05 22:12:09 +00:00
Gerald Combs
75847e552a "HKEY_CURRENT_USER\Software\The Wireshark developer community, http://www.wireshark.org/\Wireshark\WinSparkle" isn't the prettiest registry path.
svn path=/trunk/; revision=48089
2013-03-05 18:46:50 +00:00
Jeff Morriss
19214234ae Followup to r48081: use the DEFAULT_CAPTURE_BUFFER_SIZE macro from r47942.
svn path=/trunk/; revision=48085
2013-03-05 15:22:28 +00:00
Chris Maynard
2b93c3b31e Default capture buffer size is now 2MB. (See also r47920 and r47937)
svn path=/trunk/; revision=48081
2013-03-05 02:09:37 +00:00
Bill Meier
0463fc2622 Fix a minor typo in SVN #48065
svn path=/trunk/; revision=48067
2013-03-04 21:04:57 +00:00
Bill Meier
1fb0ac3983 Fir Gtk 3.8 & newer: gtk_scrolled_window_add_with_viewport() ==> gtk_container_add().
svn path=/trunk/; revision=48065
2013-03-04 19:20:39 +00:00
Alexis La Goutte
8b76610965 Display "Select Decryption Mode" in Decryption Key Management (Broken by revision 47005)
svn path=/trunk/; revision=48059
2013-03-04 17:15:58 +00:00
Alexis La Goutte
4ee92ef970 Fix indent (Tabs => Spaces)
svn path=/trunk/; revision=48058
2013-03-04 17:15:48 +00:00
Bill Meier
fcb58073ef Whitespace & indentation cleanup.
svn path=/trunk/; revision=48050
2013-03-04 16:36:40 +00:00
Chris Maynard
e9907716a2 With Jim Young's suggestion, revert r43785. Currently the file->open dialog contains a *Read* filter field, not a display filter, so after the packets matching the read filter are loaded, there is no actual display filter applied. This resolves https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8344
svn path=/trunk/; revision=48046
2013-03-04 06:49:01 +00:00
Bill Meier
c9dee3bdda For GTK 3.4 and newer: use GtkColorChooserWidget;
(Implemented using a bit of a hack).

svn path=/trunk/; revision=48044
2013-03-04 04:53:44 +00:00
Bill Meier
48527645c9 Minor tweaks to "ColorSelection" UI:
- For each choice (marked/ignored fg/bg) always show orig color as "prev color";
 - Improve spacing between widgets.

Also;
 - Add a few explanatory comments;
 - Add editor modelines;
 - Cleanup whitespace/long-lines/formatting.

svn path=/trunk/; revision=48012
2013-03-02 17:47:56 +00:00
Balint Reczey
1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Bill Meier
93be111c38 Fix [-W shadow] issue in SVN #47958 in a slightly different manner than the fix SVN #47960.
svn path=/trunk/; revision=47976
2013-03-01 16:31:42 +00:00
Evan Huus
e4c436d10a Add some 'const's to satisfy latest GCC.
svn path=/trunk/; revision=47961
2013-03-01 01:39:33 +00:00
Evan Huus
88ad3f8282 Rename a variable s/color_edit_dlg/color_edit_window/ to fix a -Wshadow error
svn path=/trunk/; revision=47960
2013-02-28 23:44:32 +00:00
Bill Meier
2115cd7696 color_edit_dlg update:
- Significantly simplify & rework code;
- Use GtkColorChooser instead of GtkColorSelection if GTK 3.4 or newer.
- Minor UI cleanup (default buttons & etc)
- Fix crash which occurred in the (existing) GTK3 related code.
- Fix some other relatively minor bugs (including some minor memory leaks);
- Remove some old, commented-out code;
- Use a more consistent naming scheme for certain variables.

svn path=/trunk/; revision=47958
2013-02-28 23:05:09 +00:00
Anders Broman
6bf8fcfad4 Avoid a packet rescan if we don't have an AirPcap adapter.
svn path=/trunk/; revision=47945
2013-02-28 17:55:07 +00:00
Jeff Morriss
d0992bf8cd Add a #define for the default capture buffer size and use it.
svn path=/trunk/; revision=47942
2013-02-28 15:27:56 +00:00
Jeff Morriss
4e2090bdc9 From Anders: more places to increase the default capture buffer size.
svn path=/trunk/; revision=47939
2013-02-28 14:36:41 +00:00
Bill Meier
96a24cc79f Fix spelling/typos found using a list of commonly misspelled words.
The misspellings were mostly in comments but some were
in text strings visible to the user.


svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00
Bill Meier
a6e56df8b6 it's ==> its & its ==> it's as needed.
svn path=/trunk/; revision=47898
2013-02-26 02:38:52 +00:00
Bill Meier
162817ad33 it's ==> its & its ==> it's as needed.
In a few cases:
 Fix spelling;
 Clean up whitespace and formatting style.

svn path=/trunk/; revision=47889
2013-02-25 23:35:13 +00:00
Bill Meier
674e37d0a8 From Peter Hatina: test GDK_WINDOW_STATE_MAXIMIZED as a bit flag
(One small part of a suggested patch in Bug #8315).

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

svn path=/trunk/; revision=47863
2013-02-24 19:35:32 +00:00
Michael Mann
e094c21301 Minor Bluetooth fixes
1. Allow to DecodeBy payload over AVCTP
2. Fix L2CAP CID payload recognize after disc
3. Removed unneeded _U_
4. Fall back to control channel in AVRCP
5. Fix time-tracking for passthrough and capability AVRCP commands

From Michal Labedzki, bug 8367 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8367)

svn path=/trunk/; revision=47810
2013-02-21 22:00:32 +00:00
Gerald Combs
b0d958c4ed Don't yell at the user quite so much. Remove exclamation points from
some error messages and rephrase some others.

svn path=/trunk/; revision=47787
2013-02-21 01:00:44 +00:00
Martin Kaiser
4099ef9457 make function names consistent
edit_capture_dlg_launch() -> edit_capture_comment_dlg_launch()

svn path=/trunk/; revision=47780
2013-02-20 22:18:56 +00:00
Martin Kaiser
18ec6f01a3 kill an "edit capture comment" popup if the underlying file is closed
(at the moment, the edit window remains open even if the file is closed or
changed, this allows effectively to overwrite a file's capture commment with
the capture comment of a previously used file)

svn path=/trunk/; revision=47779
2013-02-20 22:08:00 +00:00
Gerald Combs
6d358bcba6 Forcing everyone to use the development update channel probably isn't
the best idea.

svn path=/trunk/; revision=47774
2013-02-20 20:16:49 +00:00
Gerald Combs
1129239b15 Add software_update.c.
svn path=/trunk/; revision=47767
2013-02-20 06:51:16 +00:00
Gerald Combs
b5e9e86826 Only call create_app_running_mutex on Windows.
svn path=/trunk/; revision=47766
2013-02-20 05:04:57 +00:00
Gerald Combs
bd4cffae58 When any of our executables start on Windows create or open a "Wireshark
is running" mutex. Have the NSIS installer check for this mutex and ask
the user to close Wireshark if it's found. While not perfect this makes
the WinSparkle update process much less annoying.

svn path=/trunk/; revision=47758
2013-02-20 01:19:42 +00:00
Gerald Combs
81a5be5813 Enable automatic updates for Win64. Fix a copy/paste error.
svn path=/trunk/; revision=47749
2013-02-19 22:57:40 +00:00
Gerald Combs
e48236a436 Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.

svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00
Guy Harris
8d7ffcc99b Add a macro that, for a given count of keys, returns the total size of
an AirpcapKeysCollection structure with that number of keys, and use it
instead of doing the calculation manually.

svn path=/trunk/; revision=47699
2013-02-17 03:45:06 +00:00
Martin Mathieson
18cb86cc23 Show resegmented data as grey.
svn path=/trunk/; revision=47687
2013-02-16 00:00:06 +00:00
Michael Mann
f5d559e879 Fix Voice RTP player crash if player is closed while playing
Bug 8065 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8065)

svn path=/trunk/; revision=47674
2013-02-15 15:31:24 +00:00
Guy Harris
6532f50bd9 main_window_slots.cpp includes ui_main_window.h, so make sure we build
ui_main_window.h before doing anything with main_window_slots.cpp.

svn path=/trunk/; revision=47659
2013-02-14 19:56:21 +00:00
Martin Kaiser
dbe4e9c07b remove _U_ for parameter that is used
svn path=/trunk/; revision=47644
2013-02-12 19:00:39 +00:00
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
a22790ae51 Use the same destination directory everywhere. If we're building an NSIS
package, assume that we're doing a "release" build.

svn path=/trunk/; revision=47615
2013-02-10 19:45:43 +00:00
Guy Harris
a13d58a509 Put NODIST_ at the beginning of macro names, as was done for the plugins
directory.

svn path=/trunk/; revision=47599
2013-02-09 23:35:30 +00:00
Gerald Combs
0eb047bcef Fix EXTRA_BINFILES for CMake + OS X.
svn path=/trunk/; revision=47595
2013-02-09 19:56:03 +00:00
Gerald Combs
942650fe0e Try to figure out if we built the rest of the project using Autotools or
CMake automatically.

svn path=/trunk/; revision=47576
2013-02-09 00:25:24 +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
dcd8e9df5a Add module_preferences_scroll_area.*.
svn path=/trunk/; revision=47546
2013-02-08 01:30:31 +00:00
Gerald Combs
24d67b60ab Add a ModulePreferencesScrollArea widget which builds a scrollable frame
for a preferences module. Use it to fill in the remaining preferences.
Don't show the printing preferences since they're not used here.

Change the titles and tooltips for some of the name resolution
preferences.

Disable the capture preferences if we can't capture. This is different
from the GTK+ version which hides it completely.

Thus concludes the preferences dialog (for the time being).

svn path=/trunk/; revision=47545
2013-02-08 01:16:46 +00:00
Gerald Combs
4f59c586d2 Remove some unnecessary definitions.
svn path=/trunk/; revision=47526
2013-02-06 21:55:58 +00:00
Gerald Combs
248310e3a7 Add filter expressions frame entries.
svn path=/trunk/; revision=47523
2013-02-06 19:03:23 +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
7f398a97af Prettify Qt build output.
svn path=/trunk/; revision=47484
2013-02-05 05:17:16 +00:00
Guy Harris
02da11d645 Sigh. At least on my Fedora 16 with KDE, the Qt 4 versions of uic and
moc are called uic-qt4 and moc-qt4.  Look for them by names, plural.

svn path=/trunk/; revision=47457
2013-02-03 21:39:11 +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
bf12f288db Reflect recent.c moving from the top-level directory to the ui
directory.

svn path=/trunk/; revision=47441
2013-02-02 06:05:59 +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
Guy Harris
ab3840049e Reflect the move of recent.c to the ui directory.
svn path=/trunk/; revision=47439
2013-02-02 05:25:39 +00:00
Guy Harris
4d85cfeea6 Move recent.c to the ui directory, as we did with its header file.
svn path=/trunk/; revision=47438
2013-02-02 04:49:58 +00:00
Guy Harris
e62aba38e6 In Qt 4, C strings are, by default, treated as 7-bit ASCII when
converted to QStrings, and, to get them to be treated as UTF-8, you need
to call the setCodecForCStrings method of the QTextCodec class to set
the codec to a UTF-8 codec.

In Qt 5, C strings are treated always as UTF-8 when converted to
QStrings, and there's no setCodecForCStrings method for the QTextCodec
class.

In addition, there's also no setCodecForTr method for the QTextCodec
class - and QObject isn't documented as even *having* a tr method, so I
don't know what to do there.

svn path=/trunk/; revision=47436
2013-02-02 03:59:57 +00:00
Alexis La Goutte
8afb6106f2 Fix [ 68%] Building CXX object ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o ui/qt/font_color_preferences_frame.cpp: In member function ‘void FontColorPreferencesFrame::updateWidgets()’: ui/qt/font_color_preferences_frame.cpp:84:54: error: ‘class QFont’ has no member named ‘styleName’ make[2]: *** [ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o] Erreur 1 make[1]: *** [ui/qt/CMakeFiles/qtui.dir/all] Error 2
StyleName is not available in Qt < 4.8
disable this line for the moment (maye be add if QTVERSION > 4.8 ?)

svn path=/trunk/; revision=47409
2013-02-01 09:21:38 +00:00
Gerald Combs
52baba10a2 Update some tooltips.
svn path=/trunk/; revision=47404
2013-02-01 00:21:35 +00:00
Gerald Combs
89c5066f67 Add interface prefs. Adjust some spacing and resize behavior.
svn path=/trunk/; revision=47403
2013-02-01 00:14:15 +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
Gerald Combs
3604d301c2 Use the name "Wireshark" instead of "qtshark" on OS X.
svn path=/trunk/; revision=47393
2013-01-31 18:54:14 +00:00
Guy Harris
47b8a34ebb GPOINTER_TO_INT() is the inverse of GINT_TO_POINTER().
svn path=/trunk/; revision=47374
2013-01-30 21:31:45 +00:00
Guy Harris
d29e1b5604 Use optargp, not optarg, in followSsl(), as in other routines; this
squelches a shadowing warning.

svn path=/trunk/; revision=47373
2013-01-30 21:07:19 +00:00
Michael Mann
7f3064e6ae Add support in TShark to follow SSL streams
From QA Cafe, bug 8280 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8280)

svn path=/trunk/; revision=47372
2013-01-30 20:36:47 +00:00
Gerald Combs
2afe999c21 Copy over r47277 from ui/gtk.
svn path=/trunk/; revision=47364
2013-01-30 00:07:57 +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
Gerald Combs
4b99b36fed Add back the X11 substitutes.
svn path=/trunk/; revision=47264
2013-01-24 23:50:01 +00:00
Gerald Combs
d6de798226 Clean up font initialization a bit.
svn path=/trunk/; revision=47263
2013-01-24 23:42:34 +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
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
Bill Meier
e0b350aafb Fix Gtk2 vs Gtk3 issue:
Set a default size for the window so that the
initial size of the window in Gtk3 is similar to
that in Gtk2. That is: so that all the columns
(and a number of rows) show.

svn path=/trunk/; revision=47099
2013-01-15 17:10:32 +00:00
Bill Meier
3adfacfea6 Cleanup: indentation, whitespace, long-lines, formatting & etc.
svn path=/trunk/; revision=47092
2013-01-15 15:16:53 +00:00
Bill Meier
ef4749d4e2 Minor cleanup:
- remove severl gtk_box_set_child_packing() statements which "do nothing";
 - replace several gtk_container_add()/gtk_box_set_child_packing() sequences
    by gtk_box_pack_start().

svn path=/trunk/; revision=47087
2013-01-15 01:42:09 +00:00
Bill Meier
8c2127b946 Replace gtk_table...() with ws_gtk_grid...()
(with some finagling so that the layout is about the same
for both Gtk2 & Gtk3).

svn path=/trunk/; revision=47086
2013-01-14 23:54:08 +00:00
Gerald Combs
b82f42d8cf When the user is editing text or selecting from a combo box, don't
immediately close the dialog if he or she presses the escape or enter
keys. Revert the value if the user presses escape. Properly handle the
base for uint preferences. Fix a NULL pointer dereference.

Add a gchar_free_to_qstring utility routine which creates a QString from
a g_malloced string and frees it.

svn path=/trunk/; revision=47083
2013-01-14 22:21:11 +00:00
Chris Maynard
afdc2a9a12 Fix Coverity CID 741081: Logically dead code. (Minor whitespace cleanup also.)
svn path=/trunk/; revision=47075
2013-01-14 19:00:44 +00:00
Chris Maynard
c6c41ee09b Fix Coverity CID 741991: Wrong sizeof argument.
svn path=/trunk/; revision=47074
2013-01-14 18:41:25 +00:00
Chris Maynard
fc9663740e Use SET_ADDRESS() to initialize src and dst as both src.hf and dst.hf were uninitialized. Fixes Coverity CID's 752013-752014: Uninitialized scalar variable.
svn path=/trunk/; revision=47070
2013-01-14 16:55:07 +00:00
Bill Meier
31e5c6f727 Replace gtk_table...() with ws_gtk_grid...().
Also:
  Use #if 0 rather than /* */ to coment out some code;
  Very minor whitespace fixup.

svn path=/trunk/; revision=47068
2013-01-14 16:17:42 +00:00
Bill Meier
165f86b9a3 Cleanup: Whitespace, formatting-style, long-lines & etc.
Use "4 space" indentation.

Add an XXX comment about better formating needed
 for the text in the Help window (so the
 text columns line up and so the Help text
 looks better).

Comment out a "does-noting" for loop;

svn path=/trunk/; revision=47059
2013-01-14 04:28:16 +00:00
Bill Meier
c7120ce08e Replace gtk_table...() with ws_gtk_grid...();
Also: Minor changes so that window resizing is handled
      identically in Gtk2 & Gtk3.

svn path=/trunk/; revision=47058
2013-01-14 03:13:55 +00:00
Bill Meier
492d84d6a2 General whitespace & formatting style cleanup.
svn path=/trunk/; revision=47044
2013-01-12 20:00:50 +00:00
Bill Meier
83bc776dc3 Replace gtk_table...() with ws_gtk_grid...().
svn path=/trunk/; revision=47043
2013-01-12 18:40:01 +00:00
Bill Meier
4fbdb87e1a General cleanup: whitespace, long-lines, & etc.
svn path=/trunk/; revision=47042
2013-01-12 16:23:09 +00:00
Bill Meier
b57a1dd5db Replace gtk_table...() with ws_gtk_grid...().
Also: remove some trailing whitespace.

svn path=/trunk/; revision=47038
2013-01-11 20:27:43 +00:00
Bill Meier
a63b7f9264 Replace gtk_table...() with ws_gtk_grid...();
Add an XXX comment about trying (and failing)
 to change the behavior of the grid when the
 column prefs window is horizontally resized.

Also: do whitespace cleanup: indentation & etc.

svn path=/trunk/; revision=47032
2013-01-11 18:26:35 +00:00
Bill Meier
00ae417aae Remove a left-over "// note to myself".
svn path=/trunk/; revision=47030
2013-01-11 15:56:23 +00:00
Bill Meier
9ffde43550 Replace gtk_table...() with ws_gtk_grid...();
Also: Do general cleanup:
 - #if 0 unused value_strings and unused functions;
 - Whitespace, formatting style, long-lines, etc.

svn path=/trunk/; revision=47029
2013-01-11 14:47:47 +00:00
Bill Meier
18679dccbd Replace gtk_table..() with ws_gtk_grid...().
svn path=/trunk/; revision=47027
2013-01-11 01:41:55 +00:00
Bill Meier
e28da09c31 Replace gtk_table...() with ws_gtk_grid...().
Also: Do some minor whitespace cleanup.

svn path=/trunk/; revision=47026
2013-01-11 01:19:05 +00:00
Bill Meier
12220072c9 Replace gtk_table...() with ws_gtk_grid...().
Also: do general whitespace, long-lines and formatting style cleanup.

svn path=/trunk/; revision=47025
2013-01-11 00:54:08 +00:00
Bill Meier
780ff66b6e Replace gtk_table...() with ws_gtk_grid...().
Do some minor changes so that the Gtk2 & Gtk3
 window resizing behavior is the same.

Also: Clean up whitespace: indentation & etc.

svn path=/trunk/; revision=47024
2013-01-10 23:11:35 +00:00
Bill Meier
ee762f80c9 Replace gtk_table...() with ws_gtk_grid...();
Also: Remove creation of a widget which is
      never used.

svn path=/trunk/; revision=47023
2013-01-10 21:47:25 +00:00
Bill Meier
1dba2b6377 Add ws_gtk_grid_attach(); Update some comments.
svn path=/trunk/; revision=47022
2013-01-10 20:47:40 +00:00
Bill Meier
9e1bf0acef Update comments.
svn path=/trunk/; revision=47021
2013-01-10 20:46:58 +00:00
Bill Meier
708de14dc8 Replace gtk_table...() with ws_gtk_grid...().
svn path=/trunk/; revision=47020
2013-01-10 16:29:30 +00:00
Bill Meier
d6ddcc9e54 Replace gtk_table...() with ws_gtk_grid...()
with some minor changes so that window resizing
 functions the same for both Gtk2 & Gtk3.

svn path=/trunk/; revision=47019
2013-01-10 15:19:29 +00:00
Irene Rüngeler
2dc365db46 Another solution to fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8183.
Now both windows are modal.

svn path=/trunk/; revision=47018
2013-01-10 12:44:52 +00:00
Irene Rüngeler
2a7031f12b Fix for bug 8183 reported by David Bergeron.
svn path=/trunk/; revision=47015
2013-01-10 09:27:07 +00:00
Bill Meier
d649184e55 Fix indentation to match editor modelines.
svn path=/trunk/; revision=47009
2013-01-10 03:35:16 +00:00
Bill Meier
07651cf836 Fixes:
1. 'File ! Open' changes applied to the 'File ! Merge' window;
2. Small change made so that the GTk2 & Gtk3 behavior are the same (Finally !)
3. window structure picture and notes updated.

svn path=/trunk/; revision=47008
2013-01-10 02:51:36 +00:00
Bill Meier
3c022129bc Add a picture and some notes about the capture_file-dialog window.
svn path=/trunk/; revision=47007
2013-01-09 22:03:40 +00:00
Anders Broman
0a8073c567 Follow up on 47003
Use ws_gtk_grid...() instead of gtk_table...(); in more places.

svn path=/trunk/; revision=47005
2013-01-09 21:35:18 +00:00
Bill Meier
513e5eb177 Use ws_gtk_grid...() in place of gtk_table...().
The Gtk2 vs Gtk3 behavior is not precisely the same
when resizing the window hozizontally; IMO it's
"good enough" (after several days of playing around
trying to make the behaviour identical).



svn path=/trunk/; revision=47004
2013-01-09 21:04:44 +00:00
Anders Broman
bf22d3ffd3 Use ws_gtk_grid...() instead of gtk_table...();
svn path=/trunk/; revision=47003
2013-01-09 19:10:47 +00:00
Gerald Combs
0fa6a4c421 Allow editing via the advanced preferences tree. Double-clicking an
item's name, status, or type resets it to its default value.
Double-clicking the item's value lets you edit it. Implement the
advanced search field. (Clicking OK and Cancel still doesn't yet do
anything.)

Note that we could probably use a
prefs_register_{uint16|port}_preference routine for 16-bit values. Make
reset_pref public. Update some names and descriptions.

svn path=/trunk/; revision=46986
2013-01-07 19:13:03 +00:00
Alexis La Goutte
b6d08dca21 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46981
2013-01-06 19:42:11 +00:00
Anders Broman
9520710d83 Use gdk_cairo_set_source_rgba and GdkRGBA
svn path=/trunk/; revision=46977
2013-01-06 17:13:48 +00:00
Anders Broman
69c0967fc7 Use gdk_cairo_set_source_rgba
svn path=/trunk/; revision=46976
2013-01-06 16:58:21 +00:00
Anders Broman
6740bef97e Use gdk_cairo_set_source_rgba and GdkRGBA
svn path=/trunk/; revision=46975
2013-01-06 16:36:22 +00:00
Anders Broman
ecd019e2e1 Use GdkRGBA colors directly in the array
svn path=/trunk/; revision=46974
2013-01-06 16:22:59 +00:00
Alexis La Goutte
9452b89de5 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46970
2013-01-06 14:51:17 +00:00
Alexis La Goutte
12fbc27e74 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46969
2013-01-06 14:51:08 +00:00
Alexis La Goutte
25e3c84c01 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46968
2013-01-06 14:51:00 +00:00
Bill Meier
93c28b7da1 Rename ws_gtk_grid_attach() to ws_gtk_grid_attach_defaults();
Also: fix a typo in a comment in 'gui_utils.h'

svn path=/trunk/; revision=46951
2013-01-05 15:25:30 +00:00
Gerald Combs
4a3342e4ba Break out preference type names, type descriptions, string
representations, and default status out of write_prefs and into their
own routines. Split the corresponding custom preference write callbacks.
Fix an apparent memory leak in the hidden column callback.

Add an initial preferences dialog to the Qt port. Use the new preference
routines to implement an "Adavanced" page similar to the "about:config"
page available in many web browsers. Standard pages will hopefully follow
soon.

Remove some QDebug includes and make sure our QTreeWidgets have uniform
row heights set.

svn path=/trunk/; revision=46942
2013-01-05 02:30:58 +00:00
Anders Broman
c16ab7b57e Use gdk_cairo_set_source_rgba
svn path=/trunk/; revision=46940
2013-01-04 21:10:00 +00:00
Bill Meier
20ee953a8b Fix a minor difference in window handling between Gtk2 & Gtk3:
Use gtk_box_pack_start() instead of gtk_container_add()
   in several places.


svn path=/trunk/; revision=46938
2013-01-04 20:27:29 +00:00
Bill Meier
5a68029ae3 Use ws_gtk_grid...() instead of gtk_table...();
Fix minor differences in window handling between Gtk2 & Gtk3:
   Use gtk_box_pack_start() instead of gtk_container_add() in
   various places.

Also; Do some whitespace and formatting style cleanup.


svn path=/trunk/; revision=46937
2013-01-04 19:27:09 +00:00
Anders Broman
7d1fbc96dc Use gdk_cairo_set_source_rgba
svn path=/trunk/; revision=46935
2013-01-04 17:45:35 +00:00
Anders Broman
ad7f545a50 Fix a cut-and-paste error
svn path=/trunk/; revision=46934
2013-01-04 17:44:38 +00:00
Anders Broman
d9d58c34f2 Add a wrapper for gdk_cairo_set_source_rgba() in GTK2 and use it in io_stat.c
svn path=/trunk/; revision=46932
2013-01-04 17:07:26 +00:00
Bill Meier
886ac9a613 Fix minor differences in window handling between Gtk2 & Gtk3:
Use gtk_box_pack_start() instead of gtk_container_add() in several places.

Also; Do some whitespace and formatting style cleanup.


svn path=/trunk/; revision=46931
2013-01-04 15:57:44 +00:00
Pascal Quantin
deb4f08cb2 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8105 :
Allow use of huges values for localtime / ctime / gmtime with MSVC 2008 or later

svn path=/trunk/; revision=46930
2013-01-04 14:56:27 +00:00
Anders Broman
38fdbeeb7e Apply 46903 to iax_analysis
svn path=/trunk/; revision=46929
2013-01-04 09:13:05 +00:00
Michael Mann
86d690880f replace "unsigned" datatype with "guint". Some mpeg files needed "unsigned int" instead.
bugs 7825-7827 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7825)

svn path=/trunk/; revision=46928
2013-01-04 05:22:43 +00:00
Bill Meier
0db3dd6be3 Use ws_gtk_grid...() in place of gtk_table...();
Add an XXX comment as to an apparent limit on the
 number of characters in a tooltip (at least in one case).

Do some minor whitespace and long-lines cleanup.

svn path=/trunk/; revision=46921
2013-01-03 19:54:02 +00:00
Bill Meier
4f01a9c89e Use ws_gtk_grid...() instead of gtk_table...();
Fix a minor difference in window handling between Gtk2 & Gtk3:
   Use gtk_box_pack_start() instead of gtk_container_add() in one case.

Also; Do some whitespace and formatting style cleanup.

svn path=/trunk/; revision=46920
2013-01-03 18:49:58 +00:00
Bill Meier
4ae567e978 Use ws_gtk_grid...() instead of gtk_table...();
Set the default window size to show the complete window;
Fix a minor difference in window handling between Gtk2 & Gtk3:
   Use gtk_box_pack_start() instead of gtk_container_add() in one case.

Also; misc minor cleanup.

svn path=/trunk/; revision=46918
2013-01-03 17:53:40 +00:00
Bill Meier
5e8c774ce7 Replace use of gtk_table...() by ws_gtk_grid...().
svn path=/trunk/; revision=46917
2013-01-03 17:01:49 +00:00
Bill Meier
936626b160 Use ws_gtk_grid...() in place of gtk_table...();
Also: Fix a minor difference in window handling between Gtk2 & Gtk3:
  Use gtk_box_pack_start() instead of gtk_container_add(0 in one case.


svn path=/trunk/; revision=46915
2013-01-03 16:26:20 +00:00
Bill Meier
add135b901 Replace use of gtk_table...() by ws_gtk_grid...().
Untested (since I don't know Lua) (but should be Ok).

svn path=/trunk/; revision=46914
2013-01-03 15:50:10 +00:00
Anders Broman
df50a668b1 From Chris Maynard Wireshark crashes when attempting to obtain help from various dialogs
svn path=/trunk/; revision=46912
2013-01-03 10:49:32 +00:00
Gerald Combs
430e97c866 Move the font preferences to the colors pane and change its name to
"Font and Colors". Use a GtkFontButton to select the font and update the
sample text accordingly. Instead of attempting to resize the sample
color text (which didn't appear to work) scroll to the text that matches
the current combo box selection.

svn path=/trunk/; revision=46909
2013-01-03 01:02:30 +00:00
Bill Meier
98c8897f26 Use ws_gtk_grid...() in place of gtk_table...();
Also: Fix a minor difference in window handling between Gtk2 & Gtk3:
  Use gtk_box_pack_start() instead of gtk_container_add(0 in one case.

svn path=/trunk/; revision=46908
2013-01-02 23:36:16 +00:00