aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/QtShark.pro
Commit message (Collapse)AuthorAgeFilesLines
* Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs2014-09-021-664/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Remove make-tapreg-dotc and its uses, since Python is now mandatoryРоман Донченко2014-08-311-5/+1
| | | | | | | | | Change-Id: I13fd57a288be68d18819826bf566ed7b5688ebaa Reviewed-on: https://code.wireshark.org/review/3926 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
* Extcap Capture InterfaceRoland Knall2014-08-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extcap is a plugin interface, which allows for the usage of external capture interfaces via pipes using a predefined configuration language which results in a graphical gui. This implementation seeks for a generic implementation, which results in a seamless integration with the current system, and does add all external interfaces as simple interfaces. Windows Note: Due to limitations with GTK and Windows, a gspawn-winXX-helper.exe, respective gspawn-winXX-helper-console.exe is needed, which is part of any GTK windows installation. The default installation directory from the build is an extcap subdirectory underneath the run directory. The folder used by extcap may be viewed in the folders tab of the about dialog. The default installation directory for extcap plugins with a pre-build or installer version of wireshark is the extcap subdirectory underneath the main wireshark directory. For more information see: http://youtu.be/Nn84T506SwU bug #9009 Also take a look in doc/extcap_example.py for a Python-example and in extcap.pod for the arguments grammer. Todo: - Integrate with Qt - currently no GUI is generated, but the interfaces are still usable Change-Id: I4f1239b2f1ebd8b2969f73af137915f5be1ce50f Signed-off-by: Mike Ryan <mikeryan+wireshark@lacklustre.net> Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net> Signed-off-by: Roland Knall <rknall@gmail.com> Reviewed-on: https://code.wireshark.org/review/359 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Windows Qt: Add taskbar progress supportGerald Combs2014-08-131-1/+3
| | | | | | | | | | | Add support for the taskbar progress indicator on Windows via QtWinExtras. It is almost as if we're a grown up Windows application. Change-Id: I378206b49510d4bd08f2437d8e9a1b01bc6f1351 Reviewed-on: https://code.wireshark.org/review/3576 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Use an explicit path for stats_tree_dialog.cpp.Tim Furlong2014-08-111-1/+1
| | | | | | | | | | | | Change the entry for stats_tree_dialog.cpp in ui/qt/QtShark.pro to have a relative "../qt/" path, so that Qt Creator can find it from its build...-release temporary directory. Change-Id: I8fa40e15a7fbb643d5565e216ce92f73afcd4871 Reviewed-on: https://code.wireshark.org/review/2340 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
* Windows: Manage remote interfacesIrene Ruengeler2014-08-051-0/+8
| | | | | | | | | | Add remote interfaces to capture from a remote host. Change-Id: I34e31d865304f3c6dd972ab9ab1c23829d564665 Reviewed-on: https://code.wireshark.org/review/3405 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Move the AirPcap stuff into caputils.Guy Harris2014-08-011-1/+0
| | | | | | Change-Id: I64b45dad36a3ec491aeb9de3439b4fe19b46f9d8 Reviewed-on: https://code.wireshark.org/review/3308 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Ensure that QT5_BASE_DIR is known by QtShark.proPascal Quantin2014-07-291-1/+1
| | | | | | | | | | | | Otherwise the call to winqtdeploy will fail if it is not already in the PATH Change-Id: I74db604a6fd45204bda8d6ac9d9c98c0c12598ec Reviewed-on: https://code.wireshark.org/review/3218 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
* [WIP] Add a conversation dialog.Gerald Combs2014-07-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Items are sorted by value. Move common conversation code to ui/conversation_hash.[ch]. Add a conversation_type_e enum along with convenience functions for fetching titles, tap names, etc. We have a single main dialog instead of a main dialog + individual protocol dialogs. It de-clutters the statistics menu and results in simpler code. Conversation type tabs can be added and removed within the dialog itself. The tab list is sticky and saved with the current profile when the dialog closes. Data can be copied as CSV or YAML. Add a FilterAction class and a corresponding filterAction slot to MainWindow. Use it for the Conversations context menu. Add an addressResolutionChanged signal and related plumbing. Get rid of the iterator members in the conversation item struct. Update the GTK+ code accordingly. Excercise for the reader: - Update TShark to use the common hash code. Ping-Bug: 9231 Ping-Bug: 8703 Ping-Bug: 6727 Change-Id: I8728d771fc5b1a85937bed9d898e53c3ecc3a544 Reviewed-on: https://code.wireshark.org/review/2987 Reviewed-by: Michael Mann <mmann78@netscape.net>
* start support for the Japanese language in the Qt versionMartin Kaiser2014-07-201-0/+1
| | | | | | | | | just the framework and some simple translations Change-Id: I7653a9c6ab26b391bfe2942d088d233996030576 Reviewed-on: https://code.wireshark.org/review/3134 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* GTK Remote CapturingIrene Ruengeler2014-07-111-2/+0
| | | | | | | | Move the GTK files necessary for managing the recnet remote host from capture_dlg.c to recent.c in order to use them in QT, too. Change-Id: I3f3fd31ce928162de08c6db7309ef2a9b1e97760 Reviewed-on: https://code.wireshark.org/review/2955 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Revert "See if we can get rid of the "lib" in front of "wsutil" on Windows."Guy Harris2014-07-101-2/+2
| | | | | | | | | | This reverts commit c5a50df51f38e10e3a3618d9394364f60a1ca8af. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I6ead152fc308480d02266b0f3f0caaa873caf6d2 Reviewed-on: https://code.wireshark.org/review/2973 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* See if we can get rid of the "lib" in front of "wsutil" on Windows.Guy Harris2014-07-091-2/+2
| | | | | | | | | "libXXX" is a UN*X convention; see whether we can do without it on Windows. Change-Id: I03a377ed5121a8dff7a53203b34e441abffcbb85 Reviewed-on: https://code.wireshark.org/review/2968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Add missing /AndersBroman2014-07-041-1/+1
| | | | | | Change-Id: I84758200bce592f84547bff84f02d743327baa03 Reviewed-on: https://code.wireshark.org/review/2848 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Move utility routines for capturing into a libcaputils static library.Guy Harris2014-07-041-8/+5
| | | | | | | | | Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Remove accidental trailing \Evan Huus2014-07-041-1/+1
| | | | | | Change-Id: I84e6aa71e31528b2949e68f0f07778fb9e26379e Reviewed-on: https://code.wireshark.org/review/2839 Reviewed-by: Evan Huus <eapache@gmail.com>
* Sort by name list of fileAlexis La Goutte2014-07-041-15/+16
| | | | | | | | fix also indent (use spaces) Change-Id: I06234936c3128f7aa21a345415d7e420135dd601 Reviewed-on: https://code.wireshark.org/review/2824 Reviewed-by: Evan Huus <eapache@gmail.com>
* Manage InterfacesIrene Ruengeler2014-07-021-3/+6
| | | | | | | | | | | | | - Add dialog to manage interfaces - Add and delete pipes - Hide local interfaces Change-Id: I08323c306c2ea736f99e57c28e2fe3170a0c2216 Reviewed-on: https://code.wireshark.org/review/2613 Tested-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
* Fix the QT build on Qt 5.3 or later to use the windeployqt toolGraham Bloice2014-07-011-7/+16
| | | | | | | | | | | | | | | | | | | to copy the rquired Qt files into the runtime directory Qt 5.2 is broken as windeployqt doesn't take the required --release flag Also fix the passing of GCC_DLL and GPGERROR_DLL into config.pri so that the Qt build copies the required files instead of the entire gnutls bin dir twice (the variables expanded to nothing). Add support for autodetection of Qt 5.3.0 with msvc2013 Change-Id: I1e9c70a5ff5d1fdfdce88ba15d324f1899c8129c Reviewed-on: https://code.wireshark.org/review/2734 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Move filters.[ch] to libui.Guy Harris2014-06-301-1/+0
| | | | | | Change-Id: I32f04016498dfe8f54b0480f30a84ffe5ef7868f Reviewed-on: https://code.wireshark.org/review/2727 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Move proto_hier_stats.[ch] to libui.Guy Harris2014-06-301-1/+0
| | | | | | Change-Id: Ib7c0617d88bf92cad0ac877176001d29960f1cd8 Reviewed-on: https://code.wireshark.org/review/2725 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Move capture.[ch] to libui.Guy Harris2014-06-301-1/+0
| | | | | | Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0 Reviewed-on: https://code.wireshark.org/review/2711 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Move capture_ui_utils.[ch] to libui.Guy Harris2014-06-301-1/+0
| | | | | | Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a Reviewed-on: https://code.wireshark.org/review/2708 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* clopts_common.c is now part of wsutil.Guy Harris2014-06-301-1/+0
| | | | | | Change-Id: I474443567e83cab83e4859a4d89a19a8904e08f8 Reviewed-on: https://code.wireshark.org/review/2707 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* List elided_label.h only once.Irene Ruengeler2014-06-251-1/+0
| | | | | | Change-Id: Ibd00e55fb31d571b0b1f6f1c4595a35835e22d4d Reviewed-on: https://code.wireshark.org/review/2641 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Another capchild.lib -> libcapchild.lib.Guy Harris2014-06-241-1/+1
| | | | | | Change-Id: I4c7750f05c831f12d0d34e2edf0d982d501d90d8 Reviewed-on: https://code.wireshark.org/review/2610 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Add libcapchild, remove the files that are now in it.Guy Harris2014-06-241-4/+2
| | | | | | Change-Id: I79c16bbea47e507859c904e4142fc06fa6bfc127 Reviewed-on: https://code.wireshark.org/review/2606 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* [WIP] qt: Add support for Polish languageMichal Labedzki2014-06-231-0/+1
| | | | | | Change-Id: Ib63937e741b737f171a9b383a9cbabb55dfdd8ef Reviewed-on: https://code.wireshark.org/review/2553 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
* cfutils.c is now part of libwsutils.Guy Harris2014-06-211-1/+0
| | | | | | Change-Id: I86ab5f5890a10cc8475f5e9bee4c4f7c89dfb8bc Reviewed-on: https://code.wireshark.org/review/2521 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Capture Interfaces Dialog:Irene Ruengeler2014-06-121-0/+3
| | | | | | | | | | | | | | - allow to change the interface options in the table - save the options to preferences when the dialog is left - add a field for setting a capture filter for all selected interfaces - add a "Compile BPF" button and a window to show the compiled filter output - try to address Alexis' and Evan's comments Change-Id: Ic1272e29183ec80e2d2f4b3e494c79dabe2c3b6f Reviewed-on: https://code.wireshark.org/review/1946 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin2014-06-061-2/+5
| | | | | | Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
* GUI modules for LBM aka 29West dissectors.David Ameiss2014-05-041-0/+12
| | | | | | | bug:9718 Change-Id: I05330d8a2475ad0d238723d444f3d98bdbd7be39 Reviewed-on: https://code.wireshark.org/review/1041 Reviewed-by: Michael Mann <mmann78@netscape.net>
* Add a Qt I/O Graph dialog.Gerald Combs2014-04-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each graph you can set: - Its visibility - A name - A display filter - Color, from a fixed list - Plot style: Line, Impulse, Bar, Stacked Bar, Dot, Square, Diamond - Basic Y Axes (packets/s, bytes/s, bits/s) - Computed Y Axes (SUM, MIN, AVG, MAX) - Smoothing You can pan and zoom using the mouse and keyboard. Clicking on a graph selects the last packet for that interval. If all graphs have the same Y axis a single label is shown, otherwise a legend is shown. The time scale (X axis) can be toggled between relative seconds and the time of day. Graphs can be saved as PDF, PNG, BMP, and JPEG. Settings are "sticky" via the io_graphs UAT. To do: - Minimize graph drawing delays. - Figure out why smoothing differs from GTK+ - Everything else at the top of io_graph_dialog.cpp - Fix empty resets. A fair amount of code was copied from TCPStreamDialog. We might want to subclass QCustomPlot and place the shared code there. Move common syntax checking to SyntaxLineEdit. Move some common code from ui/gtk/io_stat.c to ui/io_graph_item.[ch] and use it in both GTK+ and Qt. Make the io_graph_item_t array allocation in io_stat.c static. The behavior should be identical and this gives us additional compile-time checks. Change-Id: I9a3d544469b7048f0761fdbf7bcf20f44ae76577 Reviewed-on: https://code.wireshark.org/review/435 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
* Continue to remove $Id$ from top of fileAlexis La Goutte2014-03-311-2/+0
| | | | | | | | (Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Upgrade Windows builds to Lua 5.2.1Pascal Quantin2014-03-291-1/+1
| | | | | | | Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e Reviewed-on: https://code.wireshark.org/review/863 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
* Add Export PDU Dialog (Wireshark Qt)Alexis La Goutte2014-03-121-0/+3
| | | | | | | | Rebase with last change and add Logcat export Change-Id: Idc9b444b1bf14b95ff60e8466e94f7eecd875b47 Reviewed-on: https://code.wireshark.org/review/14 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Add About window for Wireshark QtAlexis La Goutte2014-01-021-0/+4
| | | | svn path=/trunk/; revision=54557
* Add the header files only once.Irene Rüngeler2013-12-171-6/+0
| | | | svn path=/trunk/; revision=54165
* Add dialogs and graphs to analyse SCTP behavior similar to the GTK version.Irene Rüngeler2013-12-131-0/+24
| | | | svn path=/trunk/; revision=54026
* Fix the path to dumpcap.Gerald Combs2013-12-121-1/+1
| | | | svn path=/trunk/; revision=53957
* Remove the checks for ../../lib. If it still exists it likely means thatGerald Combs2013-12-121-10/+1
| | | | | | there's a stale LIBRARY_OUTPUT_PATH in CMakeCache.txt. svn path=/trunk/; revision=53956
* Update library searches to reflect r53780.Gerald Combs2013-12-121-1/+10
| | | | svn path=/trunk/; revision=53955
* Link with -lcodecs on UN*X as well. Link with -lwsutil afterGuy Harris2013-12-021-1/+1
| | | | | | | | -lwireshark, -lwiretap, and -lcodecs, just in case the linker requires that, if library A uses something from library B, library B be read after library A. svn path=/trunk/; revision=53736
* We need to link with the codecs library.Guy Harris2013-12-021-1/+1
| | | | svn path=/trunk/; revision=53713
* From Thomas ERSFELD (GSoC13) : Add Capture interface dialog windowAlexis La Goutte2013-11-251-0/+3
| | | | | | | | | | | * Reuse sparkline from welcome * Split settings in tab (!= GTK) * No all feature work (Work In Progress...) * ... Comments (and review) are welcome ! svn path=/trunk/; revision=53563
* Fix qmake builds on Unix.Gerald Combs2013-11-221-2/+1
| | | | | | | tap_register.variable_out adds wireshark-tap-register.c to SOURCES. We don't have to add it again ourselves. svn path=/trunk/; revision=53502
* Add an initial "Decode As" dialog. Currently read-only.Gerald Combs2013-11-221-0/+3
| | | | | | Fixup some of the Statistics menu items. svn path=/trunk/; revision=53499
* Try to get qmake to create wireshark-tap-register.c.Gerald Combs2013-11-211-1/+21
| | | | svn path=/trunk/; revision=53466
* Add a statistics tree dialog.Gerald Combs2013-11-211-0/+3
| | | | | | | | | | | | Add menu items for each corresponding item in gtk/main_menubar.c that calls gtk_stats_tree_cb(). Hopefully that's everything. Note that we use quite a bit less code than the GTK+ flavor and why we might not want to do that. Change a few things in ui/qt/CMakeLists.txt to more closely match the GTK+ version. Add plumbing for tap registrations in CMakeLists.txt and Makefile.am. Add the ability to copy text as CSV or YAML. svn path=/trunk/; revision=53464
* Create a plural-only English translation. Use it to pluralize the FollowGerald Combs2013-11-141-2/+4
| | | | | | Stream and Flow Graph hint statistics. svn path=/trunk/; revision=53326
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 20:40:46 +0000