aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt
AgeCommit message (Collapse)AuthorFilesLines
2017-07-17Qt: More Main Welcome interface tweaks.Gerald Combs3-14/+12
ge036f4a282 didn't ensure that an interface was selected at app startup. Change-Id: I0b04020a344aaf8e35766a45287fe263d1227c64 Reviewed-on: https://code.wireshark.org/review/22656 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-16Qt: Main Welcome hover text color fix.Stig Bjørlykke1-0/+1
Use the default text color for hovered items. This makes the selected item look the same as non-selected items when hovering. Change-Id: Ic9e18323326f088202207ac15f844e7849f7ebc9 Ping-Bug: 12636 Reviewed-on: https://code.wireshark.org/review/22632 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-07-16Qt: Expand IO Graph text edit fields to column widthStig Bjørlykke1-0/+4
When editing a IO Graph the text edit field should fill the column. Change-Id: Idb5c9a7004d9be1b82e645ae2c1a3430c9c9e5f7 Reviewed-on: https://code.wireshark.org/review/22626 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-07-16Qt: Set IO Graph display filter when having Y fieldStig Bjørlykke1-4/+12
Calling setFilter() between setValueUnits() and setValueUnitField() will fail when having "Y Field" because check_field_unit() fails with inconsistent values. The display filter will then be ignored. Call setFilter() first to ensure filter_ is set before setting value units. setFilter() does not depend on the value unit when used to set the display filter. Change-Id: Ibf2d37fddcce9fcf6febebfefa0b2518ae093737 Fixes: v2.3.0rc0-2930-g0ea51ad822 ("Qt: Fix uninitialized memory access in val_units_") Reviewed-on: https://code.wireshark.org/review/22619 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-07-16[Automatic update for 2017-07-16]Gerald Combs7-5641/+4374
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I01c07ea17d54e5518659abac5cd3c8c9ddfea5e6 Reviewed-on: https://code.wireshark.org/review/22647 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-16Qt: add initializers (CID 1162824).Dario Lombardo1-0/+2
Change-Id: I46f56fb99c75eebc6418fa7ac88995f49abedc91 Reviewed-on: https://code.wireshark.org/review/22645 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-16Qt: refactor UatTreeView into something reusablePeter Wu11-34/+62
UatTreeView had two functions: 1. Saner navigation functionality when pressing tab. 2. Start editing when the currently selected item changes. Since this tab navigation functionality is desired in more places, extract this functionality. Add more documentation while at it and use an alternative, declarative style to connect signals. Move the second functionality to the caller since not all views need it. Change-Id: Ibe886f2c2763dbe024614203a44b72173fbbce06 Reviewed-on: https://code.wireshark.org/review/22639 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-16Qt: show UAT description for header itemsPeter Wu1-2/+11
Be sure to display the extended description for UAT fields in the tooltip for the column header like GTK+ did. Change-Id: I294d2d3fb7f6d55df239129bea5d780b15deacc6 Reviewed-on: https://code.wireshark.org/review/22641 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-16Fix for building without libpcap and extcap.Guy Harris1-0/+2
(A further fix should be "don't put the "Capture" section into the welcome screen if we have neither libpcap nor extcap".) Change-Id: I83e65e6dc31040292af7fe88ccd73e485613c76f Reviewed-on: https://code.wireshark.org/review/22634 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-16Qt: fix build without libpcap and without extcapPeter Wu1-0/+4
global_capture_opts is only defined when libpcap or extcap are enabled. Change-Id: If692a7ac365b77d9efc52f589fef1aa906d5d14e Fixes: v2.5.0rc0-425-ge036f4a282 ("Qt: Main Welcome behavior tweaks.") Reviewed-on: https://code.wireshark.org/review/22629 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-15Qt: Main Welcome behavior tweaks.Gerald Combs3-16/+34
Update the recent item list and interface tree style sheets so that hovered items have a different background color. This should make it more obvious that they can be clicked. Select the default interface (or failing that, the first interface) at application startup and focus on the interface tree. This should make it less likely that the user will start typing in a capture filter with the wrong (or no) interface selected. Note that we should probably track selected interfaces in the recent file instead of forcing the user to select one via the preferences. This should hopefully address some of the issues in bug 12636 and do so without changing the layout (which we can do in another commit). Change-Id: I96a417973f4270a70f41d04c40c4947a09613bdc Ping-Bug: 12636 Reviewed-on: https://code.wireshark.org/review/22627 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-07-15Qt: implement saner tab navigation for coloring rules dialogPeter Wu5-1/+134
The default QTreeView/QTreeWidget behavior for (Shift-)Tab navigation is to select the previous/next row. For data entries with multiple columns (such as the UAT dialog or the coloring rules dialog), column navigation is closer to what a user would expect, so implement that. Bug: 13856 Change-Id: Ib585030380f894e0be214a95107cb264afac7eee Reviewed-on: https://code.wireshark.org/review/22561 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-14Remove some unneeded includes.Gerald Combs1-5/+0
Change-Id: I513936a74fe96211153fdf35f1832608b2cd053d Reviewed-on: https://code.wireshark.org/review/22617 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-07-11Qt: Move all utility widgets to widgets subdirectoryRoland Knall79-136/+155
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-11Organize Qt source files for Visual StudioMichael Mann1-0/+7
Organize source into 5 categories: moc Source Files - moc_* files ui Header Files - Header files generated by .ui files ui Files - .ui files qrc Files - graphics? files Header Files - Header files for Qt source headers Change-Id: If32b8331592a2c685131ea9592893b7add1124ec Reviewed-on: https://code.wireshark.org/review/22592 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-11Promote Expert preference UAT to main preference tree.Michael Mann3-3/+21
"Expert" has been treated as a protocol "internally", but I doubt users would consider it one. Since the only preference is a UAT, just make it its own leaf off of the main preference tree (similar to Filter Expressions UAT) and not have it buried with all of the protocols. Change-Id: I385314d8791440e6ced3dbd71305ee75bc373e52 Reviewed-on: https://code.wireshark.org/review/22580 Reviewed-by: Michael Mann <mmann78@netscape.net> 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-07-09filter_expressions_preferences_frame -> uat_frameMichael Mann6-44/+41
There isn't anything "filter expression" specific about it and there are a few other things that could take advantage of a UatFrame. Change-Id: I0d04d176caebf0c2d8043c3bf89a81668580eae8 Reviewed-on: https://code.wireshark.org/review/22570 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-07-07Qt: replace zoom buttons by wheel zoom in Wireless TimelinePeter Wu6-108/+26
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-07Qt: Set tooltip on ByteViewTabStig Bjørlykke1-1/+2
Set the tab name as tooltip on ByteViewTab. This is useful when having many tabs on a small screen. Change-Id: Idb375f0b7d510ecb9b42cfccc6ebc4dd798f463b Reviewed-on: https://code.wireshark.org/review/22549 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>
2017-07-06Qt: Add convenience function and cleanupRoland Knall8-23/+23
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-07-04Qt: try harder to sort packet list columns as numberPeter Wu2-5/+29
Properly sort columns by their numeric value even if they have a unit string suffix or if there are multiple occurrences. These do not strictly parse as a number, so use a more lenient matching approach. Bug: 13827 Change-Id: I3a777448a98c70fdc05fb847b05f20e2bc6f4486 Reviewed-on: https://code.wireshark.org/review/22489 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jim Young <jim.young.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-03Add option to use wall-clock intervalsSake Blok1-12/+12
Add the "interval" option to "-b". Each new capture starts at the exact start of a time interval. For instance, using -b interval:3600 will start a new capture file at each whole hour. Changed the duration option in the GUI interfaces to use the new interval option. Change-Id: I0180c43843f5d2f0c2f50153c9ce42ac7fa5aeae Reviewed-on: https://code.wireshark.org/review/22428 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Sake Blok <sake.blok@SYN-bit.nl>
2017-06-28Qt: Drag/Drop Filter buttons to orderRoland Knall7-4/+322
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: fix alloc-dealloc-mismatch while adding named pipePeter Wu3-34/+30
ManageInterfacesDialog::on_addPipe_clicked uses g_new0 to create an "interface_t" instance, but InterfaceTreeCacheModel uses qDeleteAll which results in ASAN reporting "alloc-dealloc-mismatch (malloc vs operator delete)". To fix this, remove the dynamic allocation and make InterfaceTreeCacheModel store the instance internally. Change-Id: I9426dfc88d0a54a889bbbc9cf336c0a6af76920e Reviewed-on: https://code.wireshark.org/review/22410 Petri-Dish: Peter Wu <peter@lekensteyn.nl> 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 Knall7-9/+180
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 Knall5-133/+162
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 Mann3-3/+35
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 Mann8-287/+348
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-25Sample deprecated filter -> Sample warning filterMichael Mann1-1/+1
"Warning" is a more appropriate name because filter may not be as deterministic as user desires Bug: 13834 Change-Id: Ie34e37db8866dc409f25df227a4d34e7c11d0058 Reviewed-on: https://code.wireshark.org/review/22392 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-25[Automatic update for 2017-06-25]Gerald Combs7-1735/+1735
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I6febcb360b1b3e5e761086d422050e6ec95d5c45 Reviewed-on: https://code.wireshark.org/review/22384 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-22Qt: Restore multi custom column width and alignStig Bjørlykke1-3/+1
Put custom column field settings in quotes in the recent file to support multi custom columns which contains space. Otherwise the space will be removed in prefs_get_string_list() and the field will not match when reading the recent file. Change-Id: Ic6e2b1e02d68970a4e11fbecbe55a7b10f8b10dd Reviewed-on: https://code.wireshark.org/review/22349 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-06-22Add support for "bool" and "display filter" types for UATs.Michael Mann3-6/+54
Filter expressions needs support for a checkbox (bool) and string field that verifies display filters. Change-Id: Idfbffd6cdb5abaee8914126a05d890e834c17306 Reviewed-on: https://code.wireshark.org/review/22340 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-21Qt: fix sorting of custom columns with multiple fieldsPeter Wu2-14/+37
Fields like "dns.time || http.time || smb.time" were sorted by column number before. Recognize when all fields are numeric values and then try to sort by number and otherwise fallback to a value comparison. In theory sorting should now also be a bit faster for custom columns because the columnn type is looked up once. Change-Id: Id40d7cce8080d05823d74459fc493ec6ebf80956 Reported-by: Laura Chappell Reviewed-on: https://code.wireshark.org/review/22317 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21Qt: display newlines in capture file commentsPeter Wu1-2/+2
Due to the use of HTML, whitespace (including newline) are shown as single horizontal space. Add a special case for newlines. Bug: 13819 Change-Id: Iefa2af7d2948ed18a3b7f8f4ee8cb90100bf3460 Reviewed-on: https://code.wireshark.org/review/22306 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-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-20Fix Toggle indicator for searchRoland Knall1-3/+0
Removing the toggle indicator. Search behaves now the same as it does for e.g. in SublimeText Change-Id: I4523001b536caa116bcb989f0850aa769c6220f8 Reviewed-on: https://code.wireshark.org/review/22280 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-20Qt: Rename "Filter Expressions" to "Filter Buttons"Stig Bjørlykke1-1/+1
Change-Id: I7adcb1d28d239bbc25d8a7a5969b34c6db84e022 Reviewed-on: https://code.wireshark.org/review/22277 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-20Qt: make Wireless Timeline a separate itemPeter Wu6-18/+29
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-20Qt: Turn off auto scroll when going to a packetStig Bjørlykke2-1/+17
When going to a packet (first, last, next, prev and specific) during capture we must turn off auto scroll to let the packet be shown in the packet list. Change-Id: If1c615eb4d422c3b4c0418114064f7a4a0b75b35 Reviewed-on: https://code.wireshark.org/review/22244 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-06-20Don't scroll back to the selected frame when we get name resolution updates.Jeff Morriss2-4/+12
With live or large capture files and asynchronous name resolution this can cause serious scrolling issues as the name resolutions come in. Bug: 12074 Change-Id: I1a5cca410c0608927b32e9e7107885370caf14d7 Reviewed-on: https://code.wireshark.org/review/22245 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>
2017-06-19Qt: Flush signals when disable protocolsStig Bjørlykke1-0/+4
When opening the enabled protocols dialog from a protocol preferences menu we must flush app signals to ensure a redissect is done. Change-Id: I512b8f6959aabcc15ccffc67615583ee9c60ceec Reviewed-on: https://code.wireshark.org/review/22224 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-06-19SearchBar - Focus on shortcut instead of closingRoland Knall2-3/+4
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-19Attempt to clean up addr_resolv flags by removing DUMMY_ADDRESS_ENTRYAnthony Coddington1-2/+2
Replace with easier to understand and already present NAME_RESOLVED given dummy address is always filled. Change-Id: If8464f89e88722aac70689749fe0d4a31c119db2 Bug: 13798 Reviewed-on: https://code.wireshark.org/review/22110 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-18[Automatic update for 2017-06-18]Gerald Combs7-240/+240
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9a55ca147bd4e42b9caded98294597acfad99909 Reviewed-on: https://code.wireshark.org/review/22203 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-17Qt: fix hang on exiting Qt while loading capture filePeter Wu1-10/+29
testCaptureFileClose can also be invoked while reading an existing capture file (the original comment only applied to GTK+, not Qt). When the user quits Wireshark while reading an offline pcap, this could result in a confusing "Unsaved packets" dialog. Fix this by checking the actual capture session state. After fixing this, the next issue is that cf_close trips on an assertion ("cf->state != FILE_READ_IN_PROGRESS"). To address this problem, do not close the capture file immediately, but signal to the reader (cf_read) that this should be done (similar to the quit logic in GTK+). Bug: 13563 Change-Id: I12d4b813557bf354199320df2ed8609070fdc58a Reviewed-on: https://code.wireshark.org/review/22096 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-13Fix the display of the IPv4 Hash Table in Resolved Addresses Dialog QT UIsfd1-2/+2
Was sign extending the key to 64-bit in Linux. GPOINTER_TO_UINT should not be stored in 'int', use guint. Change-Id: Ib4a994fdda5d69a589d3cffce644584103f2cd1d Reviewed-on: https://code.wireshark.org/review/22107 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-11[Automatic update for 2017-06-11]Gerald Combs7-3442/+3701
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia8c543f56fc9d09e78174d76144577a99359cc39 Reviewed-on: https://code.wireshark.org/review/22067 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-07Qt: Wireless Timeline improvementsStig Bjørlykke2-15/+17
- Change keyboard shortcuts to Ctrl+Shift+[IOU] - Use UTF8_MICRO_SIGN in tooltip text - Change 0xffffffffffffffff with G_MAXUINT64 - Check for valid wlan_radio *ri before use - Small whitespace cleanups Change-Id: I9fa85c0d675ef3837510afaf5f1b723d89ac134c Ping-Bug: 13769 Reviewed-on: https://code.wireshark.org/review/21993 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: Simon Barber <simon.barber@meraki.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>