Commit graph

1288 commits

Author SHA1 Message Date
Bill Meier
7dfa337910 Add a few consts to fix some compiler (GCC) errors.
svn path=/trunk/; revision=46849
2012-12-29 20:56:11 +00:00
Bill Meier
22447e47e7 Add a vertical scrollbar to the summary dialog window.
(The window has gotten pretty tall;
 Creating a multiline 'Capture File Comments'" entry
 may make the buttons inaccessible w/o a scrollbar).

##backport 1.8

svn path=/trunk/; revision=46844
2012-12-29 19:07:48 +00:00
Gerald Combs
f3e41f1b72 Show the current profile name. Fix the packet status.
svn path=/trunk/; revision=46839
2012-12-29 03:56:29 +00:00
Gerald Combs
07571afb77 Fix distcheck.
svn path=/trunk/; revision=46838
2012-12-29 03:31:49 +00:00
Gerald Combs
cce0d8451c Add profile_dialog.
svn path=/trunk/; revision=46837
2012-12-29 02:58:56 +00:00
Gerald Combs
94d8ae945b Try to fix compilation on Windows.
svn path=/trunk/; revision=46836
2012-12-29 02:55:16 +00:00
Gerald Combs
a562691080 Profile switching works when we have a capture file open so go ahead and
enable it.

svn path=/trunk/; revision=46835
2012-12-29 01:42:01 +00:00
Gerald Combs
5bd252c44f Remove some duplicate code from ui/profile.c and move in more code from
ui/gtk/profile_dialog.c. Use the correct profile list in
profile_dialog.c so that deletion works.

Add a profile dialog to the Qt port. For some reason it crashes when
changing configuration profiles, which might be related to bug 7722.
Move the Qt configuration profile initialization from main.cpp to
wireshark_application.cpp. Make sure QMenuBar doesn't grab the
configuration profiles action on OS X. Add more role color names to
tango_colors.h.

svn path=/trunk/; revision=46834
2012-12-29 01:39:02 +00:00
Alexis La Goutte
cdc79cd5e9 Fix [ 76%] Building C object ui/CMakeFiles/ui.dir/profile.c.o ui/profile.c: In function ‘init_profile_list’: ui/profile.c:194:20: error: variable ‘fl_entry’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors
svn path=/trunk/; revision=46824
2012-12-28 14:38:02 +00:00
Alexis La Goutte
c4650d85c6 Fix [76%] Building C object ui/CMakeFiles/ui.dir/profile.c.o ui/profile.c: In function ‘init_profile_list’: ui/profile.c:195:20: error: variable ‘profile’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors
svn path=/trunk/; revision=46823
2012-12-28 14:37:53 +00:00
Gerald Combs
77caa2d86c Remove an unused variable.
svn path=/trunk/; revision=46811
2012-12-27 17:52:50 +00:00
Gerald Combs
e6baf22f8c Make sure our loops terminate.
svn path=/trunk/; revision=46810
2012-12-27 17:23:40 +00:00
Gerald Combs
cbec3bbaf7 Move common profile code to ui/profile.[ch].
svn path=/trunk/; revision=46808
2012-12-27 17:10:51 +00:00
Evan Huus
1fafe099ab Cast away another const warning that only shows up under really recent GCCs.
svn path=/trunk/; revision=46785
2012-12-26 13:18:58 +00:00
Anders Broman
eb34f28b9f if 0 out debug code
svn path=/trunk/; revision=46784
2012-12-26 12:34:08 +00:00
Anders Broman
369fe110c2 if 0 out debug code
svn path=/trunk/; revision=46783
2012-12-26 12:31:50 +00:00
Anders Broman
fe7a2570db Move summary related stuff to summary_dlg
svn path=/trunk/; revision=46782
2012-12-26 12:29:43 +00:00
Guy Harris
6255cc03f0 Fix another discarded qualifier error.
Remove some redundant declarations/definitions from
ui/gtk/capture_dlg.h.

svn path=/trunk/; revision=46780
2012-12-26 12:24:55 +00:00
Guy Harris
ea888f9113 Squelch some more discarding-qualifiers warnings.
svn path=/trunk/; revision=46771
2012-12-26 11:27:21 +00:00
Guy Harris
4fc5688f87 simple_dialog_primary_start() and simple_dialog_primary_end() are now
declared as returning const char *s; make it so.

svn path=/trunk/; revision=46767
2012-12-26 10:33:02 +00:00
Guy Harris
ce0d04c6d2 Hopefully this case is OK in C++; bit-fields can't be enums in standard
C, so....

svn path=/trunk/; revision=46764
2012-12-26 09:59:18 +00:00
Guy Harris
8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Guy Harris
97937db263 The inverse of GINT_TO_POINTER() is GPOINTER_TO_INT(); use it. That
squelches some warnings.

svn path=/trunk/; revision=46729
2012-12-24 23:12:34 +00:00
Guy Harris
da24fe83a0 The inverse of GINT_TO_POINTER() is GPOINTER_TO_INT(); use it (this
squelches some warnings).

svn path=/trunk/; revision=46728
2012-12-24 23:11:38 +00:00
Guy Harris
d2a22e242d Cast away warnings implicit 64-bit-to-32-bit conversions. (We should
probably have routines that convert strings to numbers and do range
checks, and should also ignore values in the recent and preferences
files that are out of range.)

Cast a string to "char *" to squelch an otherwise-unavoidable warning
about qualifiers being ignored.

The media type for raw binary data is application/octet-stream, not
application octet_stream.

svn path=/trunk/; revision=46727
2012-12-24 23:10:18 +00:00
Guy Harris
74f668444e Use the types that PortAudio specifies for values passed to or returned
from PortAudio; that squelches some implicit 64-bit-to-32-bit conversion
warnings.

Mark unused arguments with _U_ rather than adding fake usages for them.

svn path=/trunk/; revision=46717
2012-12-23 10:18:43 +00:00
Gerald Combs
9a9fd20ece Add ui_packet_comment_dialog.h and ui_time_shift_dialog.h.
svn path=/trunk/; revision=46711
2012-12-23 05:11:49 +00:00
Gerald Combs
a5d5162826 Qt: Implement packet comments. Fix packet detail updates.
GTK+: Shorten the packet comment menu item name.  Remove a couple of
unneeded includes.

Both: Add an arbitrary 20 MB limit when fetching all packet comments.
Use a color from the Tango palette for comments.

svn path=/trunk/; revision=46709
2012-12-23 04:37:58 +00:00
Gerald Combs
aa347d504f Add the time shift dialog.
svn path=/trunk/; revision=46708
2012-12-23 03:45:35 +00:00
Evan Huus
52aff57285 Remove unneeded initializations, and one redundant if condition.
svn path=/trunk/; revision=46702
2012-12-22 21:14:13 +00:00
Evan Huus
2f63301d1f Remove one unneeded initializer and add one missing initializer, as found
by CppCheck.

svn path=/trunk/; revision=46700
2012-12-22 20:53:09 +00:00
Gerald Combs
896eeaf187 The Wireshark file icon makes more sense than a floppy disk[1]. Switch
back to it and name it "Save" instead of "File".

  [1] http://www.hanselman.com/blog/TheFloppyDiskMeansSaveAnd14OtherOldPeopleIconsThatDontMakeSenseAnymore.aspx

svn path=/trunk/; revision=46696
2012-12-22 17:41:40 +00:00
Gerald Combs
0adca98fb7 R46374 replaced too many GTK_STOCK_SAVEs. Put them back.
svn path=/trunk/; revision=46690
2012-12-22 05:21:46 +00:00
Gerald Combs
238e30bfaf Don't use so much white space.
svn path=/trunk/; revision=46689
2012-12-21 23:57:51 +00:00
Gerald Combs
092d8f21ef Add time shifting to the packet list context menu.
svn path=/trunk/; revision=46685
2012-12-21 19:21:34 +00:00
Gerald Combs
d6d3b1b676 Enable and disable the time shift menu action as needed.
svn path=/trunk/; revision=46683
2012-12-21 18:49:44 +00:00
Gerald Combs
962b4f08f7 Move common time shifting code to ui/time_shift.[ch]. Change the
shifting routines to return an error message on failure or NULL on
success.  Prettify and simplify the layout of the GTK+ time shift
dialog. Make the cancel button work as expected.

Add a time shift dialog to the Qt port. I used a Mad Lib (sentence)
layout. Hopefully that won't make translation too difficult.  For some
reason time shifts aren't immediately shown in the packet detail. This
appears to be a bug in the packet list / packet detail code.

Add warning role color definitions to tango_colors.h and use them.

svn path=/trunk/; revision=46680
2012-12-21 17:37:57 +00:00
Martin Kaiser
8c9f80fccc trivial: clean up ui/gtk/prefs_filter_expressions.c
replace TABs with spaces
   add editor modelines

svn path=/trunk/; revision=46679
2012-12-21 17:07:51 +00:00
Bill Meier
02e201da7b Convert to use new ws_gtk_grid...() wrappers to replace
direct use of Gtktable.

(The first of many conversions ...)

Essentially: the wrappers use GtkTable on Gtk2 and GtkGrid on Gtk3.

svn path=/trunk/; revision=46655
2012-12-21 06:30:55 +00:00
Bill Meier
43df5e02ac Wrapper functions and macros to be used to replace
Wireshark Gtk2 GtkTable code with code providing
 essentially equivalent funtionality on Gtk2 and Gtk3.

 See gui_utils.h for details.

svn path=/trunk/; revision=46654
2012-12-21 06:27:00 +00:00
Gerald Combs
2ae8b65a39 Reduce the spacer height in the "go to" and search frames. Fix the
search frame class.

svn path=/trunk/; revision=46651
2012-12-21 04:42:05 +00:00
Anders Broman
b3dbedd144 From Edwin Groothuis:
IO Stats - Smooth should be per graph.

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

svn path=/trunk/; revision=46631
2012-12-20 13:15:20 +00:00
Evan Huus
4e642fde4c Tweak the order of the UI updates when finishing a live-update capture so that
certain menu items are enabled correctly.

Should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8108

svn path=/trunk/; revision=46629
2012-12-20 04:06:44 +00:00
Evan Huus
b06842274a Remove unused parameter from iousers_process_address_packet
svn path=/trunk/; revision=46628
2012-12-20 03:20:24 +00:00
Michael Mann
072041e3fb Add absolute date options (-ad) for start date/time of conversation in TShark. Bug 1849 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1849)
svn path=/trunk/; revision=46626
2012-12-20 01:19:22 +00:00
Gerald Combs
1208041a4a Try using the system-supplied zlib on OS X.
svn path=/trunk/; revision=46618
2012-12-19 19:04:57 +00:00
Irene Rüngeler
12a6a5dce3 Set the icon for the wireless device if the decription name contains Wi-Fi
svn path=/trunk/; revision=46615
2012-12-19 09:51:20 +00:00
Jeff Morriss
f35a7d2ba7 Set SVN properties
svn path=/trunk/; revision=46609
2012-12-19 02:56:01 +00:00
Gerald Combs
7cf5334332 Add an AccordionFrame class which can animate showing and hiding (except
when we detect a remote connection). Use it for the "go to" and search
frames. Properly detect remote connections in the splash overlay.

svn path=/trunk/; revision=46591
2012-12-18 17:21:20 +00:00
Gerald Combs
77e6140ba9 Implement the frame mark, ignore, and time reference actions. Update the
text of a few menu items.

svn path=/trunk/; revision=46576
2012-12-17 23:03:21 +00:00