aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2018-05-01Qt: do not further modify filename from Save dialogPeter Wu4-1/+29
Let the Save dialog fixup the extension on accepting the dialog. Otherwise it is possible that files are silently overwritten without prompting. Additionally, if a user decides to save a pcapng file as "foo.pcap", do not try to rename it to "foo.pcap.pcapng". This change is limited to macOS and Linux because Windows uses a different file dialog. Tested with both macOS and Linux. Bug: 14600 Change-Id: Ie0bc1f579766a04f0aad96dcd5daba3fffef9764 Reviewed-on: https://code.wireshark.org/review/27188 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-01Qt: improve extension selection in Save As dialogPeter Wu2-25/+88
The default Qt behavior for extension adjustment is quite bad. When the file type filter is changed, the extension always becomes "gz" because "pcap.gz" happens to be the first extension in the list. It also did not check that the last suffix is actually a valid extension (e.g. "capture.2018.01" became "capture.2018.gz"). Improvements: - Respect the "compression" checkbox when adjusting the filename. - Replace the extension only if it is a known one, append otherwise. - Use a better default extension (from "wtap_default_file_extension"). Affects only macOS and Linux since Windows has its own native dialog. See also https://bugreports.qt.io/browse/QTBUG-67993 Bug: 14600 Change-Id: I8cd0788f2abac0c6d7e29490b1ebb381f5a926d0 Reviewed-on: https://code.wireshark.org/review/27186 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-01Fix comment end after SPDX identifierStig Bjørlykke386-402/+788
Move */ to a separate line below the SPDX identifier. Change-Id: Id1032215449cfccae0933147b45e04b65e0b727f Reviewed-on: https://code.wireshark.org/review/27211 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-30Qt: Make the selected packet in the packet list more clear.Paul Zander1-12/+24
When using coloring rules the selected packet is sometime hard to recognize. The stylesheet of the packet list is extended for this. Bug: 14621 Change-Id: Ied465e0e211b3c11e69cb71f89988eb45622dd72 Reviewed-on: https://code.wireshark.org/review/27141 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-26Qt: fix crash on dragging in packet dialogPeter Wu3-6/+17
"packet_dialog.cpp" does not use setCaptureFile, resulting in a NULL dereference while trying to obtain the dissection context. Apply a fix similar to v2.5.1rc0-121-g9198448f9d (pass a fixed dissection context to ProtoTree). Additionally, fix a memleak and correct documentation. Why not add "proto_tree_->setCaptureFile(cap_file_.capFile())" in PacketDialog? Well, it also uses "proto_tree_->setRootNode(edt_.tree)" which means that "cf_->edt" would be different from "edt_". If that is the case, then "proto_construct_match_selected_string" will not return a filter for FT_NONE fields (see the call chain in proto.c). Bug: 14620 Change-Id: I6eeaf32b650a2095e15f64bbe64b54cdd545c7a9 Fixes: v2.5.0rc0-1608-g4d6454e180 ("Qt: Drag n Drop Filter expression from Packet Tree") Reviewed-on: https://code.wireshark.org/review/27160 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-04-25Qt: Fix various missing header includesRoland Knall3-0/+3
Qt 5.11 seems to have changed the include dependencies, so adding those, that are missing Change-Id: I2b0482f7554467d6981be65bfd3fea1a3e118976 Reviewed-on: https://code.wireshark.org/review/27145 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-24remove redundant break statementchinarulezzz1-8/+0
Change-Id: Ib6d4bbb1662d921fc4b5920b50e47d2b30ebb95c Reviewed-on: https://code.wireshark.org/review/27103 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-22[Automatic update for 2018-04-22]Gerald Combs1-10/+10
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I0769900c468b88eb19304e697d2faecddaeb4b11 Reviewed-on: https://code.wireshark.org/review/27072 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-20SCTP: INIT collisionruengeler3-32/+101
Change-Id: I283ce92048af39ff4cf54e5e401e714bf6ec308b Reviewed-on: https://code.wireshark.org/review/27023 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-04-20Qt: fix invalid member access within expert info dialogPeter Wu1-11/+12
Opening a context menu in the expert dialog resulted in an UBSAN warning because ExpertInfoModel::data is invoked with a proxy model index. Rely on the proxy to perform this mapping (change filterActionTriggered to avoid direct model access while at it). Change-Id: Id399f44b954b87d7d4dd0341fbedb391ab1b13da Fixes: v2.5.0rc0-1966-gb0112e60ad ("Add a model to use for Expert Info dialog.") Reviewed-on: https://code.wireshark.org/review/27025 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-18Qt: expose CaptureEvent definition for MOCPeter Wu3-57/+84
All WiresharkDialog instances have a "captureEvent(CaptureEvent)" method that requires the definition of "CaptureEvent" from capture_file.h. By luck, this definition is available for CMake builds due to the generated MOC headers being included in the right order, but this cannot be relied on. On an autotools build with less luck: main_status_bar.moc.cpp: In static member function ‘static void MainStatusBar::qt_static_metacall(QObject*, QMetaObject::Call, int, void**)’: main_status_bar.moc.cpp:241:86: error: invalid use of incomplete type ‘class CaptureEvent’ case 28: _t->captureEventHandler((*reinterpret_cast< CaptureEvent(*)>(_a[1]))); break; Create a new header file to limit exposure of the CaptureFile class. Change-Id: I4ab609f13b9438797e39e7b98f367da35536979b Fixes: v2.9.0rc0-186-g57bf7e4347 ("Qt: Fix memory leak for CaptureEvent") Reviewed-on: https://code.wireshark.org/review/27003 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-18Remove autotools build system.Dario Lombardo3-1324/+0
It has been replaced by cmake. Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a Reviewed-on: https://code.wireshark.org/review/26969 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-17Qt: fix remaining CaptureEvent signal connectionsPeter Wu8-15/+15
Converted all remaining "CaptureEvent *" to "CaptureEvent" using: sed -e 's/CaptureEvent *\*/CaptureEvent/g' $(git grep -le 'CaptureEvent *\*') -i Change-Id: I328d2890ec3b5e6672fa3fab22e85063e8309574 Fixes: v2.9.0rc0-186-g57bf7e4347 ("Qt: Fix memory leak for CaptureEvent") Reviewed-on: https://code.wireshark.org/review/26985 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-04-17Qt: Fix memory leak for CaptureEventRoland Knall27-107/+117
Make the argument to the events a non-memory object Change-Id: I46d8c24415aa2bc48b2a2d3b1fccffa6956d08b5 Reviewed-on: https://code.wireshark.org/review/26671 Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-17Qt: Fix segfault bug when analysing SCTP packetsruengeler1-3/+3
Change-Id: Id444318621ffa61ee5edb84d40de372e8b7f60ef Fixes: v2.5.2rc0-26-gecda3d0901 ("tap-sctp: remove guint32 unneeded allocations.") Reviewed-on: https://code.wireshark.org/review/26977 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-17Switch the Doxygen API reference build to CMake.Gerald Combs4-174/+26
Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-17Remove some GTK+-only code.Gerald Combs13-81/+7
Change-Id: Ic2498c7acd6a1a522be45094148402ee34a6b4d1 Reviewed-on: https://code.wireshark.org/review/26958 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16Qt: Rename packet_list_enable_colorStig Bjørlykke4-4/+3
Rename packet_list_enable_color() to packet_list_recolor_packets() to reflect what it does. Remove the call from where it's not needed. Change-Id: I55dd1a9af8f5b1dbd83b06136a5bbcfddea06cdb Reviewed-on: https://code.wireshark.org/review/26959 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16glib: Get rid of GLIB_CHECK_VERSION as we now require 2.32.0Anders5-8/+0
Change-Id: Ie95cf37f9cd283545693e290340a7489cc989c95 Reviewed-on: https://code.wireshark.org/review/26970 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16Qt: Do not show MaxMind DB path when not enabledStig Bjørlykke1-0/+2
The About dialog should not show MaxMind DB path when built without the MaxMind DB resolver. Change-Id: Id5b51628a04005fc4dcaacea26abb3a0ddee9b66 Reviewed-on: https://code.wireshark.org/review/26886 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-04-15More PortAudio removal.Gerald Combs2-2/+2
Change-Id: Ib56212e09d41fc76494d8186c77541302700104c Reviewed-on: https://code.wireshark.org/review/26952 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-15[Automatic update for 2018-04-15]Gerald Combs2-2/+2
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I50b0c7211bfde3e0a17b4580e18fa423ab8fbdf1 Reviewed-on: https://code.wireshark.org/review/26953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-15Gtk: Remove source codeRoland Knall230-142700/+0
Removing all gtk source code, except for main.? which will remain for the official removal during SFUS18 Change-Id: I4273baf207df1eaaa4b94623cfd10bf74b1fc4a4 Reviewed-on: https://code.wireshark.org/review/26937 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-11qt: capture file properties: add a splitterMartin Kaiser2-26/+52
Add a splitter to the capture file properties dialog. This allows for modifying the relative sizes of the details vs comment boxes. People who paste lots of text into the capture file comment may want a lager box for it. Change-Id: Id79d9f5fd7e589a2ba88aa5f16b52bb37d7c47ae Reviewed-on: https://code.wireshark.org/review/26845 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-04-11Qt: Disable collapsible children in the main window.Gerald Combs4-0/+14
Set the childrenCollapsible property to false in the main window splitters. Set the minimum size for the packet list, proto tree, and byte views to a small (one em), consistent, and nonzero value. Otherwise it's easy to inadvertently end up with a hidden main window view. Bug: 14478 Change-Id: I07a352cf2cf0375829ae2e0cb53b2a7d717dbb7d Reviewed-on: https://code.wireshark.org/review/26847 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2018-04-10Qt: Enable Emoji & Symbols selector againRoland Knall1-1/+1
Enable the emoji and symbols selector again. Change-Id: I4ceb54ef2bdc0a268f9ec1ded597fdc01f2137c2 Reviewed-on: https://code.wireshark.org/review/26839 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-09Qt: Fix MacOSX menu entriesRoland Knall2-0/+86
Remove various menu items added automatically on Mac OS X. The following menu items have been removed: - Edit / Start Dictation - Edit / Emoji & Symbols - View / Enter Fullscreen Mode - View / Show Tab Bar - Hide Tab Bar Bug: 13366 Change-Id: I44deae7ee8ea7a43926820e4f5d0517ece246939 Reviewed-on: https://code.wireshark.org/review/26823 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-09QT: keep cursor visible after completerion selectMichail Koreshkov1-0/+1
Before it was like this (display filter line edit "lost" focus) After press Enter in completion pupup, line edit stop show cursor. I was confused every time because without cursor it look like focus lost. But in fact focus is not lost and only cursor was disappear. Now cursor is not disappear Change-Id: I56979a1a774b6fb0b8b8be8239c01f5034c42fc8 Reviewed-on: https://code.wireshark.org/review/26781 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-09main window: don't keep a dangling freeze_focus_ pointerMartin Kaiser1-1/+2
Without this fix, Wireshark crashes when the user presses Ctrl-D or selects Edit / Ignore Packet and the current focus is somewhere on the bytes view. To ignore a packet, we protect the actual ignore operation by calling main window's freeze and thaw methods. We save a pointer freeze_focus_, pointing to the widget that has the focus, and restore the focus during thaw. This causes a crash if the focused widget is part of ByteViewTab. Ignoring the packet causes a redissection, the ByteViewTab and its children are cleared. freeze_focus_ remains non-NULL but doesn't point to a valid QWdiget any more. Calling freeze_focus_->setFocus() crashes. Fix this by using a QPointer<QWdiget> for freeze_focus_. The pointer is then reset to NULL when the QWdiget that it points to goes out of scope. Change-Id: Icc1f71a9de971284c628b7815a7fc1a5cc0d5fe2 Reviewed-on: https://code.wireshark.org/review/26693 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-08[Automatic update for 2018-04-08]Gerald Combs7-40/+75
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I85850833928dcf94e44957943c55126369c20905 Reviewed-on: https://code.wireshark.org/review/26799 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-06Remove some references to Qt4.Gerald Combs4-28/+5
Change-Id: I50f5abafb8adf18a5407427f7feb260301df45cc Reviewed-on: https://code.wireshark.org/review/26771 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-05QT: Copy as printableMichail Koreshkov1-1/+1
Copy all printable characters (like in GTK-based) but not only letters Change-Id: I5e431d0c52d65c5867f4893c86b6f0eb3f535972 Reviewed-on: https://code.wireshark.org/review/26757 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-05Qt: remove ws_buffer_start_ptr calls from clang-scan.Dario Lombardo2-0/+6
They are false positives. Change-Id: I06b5c2d2f7f462143050ffd4a624f76a440d5d5a Reviewed-on: https://code.wireshark.org/review/26729 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-04-05Qt: Remove checks for version below 5.2Roland Knall37-317/+52
This stops the main source from being buildable by Qt 4.x Change-Id: I61edbae04ac2b3bf0ae8ee8e09d335083945c176 Reviewed-on: https://code.wireshark.org/review/26756 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-04-05extcap: Reload values on requestRoland Knall8-44/+212
Allow certaing elements to be reloaded upon request. The way this works is, certain elements can be configured to be reloadable. By doing so, the extcap is asked once more just for the values list of this item, together with all already set options, and reloads the available options depending on the response. Only supported for selector. Radio and Multiselect will need additional patches, also moving those parts outside of extcap_argument.cpp might make sense before hand. Change-Id: I2e9e3d109b334bf878835a7cc9354f468bc22dee Reviewed-on: https://code.wireshark.org/review/26223 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-01[Automatic update for 2018-04-01]Gerald Combs7-34/+48
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I0db4c4cd78549ffca3f55a94de5279c7ad131647 Reviewed-on: https://code.wireshark.org/review/26699 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-29Extend 'HTTP Referer statistics' to sequence HTTP RedirectsMoshe Kaplan3-7/+7
This patch adds support for sequencing HTTP Redirects. This enables tracking of HTTP-based redirects, which may not have a Referer header. As such, this patch also renames 'HTTP Referer statistics' to 'HTTP Request Sequences' to better reflect the more generic functionality. Note that this does not fully support RFC 3986. An external library like uriparser.github.io may be a better option for efficient, full relative HTTP URL resolution. A Sample PCAP to test functionality is available here: https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=http_redirects.pcapng A sample PCAP to demonstrate usefulness is available here: https://www.malware-traffic-analysis.net/2015/08/31/page2.html (examine request to hxxp://lk2gaflsgh.jgy658snfyfnvh.com/service.php) Change-Id: I9edd1a1de86228b0dcb1df9f6f30e24379684321 Reviewed-on: https://code.wireshark.org/review/26679 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-28Qt: keep the extension in CaptureFile::fileName().Dario Lombardo1-1/+1
Change-Id: Iaecae7eea8398ae648bd31a0ae464242123f156b Reviewed-on: https://code.wireshark.org/review/26551 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-27tap: fix remaining potential memleaks with register_tap_listenerPeter Wu4-5/+33
Additionally, add an attribute to the tap function to prevent future callers from leaking this memory. Change-Id: Ief6af2bbc74d19153628f09d7b273e85cb2284ab Reviewed-on: https://code.wireshark.org/review/26642 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26Qt: TCP Stream Graphs dialog updates.Gerald Combs5-15/+73
Add duplicate ACK ticks to Statistics → TCP Stream Graphs → Time Sequence (tcptrace), which I missed when porting from GTK+. Add zero window crosses while we're here. Switch TCPStreamDialog to a subclass of GeometryStateDialog. Add a slot and URL for the Help button and a stub entry in the User's Guide. Bug: 12009 Change-Id: Idf2ddb9eb33d924d65998285b5cffc234156497c Reviewed-on: https://code.wireshark.org/review/26592 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-25[Automatic update for 2018-03-25]Gerald Combs6-96/+0
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ie7d9f2b00222e5ed4e05b5c3fc9100ad26e65084 Reviewed-on: https://code.wireshark.org/review/26635 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-25In some dialogs, have *no* auto-default buttons on macOS.Guy Harris2-2/+53
In macOS dialogs, there's a default button, which is the button that Enter/Return activates, and that Enter/Return *always* activates, *regardless* of what button has the input focus. To activate the button that has the input focus, you use the space bar. To implement that, we need to disable auto-default on all buttons, including the Cancel button. Put in a comment explaining all this. We may want to do this in all alert boxes, and possibly all dialogs with buttons. Change-Id: I214dd2870a9720ea705d8db39adc5b6af2003fb1 Reviewed-on: https://code.wireshark.org/review/26629 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-24wslua: Fix loggingPeter Wu1-1/+1
Always display Lua messages (to match tshark), do not send them to qDebug as they will not be visible with the default log options. Change-Id: I660a3877355891d45881b26735596ea6dc8a8b29 Fixes: v2.5.0rc0-2037-gc9b6887d84 ("wslua: Fix logger after g6a5e90f2") Reviewed-on: https://code.wireshark.org/review/26599 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-24OID name resolv: Fix MIB/PIB path presentationsJaap Keuter2-2/+4
oids.c: Sort out libsmi init, add user paths once. Qt, About WS: Stop memory leak of MIB/PIB paths. GTK, About WS: Allow for 20 individual paths. tshark, folders: init before getting paths, allow 20 individual. Bug: 14539 Change-Id: I113ee2dd4394d553a16b256e66fd840eeeec78ef Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/26555 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-23Qt: Remove a redundant include.Gerald Combs1-1/+0
Change-Id: I0f5e4227bebc98678344b28e835e1c7b26b57502 Reviewed-on: https://code.wireshark.org/review/26607 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-23Qt: ensure that taps are invoked on reload/rescanPeter Wu1-1/+2
Invoke the tap draw callback immediately after reloading a capture (or changing a display filter) rather than waiting for a timer to expire. Change-Id: I3d1549d1a18c8e173cd29d45f31ce7586e0d70fe Reviewed-on: https://code.wireshark.org/review/26600 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-21Qt: fix "Follow stream" in Conversations dialogPeter Wu4-16/+16
If no stream is given to FollowStreamDialog::follow(), then it overwrites the display filter with a conversation filter for the first packet in the capture file. Pass an explicit stream number and the "Follow stream" button will set a correct display filter. Test: open pcap with three TCP streams. Statistics -> Conversations. Select last TCP conversation (expect "tcp.stream eq 2"). Select the second conversation (expect "tcp.stream eq 1") and activate "Filter Out" button (expect "!(tcp.stream eq 1)" and not "!(tcp.stream eq 2) and !(tcp.stream eq 1)"). Bug: 14254 Change-Id: I28744d7f76f5034b07ea5660b45399566e3a7d2c Reviewed-on: https://code.wireshark.org/review/26520 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-20Note that exit_application() has UI-specific implementations.Guy Harris1-0/+1
Change-Id: I79d51dd4301451d4158d172d0b05094cb3d5d61b Reviewed-on: https://code.wireshark.org/review/26576 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-20Remove redundant declaration of exit_application().Guy Harris1-3/+0
Change-Id: I60c9236a53083f14d1f7b94c7db66172944d17bf Reviewed-on: https://code.wireshark.org/review/26575 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-20gui_utils(.c): fix no previous prototype for ‘exit_application’ ↵Alexis La Goutte1-0/+2
[-Wmissing-prototypes] Change-Id: I975fdc9ce7aa53208fc13cc76dcf0bb7a4a58bcd Reviewed-on: https://code.wireshark.org/review/26569 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 03:07:37 +0000