summaryrefslogtreecommitdiff
path: root/ui/qt/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2015-01-06Qt: Add a context menu to the packet list header.Gerald Combs1-0/+2
Don't carry over the sort items from the GTK+ UI (for now, at least). Update some names. Add a column editor frame similar to the "Go to Packet" and "Search" frames. Change-Id: I1bd3834a26994de96894d2b7512bce2c19915c77 Reviewed-on: https://code.wireshark.org/review/6277 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-01Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack.Guy Harris1-1/+0
Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6 Reviewed-on: https://code.wireshark.org/review/6199 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-09Qt: Initial VoIP Calls dialog.Gerald Combs1-0/+2
Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at the top, since that seems to be the primary item. Add configure-time checks for QtMultimediaWidgets in anticipation of adding a VoIP playback dialog. Add an icon for the playback button. (Yes, I've been avoiding GNOME-level gratuitous icons so far but this is one of the rare occiasions where it makes sense.) Add a help link define for the VoIP calls dialog. Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050 Reviewed-on: https://code.wireshark.org/review/5674 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-09Qt: Update and rename the summary dialog.Gerald Combs1-2/+2
Go back to a single view similar to the GTK+ UI. Apply layouts using Qt Designer. Rename the menu item and class to "Capture File Properties". It's not really a summary if it contains details such as "marked average bits per second". We might want to move this to a "Properties" item under the "File" menu similar to other applications. Add the GTK+ summary icon (for now) to the toolbar and open the properties dialog on clicking. Singleton dialogs delenda est[1]. Let the user open as many summaries on as many capture files as he or she wishes. Also, global cfile delenda est[2]. Don't blindly include QtGui. Add specific components instead. Use consistent method names, variable names, and patterns. Try to document what "consistent" means. Adjust the way we display some statistics to match the summary bar, e.g. displayed = captured if we don't have a filter applied. [1] Not really. [2] Yes, really. Change-Id: I11793b1d79dd0c3f70414ac8592b86181da59916 Reviewed-on: https://code.wireshark.org/review/5274 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-05Allow the environment variable RCC to set before running configure toStephen Fisher1-1/+1
allow for unusual paths for Qt's rcc program (FreeBSD ports puts it in /usr/local/lib/qt5/bin). This matches the existing functionality of the MOC and UIC variables/programs. Change-Id: I885d61bce54d9e893e0c2fc496a9ff767a096ae6 Reviewed-on: https://code.wireshark.org/review/5139 Petri-Dish: Stephen Fisher <stephenfisher@centurylink.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
2014-09-05Qt: Refactor ConversationDialog for endpoints.Gerald Combs1-2/+2
Create a TrafficTableDialog (for lack of a better name) parent class from the general parts of ConversationDialog. Use it to create EndpointsDialog. Move the contents of conversation_tree_widget.{cpp,h} to conversation_dialog.{cpp,h} to match endpoint_dialog and traffic_table_dialog. Fill in GeoIP columns dynamically instead of using a hard-coded limit. Use "endp_" and "ENDP_" prefixes for a lot of endpoint variables and defines. Try to make geoip_db_lookup_ipv4 and geoip_db_lookup_ipv6 more robust. Clean up some includes. Fix a shadowed variable. Change-Id: I23054816ac7f8c6edb3b1f01c8536db37ba4122d Reviewed-on: https://code.wireshark.org/review/3462 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-1/+1
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>
2014-08-31Remove make-tapreg-dotc and its uses, since Python is now mandatoryРоман Донченко1-8/+3
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>
2014-08-05Windows: Manage remote interfacesIrene Ruengeler1-0/+4
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>
2014-07-21[WIP] Add a conversation dialog.Gerald Combs1-0/+2
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>
2014-07-02Manage InterfacesIrene Ruengeler1-0/+2
- 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>
2014-06-12Capture Interfaces Dialog:Irene Ruengeler1-0/+2
- 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>
2014-05-04GUI modules for LBM aka 29West dissectors.David Ameiss1-0/+8
bug:9718 Change-Id: I05330d8a2475ad0d238723d444f3d98bdbd7be39 Reviewed-on: https://code.wireshark.org/review/1041 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-2/+4
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-07Add a Qt I/O Graph dialog.Gerald Combs1-0/+2
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>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-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>
2014-03-16Remove Visual Studio solution and project files (and their existence from ↵Michael Mann1-1/+0
Makefiles) There have been discussions on -dev about removing this and I believe I was the last holdout. Finally convinced that I should just have a local copy (ignored by git) Change-Id: Ic72a22baf58e3412023cf851f0fce16eb07113b0 Reviewed-on: https://code.wireshark.org/review/681 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-12Add Export PDU Dialog (Wireshark Qt)Alexis La Goutte1-0/+2
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>
2014-01-02Add About window for Wireshark QtAlexis La Goutte1-0/+2
svn path=/trunk/; revision=54557
2013-12-13Fix typoIrene Rüngeler1-1/+1
svn path=/trunk/; revision=54037
2013-12-13Add sctp files to Makefile.amIrene Rüngeler1-0/+12
svn path=/trunk/; revision=54033
2013-11-29When clean remove also *.moc.cpp / *.rrc.ccp and ui_*.h ...Alexis La Goutte1-3/+6
svn path=/trunk/; revision=53639
2013-11-25From Thomas ERSFELD (GSoC13) : Add Capture interface dialog windowAlexis La Goutte1-0/+2
* 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
2013-11-22Add an initial "Decode As" dialog. Currently read-only.Gerald Combs1-0/+2
Fixup some of the Statistics menu items. svn path=/trunk/; revision=53499
2013-11-21Fix buildbing ui/qt/wireshark-tap-register.c with autotools.Gerald Combs1-3/+3
svn path=/trunk/; revision=53467
2013-11-21Add a statistics tree dialog.Gerald Combs1-0/+27
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
2013-10-28From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9341 :Jeff Morriss1-0/+1
SVN rev 50525 tried to fix out-of-source-tree builds, but did so by writing the .rcc.cpp files to the source tree. This was noticed when running `make distcheck`. This patch reverts that behavior, and creates the image/ directory to fix out-of-tree builds. In other words, fix things so "make distcheck" with Qt works in out-of-tree builds too. svn path=/trunk/; revision=52926
2013-10-24Add a missing dependency.Gerald Combs1-0/+2
svn path=/trunk/; revision=52825
2013-10-18Simplify a bit (in a way which will hopefully actually work): just don't add ↵Jeff Morriss1-2/+3
-Wshorten-64-to-32 to CXXFLAGS. Also, add AM_CLEAN_FLAGS to AM_CXXFLAGS, not AM_CPPFLAGS. svn path=/trunk/; revision=52676
2013-10-18Add -Wno-shorten-64-to-32 (if we can) when compiling the Qt UI.Jeff Morriss1-1/+2
svn path=/trunk/; revision=52674
2013-10-18Add AM_CLEAN_CFLAGS (-Werror) to AM_CPPFLAGS so we get notified of warnings inJeff Morriss1-1/+2
the C++ stuff. ui/qt/CMakeLists.txt adds -Wno-shorten-64-to-32 on 64-bit systems but it doesn't seem necessary on Fedora 18 (64-bit). Leaving it out for now--let's see what others say... svn path=/trunk/; revision=52673
2013-09-30Strip out references to PortAudio. Qt has its own audio module (Phonon).Gerald Combs1-1/+1
We'll presumably use that. svn path=/trunk/; revision=52282
2013-09-09Another "this depends on a ui_XXX.h" required to force the ui_XXX.h toGuy Harris1-0/+2
be built. svn path=/trunk/; revision=51897
2013-08-27QCustomPlot is C++, not C.Guy Harris1-0/+2
Additional changes needed for the TCP stream UI code. svn path=/trunk/; revision=51544
2013-07-26Add missing ui_uat_dialog.h dependency.Evan Huus1-0/+2
The fact that we're listing these manually is kind of ugly... svn path=/trunk/; revision=50898
2013-07-15Use PIE_CFLAGS when building qt-shark, since otherwise I get errors like:Evan Huus1-1/+1
/usr/include/qt5/QtCore/qglobal.h:1079:4: error: #error "You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC or -fPIE." There is almost certainly a better way to do this: I'm cheating here because I don't know enough about autofoo, and it seems to work. I suspect we should be checking PIE for the C++ compiler separately (since presumably they're not guaranteed to be related like gcc/g++ are). I also suspect we should only be building with it in the first place if Qt really needs it, though I have no idea how to check that. The qt docs I've found suggest that qt5's cmake module has a flag for it, but autofoo is never mentioned... svn path=/trunk/; revision=50645
2013-07-09From Thomas ERSFELD (GSOC13) via ↵Alexis La Goutte1-0/+2
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-02-14main_window_slots.cpp includes ui_main_window.h, so make sure we buildGuy Harris1-1/+1
ui_main_window.h before doing anything with main_window_slots.cpp. svn path=/trunk/; revision=47659
2013-02-09Put NODIST_ at the beginning of macro names, as was done for the pluginsGuy Harris1-5/+5
directory. svn path=/trunk/; revision=47599
2013-02-08Add module_preferences_scroll_area.*.Gerald Combs1-0/+2
svn path=/trunk/; revision=47546
2013-02-06Remove some unnecessary definitions.Gerald Combs1-3/+0
svn path=/trunk/; revision=47526
2013-02-06Add filter expressions frame entries.Gerald Combs1-0/+2
svn path=/trunk/; revision=47523
2013-02-05Prettify Qt build output.Gerald Combs1-3/+18
svn path=/trunk/; revision=47484
2013-02-03Sigh. At least on my Fedora 16 with KDE, the Qt 4 versions of uic andGuy Harris1-3/+3
moc are called uic-qt4 and moc-qt4. Look for them by names, plural. svn path=/trunk/; revision=47457
2013-02-01Add interface prefs. Adjust some spacing and resize behavior.Gerald Combs1-0/+2
svn path=/trunk/; revision=47403
2013-01-24Add font and color preferences. Unfortunately Qt doesn't have a colorGerald Combs1-0/+2
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-23Add column preferences.Gerald Combs1-0/+2
svn path=/trunk/; revision=47231
2013-01-21Add UI_FILES list (more easy to use when add a new ui files...)Alexis La Goutte1-16/+1
svn path=/trunk/; revision=47198
2013-01-21Add layout_preferences_frame.ui.Gerald Combs1-0/+1
svn path=/trunk/; revision=47191
2013-01-21Add an initial layout preference pane. Set SVN properties.Gerald Combs1-0/+2
svn path=/trunk/; revision=47190
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-09 21:20:10 +0000