Commit Graph

116 Commits

Author SHA1 Message Date
Gerald Combs 1a4033b63b Initial and woefully incomplete flow graph support.
Copy common code from ui/gtk/flow_graph.c and ui/gtk/graph_analysis.[ch]
to ui/tap-sequence-analysis.[ch]. Start using the name "sequence" in
places.

svn path=/trunk/; revision=52824
2013-10-24 22:52:30 +00:00
Gerald Combs a6f406ac5a Strip out references to PortAudio. Qt has its own audio module (Phonon).
We'll presumably use that.

svn path=/trunk/; revision=52282
2013-09-30 07:55:11 +00:00
Gerald Combs a1203de69d Make sure qmake links with zlib on Windows.
svn path=/trunk/; revision=51961
2013-09-12 00:03:47 +00:00
Gerald Combs eb6d67d149 Use the correct GnuTLS include directory.
svn path=/trunk/; revision=51947
2013-09-10 22:25:41 +00:00
Guy Harris 8646abfc17 It's such fun to have four count 'em four different build systems
(autotools, CMake, nmake, qmake).  Throw something at qmake in the hopes
of letting it use GnuTLS in the "follow SSL stream" code.

svn path=/trunk/; revision=51915
2013-09-10 01:18:09 +00:00
Alexis La Goutte 80f9326b2f From Thomas ERSFELD (GSoC13)
Add TCP/UDP/SSL Follow feature to QtShark

Known issue :
* Duplicate code with GTK (function need follow_info_t struct but in GTK there is some GWidget variable in struct)
* Sometimes TCP Follow fail...

svn path=/trunk/; revision=51883
2013-09-09 19:30:30 +00:00
Alexis La Goutte f99f7bf17e From Dean Lee via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8597 Qtshark: Chinese Simp translation
From me :
Add to the (new) Qtshark Language selector

svn path=/trunk/; revision=51871
2013-09-09 17:49:15 +00:00
Gerald Combs 789a4060da Qt5 on Windows needs platforms/qwindows.dll as well.
svn path=/trunk/; revision=51609
2013-08-31 04:18:42 +00:00
Gerald Combs 2e857954a3 Fix NSIS packaging.
svn path=/trunk/; revision=51583
2013-08-30 00:43:51 +00:00
Gerald Combs f1ceee4a2c Add support for Qt5 (tested with 5.1.1).
svn path=/trunk/; revision=51580
2013-08-29 22:15:40 +00:00
Jörg Mayer b30a098dee Add qcustomplot.cpp to Makefile.common and CMakeLists.txt
a few whitespace fixes

svn path=/trunk/; revision=51542
2013-08-27 20:24:20 +00:00
Gerald Combs cbae911dca Remove an attempt to fix a qmake warning.
svn path=/trunk/; revision=51539
2013-08-27 18:37:13 +00:00
Gerald Combs 6d731a3e79 Add TCP sequence number (Stevens-style) graphs.
Add the QCustomPlot widget. Thanks to Emanuel Eichhammer for granting a
license change. Move some common code from ui/gtk/tcp_graph.c to
ui/tap-tcp-stream.[ch]. Get rid of tcp_graph_selected_packet_enabled().
It was only used in the menu code and didn't match what we were doing
elsewhere.

Still quite a bit of work to do but it's a promising start.

svn path=/trunk/; revision=51538
2013-08-27 18:13:20 +00:00
Gerald Combs c3d291754b Correctly reference EXTRA_LIBFILES. Make sure QMAKE_EXTENSION_SHLIB
is set.  Adjust some wildcards.

svn path=/trunk/; revision=51495
2013-08-23 20:47:33 +00:00
Gerald Combs 713012163c Split EXTRA_LIBFILES into EXTRA_LIBFILES and EXTRA_BINFILES. Try using
macdeployqt to build our OS X bundle.

svn path=/trunk/; revision=51480
2013-08-22 22:33:19 +00:00
Gerald Combs 79454ef9fa Add initial capture filter support.
Add CaptureFilterCombo and CaptureFilterEdit classes, similar to their
display filter counterparts. Add a CaptureFilterSyntaxWorker class which
runs a syntax check in a background thread similar to the threaded code
in capture_dlg.c. Add a bunch of related signal and slot plumbing. Other
minor fixups.

svn path=/trunk/; revision=51200
2013-08-08 00:26:57 +00:00
Gerald Combs 6fea3ab734 Make sure we copy our support files to DESTDIR.
svn path=/trunk/; revision=51194
2013-08-07 18:30:21 +00:00
Gerald Combs a05f55bffc Add a UAT dialog. Make UAT preferences uat_t * instead of void *.
C++-ize the UAT headers.

Add an ElidedLabel widget. Use it in the File Set, Profile, and UAT
dialogs.

Update the Qt README.

svn path=/trunk/; revision=50896
2013-07-25 23:49:47 +00:00
Jeff Morriss 3dbade2423 g711.c and u3.c are now in wsutil.
svn path=/trunk/; revision=50657
2013-07-16 02:54:45 +00:00
Jeff Morriss 0a669967fa Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
svn path=/trunk/; revision=50656
2013-07-16 02:35:33 +00:00
Jeff Morriss 54ec53ad1e print.c and ps.c are in libwirshark now.
svn path=/trunk/; revision=50528
2013-07-12 06:08:14 +00:00
Jeff Morriss 60b4764746 disabled_protos.c is in libwireshark now.
svn path=/trunk/; revision=50522
2013-07-12 02:24:25 +00:00
Guy Harris 725a05be3f frame_data_sequence.c and packet-range.c moved to epan.
svn path=/trunk/; revision=50519
2013-07-12 00:42:14 +00:00
Guy Harris 2009a08706 You now have to update three count 'em three files when adding a new
source file at the top level - top-level Makefile.common, top-level
CMakeLists.txt, *and* qui/qt/QtShark.pro.

svn path=/trunk/; revision=50501
2013-07-11 09:45:51 +00:00
Alexis La Goutte 43c3cb4884 From Thomas ERSFELD (GSOC13) via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8710 QtShark doesn't have a statistics summary window
Add Summary Statistics to qtshark (Statistics => Summary)
Now, use tabs to split summary display (File Capture details, Capture Statistics)

Add also Comment Summary tab (to replace Statistics => Comments Summary)

From me :
Fix order of summary files in Qtshark.pro

svn path=/trunk/; revision=50470
2013-07-09 18:08:40 +00:00
Gerald Combs 59644b3899 New Qt feature: Show related packet list items in the frame number
column. Conversation spans (setup frame to last frame) are shown with a
square bracket. Linked frames are shown with a circle.

Use correct column justifications in Qt. Move common
justification-related packet list code to ui/packet_list_utils.[ch].

Add a last_frame element to conversation_t.

svn path=/trunk/; revision=50447
2013-07-08 16:54:18 +00:00
Gerald Combs b2788e5687 Preserve symlinks when copying libraries into the application bundle on
OS X so that it doesn't become excessively large.

svn path=/trunk/; revision=50317
2013-07-02 18:26:52 +00:00
Jeff Morriss 500d399393 Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.
svn path=/trunk/; revision=50165
2013-06-26 02:12:12 +00:00
Jeff Morriss bbf6a3766e Move tempfile.{h,c} into wsutil.
svn path=/trunk/; revision=50163
2013-06-26 01:14:35 +00:00
Jeff Morriss 2259c5c47d There's no need to compile timestats.c any more--it's now in libwsutil.
svn path=/trunk/; revision=50157
2013-06-25 23:34:07 +00:00
Alexis La Goutte b381ca4f58 Fix qt make buildbot step
Qt make don't like cp ../../lib/lib{wireshark,wiretap,wsutil}.* .
cp: cannot stat `../../lib/lib{wireshark,wiretap,wsutil}.*': No such file or directory

svn path=/trunk/; revision=49994
2013-06-17 22:56:35 +00:00
Gerald Combs f5e892cbac Check for QtMacExtras, and if we have it use it to switch to a native
title + toolbar on OS X.

svn path=/trunk/; revision=49873
2013-06-10 21:21:51 +00:00
Gerald Combs 3d59df0ed6 Removing libui_dirty.a in r48976 broke CMake + Qt Creator builds. Fix
it.

svn path=/trunk/; revision=49872
2013-06-10 19:04:13 +00:00
Guy Harris 54ca6dae29 There are clearly not enough different sets of build tools out there, so
it's always nice when there's a new one, especially one that can't share
file lists with others.

Remove capture_unix_ifnames.c from YET ANOTHER build tool file.

svn path=/trunk/; revision=49492
2013-05-22 05:48:11 +00:00
Gerald Combs d83d4accb0 Update QtShark.pro for Qt5, hopefully without breaking Qt4. Enable the
startup blur on OS X for Qt >= 5.

svn path=/trunk/; revision=49036
2013-04-25 21:08:56 +00:00
Gerald Combs dcb3a4a8a5 Add support for software updates. Remove qtshark.rc and use
image/wireshark.rc (which contains resources needed by WinSparkle)
instead.

svn path=/trunk/; revision=48147
2013-03-06 22:04:17 +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
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 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 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
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
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
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
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 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 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
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 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