aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/main_window_slots.cpp
AgeCommit message (Collapse)AuthorFilesLines
2017-07-11Qt: Move all utility widgets to widgets subdirectoryRoland Knall1-2/+2
Move all utility widgets to the widgets subdirectory and add separate source_group for their files Correct some alphabetization in ui/qt/CMakeLists.txt noticed during compare. Change-Id: I2d664edc2b32f126438fb673ea53a5ae94cd43d1 Reviewed-on: https://code.wireshark.org/review/22531 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-07Qt: replace zoom buttons by wheel zoom in Wireless TimelinePeter Wu1-15/+0
There are already "zoom" buttons on the main toolbar, remove the additional, confusing wireless timeline zoom buttons. Implement zoom functionality by the mouse wheel instead and center at the cursor position rather than the current packet. Properly bound the maximum zoom level too to avoid incorrect calculations. Change-Id: Icafe84b6985138b0223abb69c975dfc94df2817a Ping-Bug: 13769 Reviewed-on: https://code.wireshark.org/review/22496 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-06Qt: Add convenience function and cleanupRoland Knall1-15/+8
Add a convenience function for the displayfilter combobox and clean up some code. On Linux, the AltModifier does not work as it is being used by xDMs to move the window around. Setting it to Shift. Change-Id: I1ee9638c1cf37f40dc21f19c4e0860adc4629d4e Reviewed-on: https://code.wireshark.org/review/22529 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-28Qt: Drag/Drop Filter buttons to orderRoland Knall1-0/+20
Allow the ordering of the filter buttons via drag/drop in the toolbar Change-Id: Id8793d6514bae36066a7a23d6890985665e753bd Reviewed-on: https://code.wireshark.org/review/22422 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-28Qt: Change wording of filter button context menuRoland Knall1-4/+4
Change the wording to make it more like the other option menus Change-Id: I0d071aecd80131e5304737a1746f3a41f546c8e4 Reviewed-on: https://code.wireshark.org/review/22441 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-27Qt: Context menu for toolbar filter buttonsRoland Knall1-0/+71
Adds a context menu for the toolbar filter buttons, which allows for opening the preference for the filter buttons, as well as direct edit, removal and disable functionality Change-Id: I5f2d132737c77804cf22834574dfe3c02f85fbdf Reviewed-on: https://code.wireshark.org/review/22327 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-26Fix Filter Tooltip button and frameRoland Knall1-1/+1
Make the frame into a two-row frame to better accomodate the comments field, and reinstate the correct action for the buttons Change-Id: I171e4bc3c7f195b7179cd6b1c2ab4ab42ede9c04 Reviewed-on: https://code.wireshark.org/review/22405 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-26Change display filter button tooltip formatting.Michael Mann1-1/+1
Go from <expression>,<comment> to <comment>\n<expression> Bug: 13814 Change-Id: I842e38798eba7ff87751733ce0b2befdc9c8c27f Reviewed-on: https://code.wireshark.org/review/22395 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-26Add support for comments for a display filter buttonMichael Mann1-1/+9
Add a field to the display filter button UAT to allow comments to be displayed as part of the tooltip to the diplay filter button Bug: 13814 Change-Id: I74459e4102856258d31d6429e2fd924a9f798cd5 Reviewed-on: https://code.wireshark.org/review/22390 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-26Convert filter expressions preference data to a UAT.Michael Mann1-13/+31
The filter expressions data was shoved into the preference file in a very loose, non-arrayed form. It's much easier to manage in code (and for users in a separate file) as a UAT. The GTK GUI was hacked to use the existing UAT dialog rather than rewrite the pref_filter_expressions.c to support a UAT. Should be okay since it's deprecated. Change-Id: I688cebb4b7b6594878c1398365e79a205f1902d9 Ping-Bug: 13814 Reviewed-on: https://code.wireshark.org/review/22354 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-20Fix filter for "Next Packet in Conversation"Peter Wu1-39/+2
The "Previous/Next Packet in Conversation" actions accidentally overwrites more specific filters (like TCP port matching) by less specific ones (like IP addresses). This resulted in strange behavior where packets from different TCP streams were selected. Change-Id: Ifa93064e1db3777fa3c12e2220bbb0b36b9478fe Reported-by: Christian Landström Reviewed-on: https://code.wireshark.org/review/22274 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-20Qt: make Wireless Timeline a separate itemPeter Wu1-5/+5
Do not put the wireless timeline in the main view with splitters, it has a fixed size anyway and is not taken into account for layout and size calculations for the panes. Bug: 13776 Change-Id: I71da962950c3f1b215908674f4852afa76744343 Reviewed-on: https://code.wireshark.org/review/22242 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Simon Barber <simon.barber@meraki.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-19SearchBar - Focus on shortcut instead of closingRoland Knall1-3/+3
If the searchbar is already open focus on the bar and highlight existing test, instead of closing an already open bar Change-Id: I4f8ae2e903cb65c0ebca238f3bcc1c62b63b5c3b Reviewed-on: https://code.wireshark.org/review/22223 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-05Add a timeline view for packets, with the timing data used to generate the ↵Simon Barber1-0/+20
display taken from the timing analysis done in the wlan_radio dissector. QT only. The timeline background is light gray, white for packets displayed in the packetlist, and blue for the currently selected packet. Packets are coloured according to the colouring rules foreground colour. The timeline can be zoomed with controls on the toolbar. At higher zoom levels the duration (NAV) field is plotted as a horizontal line to the right of a packet. The height of a packet in the timeline is proportional to the RSSI. The bottom half of the packet is only shown if it matches the display filter. Todo: Auto detect TSF timing reference point (start/end of packet) Add a scrollbar Add a ruler showing time Improve handling of focus. Do not display NAV for packets with bad FCS. Show related packets graphically Different Y axis modes - bandwidth/channel use display - different transmitters per line - background color from coloring rules Live capture support Change-Id: Ic31fffb0d6854966361ade7abb5c0be50db9a247 Reviewed-on: https://code.wireshark.org/review/20043 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-01Qt: Disable -Wframe-larger-than= for ui_main_window.hStig Bjørlykke1-0/+7
The generated Ui_MainWindow::setupUi() can grow larger than our configured limit, so turn off -Wframe-larger-than= for ui_main_window.h. Change-Id: I550ff30ebe566b711c63f7a9d0276e5b06244407 Reviewed-on: https://code.wireshark.org/review/21866 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-05-28GTK+Qt: Show Osmux Packet Counter on Telephony menuPau Espin Pedrol1-0/+5
Change-Id: I565b0d2d43dd98781f77a302a20bd841e3e4650e Reviewed-on: https://code.wireshark.org/review/21598 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-05-19Qt: Add check for packet bytesStig Bjørlykke1-0/+8
Disable menu items handling packet bytes if not having any. Bug: 13723 Change-Id: I9cdb1185910f865c61a8ee74e3cf3177159bf315 Reviewed-on: https://code.wireshark.org/review/21710 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-26Qt: Remove semicolon behind Q_UNUSED macro, part 2Stig Bjørlykke1-2/+2
Change-Id: Id27a93c9a76b554bb2e98199d08d3d9604550889 Reviewed-on: https://code.wireshark.org/review/21348 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-26Qt: Remove semicolon behind Q_UNUSED macroStig Bjørlykke1-1/+1
Change-Id: I75ff975216da23447b94bc513671ac269c52b7dc Reviewed-on: https://code.wireshark.org/review/21342 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-25Qt: fix compilation without pcap.Dario Lombardo1-0/+4
Change-Id: Ia0fe79157f21fd0b1c0e5195c902ae07c55ca253 Reviewed-on: https://code.wireshark.org/review/21343 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-25Qt: Add interface toolbar supportStig Bjørlykke1-4/+36
An extcap utility can provide configuration for controls to use in a GUI interface toolbar. This controls are bidirectional and can be used to control the extcap utility while capturing. This is useful in scenarios where configuration can be done based on findings in the capture process, setting temporary values or give other inputs without restarting current capture. Todo: - Add support for Windows Change-Id: Ie15fa67f92eb27d8b73df6bb36f66b9a7d81932d Reviewed-on: https://code.wireshark.org/review/19982 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-18Qt: AdditionalToolbars is a menuStig Bjørlykke1-1/+1
Rename actionViewAdditionalToolbars to menuAdditionalToolbars because this is a menu, not an action. Change-Id: I85e45c065f415ffa008792f04127d81283e54b7e Reviewed-on: https://code.wireshark.org/review/21181 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-08Clean up handling of enabled/disabled protocols/heuristic dissectors.Guy Harris1-2/+1
Add a "report a warning message" routine to the "report_err" code in libwsutil, and rename files and routines appropriately, as they don't only handle errors any more. Have a routine read_enabled_and_disabled_protos() that reads all the files that enable or disable protocols or heuristic dissectors, enables and disables them based on the contents of those files, and reports errors itself (as warnings) using the new "report a warning message" routine. Fix that error reporting to report separately on the disabled protocols, enabled protocols, and heuristic dissectors files. Have a routine to set up the enabled and disabled protocols and heuristic dissectors from the command-line arguments, so it's done the same way in all programs. If we try to enable or disable an unknown heuristic dissector via a command-line argument, report an error. Update a bunch of comments. Update the name of disabled_protos_cleanup(), as it cleans up information for disabled *and* enabled protocols and for heuristic dissectors. Support the command-line flags to enable and disable protocols and heuristic dissectors in tfshark. Change-Id: I9b8bd29947cccdf6dc34a0540b5509ef941391df Reviewed-on: https://code.wireshark.org/review/20966 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris1-7/+7
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-29Qt: propagate selection from main screen to dialogPeter Wu1-0/+3
Ensure that the selection in main screen is updated on refreshing interfaces (InterfaceFrame::interfaceListChanged). Add additional patches to ensure that selection changes from the main screen propagate to the dialog and be careful to avoid infinite recursions. Life of a signal for InterfaceFrame: ui->interfaceTree->selectionModel emits selectionChanged -> slot InterfaceFrame::interfaceTreeSelectionChanged -> emits InterfaceFrame::itemSelectionChanged -> slot MainWelcome::interfaceSelected -> emits MainWelcome::interfacesChanged -> slot CaptureInterfacesDialog::interfaceSelected (updats dialog selection) Life of a signal for CaptureInterfacesDialog: ui->interfaceTree emits itemSelectionChanged -> slot CaptureInterfacesDialog::interfaceSelected (emission of next signal because sender is ui->interfaceTree) -> emits CaptureInterfacesDialog::interfacesChanged -> slot InterfaceFrame::updateSelectedInterfaces (updates main screen selection) This should probably be updated to model/view with shared selection model in the future. Change-Id: Ibb32c201a92bd2f1310523b3e6e63b03209c9ce4 Reviewed-on: https://code.wireshark.org/review/20487 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-04Qt: Apply selected bookmark display filterStig Bjørlykke1-1/+4
When selecting a display filter from the bookmark list this filter should be applied, because that's the most common action for a user. Holding down the the Alt key will only prepare the filter. Change-Id: I567ee8a2a70a3de07fea33fa5763d9efba591de3 Reviewed-on: https://code.wireshark.org/review/20317 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-03-03Qt: Add selection history navigation.Gerald Combs1-0/+8
Add the ability to move back and forth in the packet selection history similar to GTK+. Update the documentation accordingly. Change-Id: If1fdc1e59b240c0588c292dc0f7f0a5f083c30e1 Reviewed-on: https://code.wireshark.org/review/20320 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-24Qt: Code cleanupStig Bjørlykke1-23/+18
Remove whitespace to match coding style used in file. Change-Id: I4c1649aa02087cd39b2f516db6e40749899c5125 Reviewed-on: https://code.wireshark.org/review/20260 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-24PluginIF: AdditionalToolbarRoland Knall1-0/+70
Creates an interface for plugins and other parts of the code, to add a new toolbar to the system and have various widget types interact with this toolbar. All toolbars added via this interface, will be added to an additional submenu called "Additional Toolbars" within Wireshark. Also a demo plugin is being provided, demonstrating various features of the toolbar, including updating the gui elements. It also demonstrates how to update toolbar items. Change-Id: I8d0351224b3d7f4b90220d58970b51695551d7e3 Reviewed-on: https://code.wireshark.org/review/19803 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-22Qt: Avoid flicker in filter expressions toolbarStig Bjørlykke1-1/+7
Calling adjustSize() on the display filter toolbar causes flicker in the filter expression toolbar when switching between profiles without buttons and in some cases changing to a profile without buttons. Only calling adjustSize() if adding buttons should be fine to avoid this issues, even if they may be caused by something else. Change-Id: I8cca84a51dbbc8244dc4342ac0466e35884c294d Reviewed-on: https://code.wireshark.org/review/20222 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-20Qt: Mystery pixel issue is solvedStig Bjørlykke1-3/+3
The mystery pixel issue has probably been mysteriously solved earlier because the adjustments does not work as expected now. This fixes an issue where one of the panes increases with 1 pixel at startup and when changing profile using layout type 3, 4, 5 and 6 (selection number 1, 4, 5 and 6 in “Preferences -> Appearance -> Layout”). Change-Id: Iab36fa5303dc8628b21e5cf920e7c70a7167d76e Reviewed-on: https://code.wireshark.org/review/20188 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-20Qt: Add "Reset Layout"Stig Bjørlykke1-0/+8
Add menu item "Reset Layout" to manually reset panes to equal sizes. Change-Id: I1efbf655462e25053062e03f8038dc20f9f555c0 Reviewed-on: https://code.wireshark.org/review/20173 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-16Qt: Disable pane menu items if not used in layoutStig Bjørlykke1-3/+7
If a pane is not used in the layout it should not be possible to show and hide this from the menu, as this may give unexpected results. Change-Id: I335168e66e1dffc89992cad480dd7daaea7e9d59 Reviewed-on: https://code.wireshark.org/review/20140 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-16Qt: Preserve pane sizes when layout content changedStig Bjørlykke1-0/+4
Preserve pane sizes when rearranging layout content in the preferences dialog. Change-Id: I2af2a60424a7bf94f1f92e7c63e6a1823985b60d Reviewed-on: https://code.wireshark.org/review/20145 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-16Qt: Improved pane size auto detectStig Bjørlykke1-6/+9
Split panes in exactly equal sizes. Change-Id: I4b984931e860160791497a299011489aa26ad4ef Reviewed-on: https://code.wireshark.org/review/20139 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-16Qt: Auto detect pane size when configured zeroStig Bjørlykke1-0/+12
The recent file configuration for pane sizes states that “pane size of zero will auto detect”, so ensure we do this in all cases where the settings may be zero. This affects initial startup, Default profile reset and new profiles. Change-Id: I1430ec1a83b7fb294b92837476f2bf9472384e45 Reviewed-on: https://code.wireshark.org/review/20121 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-16Qt: Preserve pane sizes when changing profileStig Bjørlykke1-1/+1
When changing between profiles having certain different layout types the size of the last pane was calculated wrong. This involves switching between this layout types: 2 -> 3 2 -> 5 3 -> 1 3 -> 2 3 -> 4 3 -> 5 4 -> 3 4 -> 5 5 -> 2 5 -> 3 5 -> 4 5 -> 6 Change-Id: I6ee3ed92c4c639b720587c0771be0a242e5a8793 Reviewed-on: https://code.wireshark.org/review/20116 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-27Qt: Hide "Go to Packet" frame when closing capture file.Stig Bjørlykke1-0/+1
The "Go to Packet" frame cannot be used without a capture file so ensure we hide this when closing a capture file. Change-Id: I339bc90b87181a8361e9f0bf27dfdf26d2f05333 Reviewed-on: https://code.wireshark.org/review/19783 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-21Qt: Fixup drag and drop merging.Gerald Combs1-2/+2
Make the behavior of MainWindow::dropEvent match the documentation and dnd_open_file_cmd. If we've been passed a single file, open it. If we've been passed multiple files, merge them first. Add an is_tempfile parameter to openCaptureFile. Add a note about setting the drop description on Windows. Bug: 12129 Change-Id: I325a4da5a29e940b4efa7654627d8bcafba15b57 Reviewed-on: https://code.wireshark.org/review/19717 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-21Qt: Show merge progress.Gerald Combs1-0/+13
Add "file merge" callback plumbing. Use it to display "Merging files" in the main statusbar. Make sure we have a usable window pointer when we merge files. Change-Id: I236b6edb30685f0b06703ab8304bc88ae592f83c Reviewed-on: https://code.wireshark.org/review/19716 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-12Qt: Remove unneccessary Q_DECLARE_METATYPERoland Knall1-12/+8
Remove unnecessary Q_DECLARE_METATYPE macros and replace calls to QVariant conversions with VariantPointer where necessary Change-Id: Ia4690590095f930bf94644197de7fa30b00ee7ec Reviewed-on: https://code.wireshark.org/review/19611 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-12-20Qt+Win32: Make software updates more friendly.Gerald Combs1-0/+11
Add WinSparkle can_shutdown and shutdown_request callbacks which are called prior to running the installer. Reject updates when we have unsaved information. Add notes about possible improvements. Ping-Bug: 9687 Ping-Bug: 12989 Change-Id: Ia126244b311417aa3105ea8136f186adc2745445 Reviewed-on: https://code.wireshark.org/review/19244 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-13Qt: Optionally restore our selected packet when thawing.Gerald Combs1-3/+1
Stash the current row when we freeze the packet list. Make it possible to restore it when thawing. Do so when the layout changes and when we move a column. Change-Id: I44cfb8bafcd4d49a46e1c89bf47aecf5ac139773 Reviewed-on: https://code.wireshark.org/review/19222 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-02Enable exporting objects with tsharkMoshe Kaplan1-25/+11
A new "--export-object <protocol>,<destdir>" option is added to tshark. This required refactoring Export Object behavior in all GUIs to give the export object handling to the dissector, rather than the ui layer. Included in the refactoring was fixing some serious memory leaks in Qt Export Object dialog, crash due to memory scope issues in GTK Export Object dialog, and addition sorting column feature in Qt dialog (set up by creating a widget to manage the items that were previously leaking memory) Bug: 9319 Ping-Bug: 13174 Change-Id: I515d7662fa1f150f672b1476716f347ec27deb9b Reviewed-on: https://code.wireshark.org/review/18927 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-11Qt: Fix a "No such slot" warning.Gerald Combs1-1/+3
Make sure on_actionCaptureOptions_triggered always exists so that we don't get a "No such slot" warning when building without libpcap. Change-Id: Ib7c82df6c72bf080ff080e0a650216b345a97e9c Reviewed-on: https://code.wireshark.org/review/18747 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-10Enable exporting IMF traffic as an EML fileMoshe Kaplan1-0/+5
Change-Id: Ia56b38a770a148dd8bf030699615189601944cc2 Reviewed-on: https://code.wireshark.org/review/18656 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-10Qt: Handle retranslation events in the main window.Gerald Combs1-2/+2
Update most (but not all) of the main status bar text when the user changes the language setting. Try to distinguish between recent preferences and recent captures more clearly. Change-Id: I5278a503178fe3620a25b185742688f957dc30f4 Ping-Bug: 11307 Reviewed-on: https://code.wireshark.org/review/9575 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-30Have routines for parsing options that affect dissection.Guy Harris1-5/+7
Have them handle -d, -t, --disable-protocol, --disable-heuristic, and --enable-heuristic for TShark and both flavors of Wireshark. Change-Id: I612c276b1f9df8a2092202d23ab3d48be7857e85 Reviewed-on: https://code.wireshark.org/review/18583 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-23Qt: add fullscreen feature.Dario Lombardo1-0/+18
The feature activates/deactivates fullscreen mode of Qt UI. A new menu item has been added as well as a shortcut (F11 or Ctrl+Cmd+F) according to browsers common shortcut. Change-Id: I01906b494d0a13ce70d27c00ebbe03e6ec87cbd7 Reviewed-on: https://code.wireshark.org/review/18332 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-01Interface List: Change display to view/modelRoland Knall1-10/+5
This changes the underlying model of the main interface tree. Because of that, we can resort to a view/model approach, enlisting the global interfaces list as only data source. The interface list works identical to the old list, but allows for filtering of the displayed interfaces by type. Only types, which are present and whose interfaces are not hidden, are being displayed for selection. Change-Id: If8475b227daa026dc0ad3d25bc7fe050d5bf2ac3 Reviewed-on: https://code.wireshark.org/review/17940 Reviewed-by: Roland Knall <rknall@gmail.com>