aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2017-09-05Fix unitialized variable warnings that popped up with -OgJoão Valverde1-1/+1
Using GCC version 7.1.1. Change-Id: I7447a48fc97efb1eb15a016a29165f69d37f40a6 Reviewed-on: https://code.wireshark.org/review/23399 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-03Qt: Interface Toolbar log dialog for each controlStig Bjørlykke2-24/+30
Have separate log dialogs for each control logger button. Bug: 14033 Change-Id: Iaabcbe38da196ebed1302f66b77864f880121856 Reviewed-on: https://code.wireshark.org/review/23364 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-09-02Have a single IPv6 tapJoão Valverde2-4/+4
Optimize code and open possibility for enriching IPv6 tap data. Change-Id: I5a204d7464cde32123d5bfe664cc9b6bcf08dbe1 Reviewed-on: https://code.wireshark.org/review/23340 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-31endpoint_dialog.cpp: remove a useless breakPascal Quantin1-1/+0
Change-Id: I0aafbe27b54969e77ba4df3106b9f35809d848a4 Reviewed-on: https://code.wireshark.org/review/23335 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-08-31Qt: Fix errors when compiling for Qt4.Jens Kilian7-4/+39
This allows Wireshark to be built on RedHat EL 7.2, with Qt 4.8.5. Bug: 13909 Change-Id: Ia39a288cc342afa2bd0217cb59dac84c3227086c Reviewed-on: https://code.wireshark.org/review/23322 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-08-31Fix MacOS buildJim Young1-1/+1
Commit 8d13f14f958b9ee00b59fd869bd1630f76e6fa65 introduced a preprocessor buglet affecting MacOS builds. Change #if to #ifdef. Change-Id: I3d76c83428658abcf382e18066be0e24309ecbba Reviewed-on: https://code.wireshark.org/review/23317 Petri-Dish: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jim Young <jim.young.ws@gmail.com>
2017-08-31extcap: fix parameters save in preferences filePascal Quantin2-6/+1
Since g583150198b, extcap_arg structures holds a pointer to the current preference value. So let's not update its value outside of the prefs API otherwise the call to prefs_set_string_value() with pref_current done afterwards will never notify the change and the updated value will not be written in the preference file. Moreover update ExtcapArgument::resetValue() method to have an empty string instead of a NULL pointer. Otherwise prefs_set_string_value() will not notify the change and save the restored default value in the preference file either. Change-Id: Ie70e79d471c75e25705c7654e420a7706ebc4032 Reviewed-on: https://code.wireshark.org/review/23308 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-30Qt: Temporarily disable DP scaling on non-macOS systems.Gerald Combs1-0/+4
Enable device pixel scaling in QCustomPlot only on macOS. Blind attempt at diagnosing / fixing bug 14012. Change-Id: I95e38eaa072d69aef0fe1d642951603800c3a280 Ping-Bug: 14012 Reviewed-on: https://code.wireshark.org/review/23314 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-08-30Qt: check QVector size before accessing its content and not afterPascal Quantin1-1/+1
Bug: 14017 Change-Id: Ied38551c78b4593f60165d9e3b04bb3913d6b258 Reviewed-on: https://code.wireshark.org/review/23310 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-28extcap: Close control handles when doneStig Bjørlykke1-12/+8
Ensure the event handles are closed when done to avoid leakages. Also improved the control reader to use WaitForSingleObject(). Change-Id: I1679d9c09e247b28117ec05c3e1b0f3ba0e99674 Ping-Bug: 13833 Reviewed-on: https://code.wireshark.org/review/23263 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-08-28iface_lists: Remove locked fieldMikael Kanstrup7-77/+50
It seems the locked field of interface_t was used to avoid simultaneous updates of interface entries from either multiple threads or most likely the recursive UI update callbacks case later identified. Since 802362e ("Avoid recursive scan_local_interfaces operation") the recursive callback behavior is no longer happening. And as code does not have consistent checks the locked field can anyway hardly protect a multi-threaded case if such a case exists. Remove the unnecessary locked field. Ping-Bug: 13864 Change-Id: Idc393f702b82aa6014dd636572d00f0d67120bf3 Reviewed-on: https://code.wireshark.org/review/23262 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-08-28Fix leaks when active capture interface goes downMikael Kanstrup1-1/+1
If an interface goes down while packet capture is ongoing related interface_option element is not freed properly. Fix by using the appropriate free function that both remove the element and frees element members. Ping-Bug: 13864 Change-Id: I66a11d64615dc9648441b532e4ff658ea42a5acf Reviewed-on: https://code.wireshark.org/review/23205 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-08-28iface_lists: Access ifaces member by referenceMikael Kanstrup6-62/+60
Change access of ifaces elements from by val to by reference. With this change unnecessary copying of the whole struct is avoided but even more important is that elements no longer have to be removed and inserted whenever data is updated. This change aims to make it more clear that ifaces elements shall never directly be removed from the array. Instead use function capture_opts_del_iface NOTE: Code for GTK UI not updated Ping-Bug: 13864 Change-Id: I04b65d5ee36526b30d959b8e5a2a48a3c7c4f15b Reviewed-on: https://code.wireshark.org/review/23204 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-28Fix leak when removing interfaces from manage interfaces dialogMikael Kanstrup2-1/+4
When removing interfaces from the manage interfaces dialog the interface elements where not freed properly causing leaks. Free the interface element when removed from the array. Ping-Bug: 13864 Change-Id: I6beb222a5475278cfc6cb454a7c8b2c86f636f38 Reviewed-on: https://code.wireshark.org/review/23203 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-28iface_lists: Access all_ifaces member by referenceMikael Kanstrup14-221/+186
Change access of all_ifaces elements from by val to by reference. With this change unnecessary copying of the whole struct is avoided but even more important is that elements no longer have to be removed and inserted whenever data is updated. This change aims to make it more clear that all_ifaces elements shall never be removed from the array without freeing resources via the capture_opts_free_interface_t function. NOTE: Code for GTK UI not updated Ping-Bug: 13864 Change-Id: I36742cb1d5c8daa136c9d3732a044a7c8e5c7fe7 Reviewed-on: https://code.wireshark.org/review/23201 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-28Qt: Fix build without libpcapStig Bjørlykke1-2/+0
Change-Id: I9b9b5de1beb23486ccc000feda54c2b20a33f4ad Reviewed-on: https://code.wireshark.org/review/23251 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-28extcap: Interface Toolbar support on WindowsHåkon Øye Amundsen6-60/+161
Add support for extcap control pipes on Windows. Improved read loop in InterfaceToolbarReader. Delay opening control pipes until extcap has opened the fifo pipe. Make extcap_example.py work on Windows. Bug: 13833 Change-Id: I4b47d25452637759b8a3be53be48eee5365bc0e4 Reviewed-on: https://code.wireshark.org/review/23211 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-08-22commandline: fix compilation without pcap.Dario Lombardo1-1/+1
Change-Id: I37b9dd3f9515948a5ccf72cd2fd76fc1251c9294 Reviewed-on: https://code.wireshark.org/review/23161 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-08-22Fix requesting hardware timestamps without -kAhmad Fatoum3-0/+8
The interface_options struct passed to dumpcap is populated differently when running Wireshark with and without -k. Previously, only with -k was there a valid pointer in interface_opts.timestamp_type Fixes: aca55a2 ("Add hardware timestamping support") Signed-off-by: Ahmad Fatoum <ahmad.fatoum@siemens.com> Change-Id: Ic7ecc5a1190c28197d6a7271f1b353f74d43ca61 Reviewed-on: https://code.wireshark.org/review/23160 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-22Add hardware timestamping supportAhmad Fatoum3-11/+33
pcap provides a pcap_set_tstamp_type function, which can be used to request hardware timestamps from a supporting kernel. This patch adds support for aforementioned function as well as two new command line options to dumpcap, wireshark and tshark: --list-time-stamp-types List time stamp types supported for the interface --time-stamp-type <type> Change the interface's timestamp method Name choice mimics those used by tcpdump(1), which already supports this feature. However, unlike tcpdump, we provide both options unconditionally. If Wireshark was configured without pcap_set_tstamp_type being available, --list-time-stamp-types reports an empty list. Change-Id: I418a4b2b84cb01949cd262aad0ad8427f5ac0652 Signed-off-by: Ahmad Fatoum <ahmad.fatoum@siemens.com> Reviewed-on: https://code.wireshark.org/review/23113 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-21[skinny]: minor changes to xml fileDiederik de Groot1-7/+7
- Fix/syncronise spelling for similar field types - Fix cog.py script invocation Change-Id: Iab6d8ac6414c1ba9b97c49d7d0a4d2609eb1a55b Reviewed-on: https://code.wireshark.org/review/23153 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-20[Automatic update for 2017-08-20]Gerald Combs6-663/+9
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I676dc2814760f711a3d3b8b4979ef8a0077e26a1 Reviewed-on: https://code.wireshark.org/review/23141 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-15Qt: fix compilation without pcap.Dario Lombardo4-8/+13
Change-Id: Ib8d21d63730ea6e18032b89ba0042ee7521645a8 Reviewed-on: https://code.wireshark.org/review/23078 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-13[Automatic update for 2017-08-13]Gerald Combs7-902/+195
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ie0e554e42e96a8b8f8c8ce7f4a9ea615276b49fb Reviewed-on: https://code.wireshark.org/review/23056 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-09editor_file_dialog (qt/widgets): fix indent (use 4 spaces)Alexis La Goutte1-4/+4
Change-Id: I507737879c2e24cdca6d305b8e3775967071f1c3 Reviewed-on: https://code.wireshark.org/review/23028 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-08io_graph_dialog.cpp: Remove graph_enabled_vs.Michael Mann1-7/+0
No longer necessary with model Change-Id: If1516f264013fabe1211aa04fe054b15e235b36a Reviewed-on: https://code.wireshark.org/review/23007 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-08-07Use UAT model for I/O graphMichael Mann11-719/+601
Convert from using TreeWidgetItems to UAT model/delegate. More of the GUI is "just handled" within the table. Required to add support for "colors" and "protocol fields" to UAT types. Also needed to add some hacks for "custom" UAT field handlers for backwards compatibility with the existing UAT structure used. Because UAT functionality was switched completely to the model, some information in the table was "lost in translation" because the UATs themselves aren't translated to other languages. TODO: 2. Better "order of operations"? A bunch of NULL/size checks needed to be added to prevent crashing. Now with model/"view" should events/functions be reordered? Bug: 13585 Change-Id: I2bbba78182317c4fada07b927c05d0c6f4cdc0fe Reviewed-on: https://code.wireshark.org/review/22766 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-08-07Use proper tab order for "file types" in UAT "table".Michael Mann6-45/+189
Directory and File "UAT types" have been using a separately launched dialog, instead of an "editor", so it breaks "tab rules". Create and treat (File) dialog as an editor. Change-Id: I983728abefb0cdd79899468a800328f1b56e2910 Reviewed-on: https://code.wireshark.org/review/22886 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-08-06[Automatic update for 2017-08-06]Gerald Combs7-710/+265
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ie6f7676ccde9337cb479e448884b0240e3fd238c Reviewed-on: https://code.wireshark.org/review/22961 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-06simple_dialog.cpp: Fix missed Qt version wrapper.Michael Mann1-0/+2
check_box_ member was missing a #if (QT_VERSION > QT_VERSION_CHECK(5, 2, 0)) wrapper Change-Id: Ibdddbe523b8e15c0af31fddfd3f251c24114d11a Reviewed-on: https://code.wireshark.org/review/22959 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-08-05QT: Add shortcuts for "Follow XXX Stream"Uli Heilmeier1-0/+12
Add shortcut Ctrl+Alt+Shift+ T for "Follow TCP Stream" U for "Follow UDP Stream" H for "Follow HTTP Stream" S for "Follow SSL Stream" Bug: 13047 Change-Id: I0fdd5b4d20b976b56694821a9c11424eab40b2b3 Reviewed-on: https://code.wireshark.org/review/22930 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-08-04Qt: Fixup the welcome screen stylesheet.Gerald Combs1-20/+22
Pass in a QString argument only when we have a placeholder. Fixes a QString::arg: Argument missing: MainWelcome { ... warning on Windows. Change-Id: I42dd155252bd9fd4f21f0112b62044c7397c9810 Reviewed-on: https://code.wireshark.org/review/22934 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-30Fix copy/pasteo so Qt Model Source is displayed properly in Visual StudioMichael Mann1-1/+1
Change-Id: I81dbc6947f0d878d2c214541cf0d540444ea1592 Reviewed-on: https://code.wireshark.org/review/22867 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-30Define Q_NULLPTR as NULL if not already definedAlexis La Goutte2-0/+6
it is not supported with Qt 4.x Change-Id: Ie98d5e03d471869e08f5354a509c3317c7c780d7 Reviewed-on: https://code.wireshark.org/review/22831 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-29Qt: Add preference for show file load time in the status barStig Bjørlykke4-5/+57
This will leave more room for messages on smaller screens. Set the default OFF because this is probably only useful for developers. Group Status Bar settings in the Layout frame. Change-Id: Iea9a55b6c088aac10ee7680b1e8a882ed00c73be Reviewed-on: https://code.wireshark.org/review/22824 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-27Qt: Add preference for show selected packet numberStig Bjørlykke4-8/+27
The information about the selected packet number is available from the Number column and from the Frame entry in the Packet Details so make the entry in the status bar optional. Also remove duplicate "Packet:" entry, add the UTF8_MIDDLE_DOT separator and rename the prefix to "Selected Packet:". Bug: 13902 Change-Id: I0e7ba884bdcbdc87a5738223ef92f52e4ac195e5 Reviewed-on: https://code.wireshark.org/review/22807 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-27Qt: SimpleDialog fixes and updates.Gerald Combs5-92/+118
Add WiresharkApplication::mainWindow and use it to move the C simple_dialog routines to simple_dialog.cpp. In SimpleDialog, make sure our checkbox is initialized. Don't store our parent widget (which might go away) in a static variable, just use wsApp->mainWindow(). Make sure we use check boxes only in Qt 5.2 or later. Bug: 13275 Change-Id: I72a9715c59f2efd50f722197f416179e87bb6a8b Reviewed-on: https://code.wireshark.org/review/22805 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>
2017-07-26Qt: Create models directoryRoland Knall50-116/+140
Following the move for widgets and utils directory, moving models and delegates to the utils directory. Guidelines for this directory are: - Implementation of a model - Implementation of a delegate - Utility class for data storage used by a model Note: additionally all includes affected by this move have been changed to absolute path includes, instead of relative ones. Change-Id: I3bb868af7d3570437682b722a0cd46c906628570 Reviewed-on: https://code.wireshark.org/review/22790 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-26Qt: Fix Makefile.am for utils dir changeRoland Knall1-1/+1
Fix Makefile.am Change-Id: I31cdbc2af0659b247d22af7438300c44acfff63e Reviewed-on: https://code.wireshark.org/review/22801 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-26Qt: Move utils to separate utils directoryRoland Knall150-332/+276
Following the move for widgets directory, moving utils to the utils directory. Guidelines for this directory are: - Generic use but not a widget - Utility functionality used by many classes Note: additionally all includes affected by this move have been changed to absolute path includes, instead of relative ones. Change-Id: I019ae4b6e6f6d06a5745a63ed195edbd36fb936b Reviewed-on: https://code.wireshark.org/review/22602 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-26Add current packet to the status bar.Michael Mann3-0/+18
For users with lots of columns, they may loose track of the current frame/packet. Bug: 13902 Change-Id: I4d937dc437e254a09d938733aef5f5678ede1095 Reviewed-on: https://code.wireshark.org/review/22772 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: Roland Knall <rknall@gmail.com>
2017-07-26WirelessTimeline: move signals out of setPacketList().Michael Mann2-6/+5
Start to remove the dependency on PacketList by moving the signals out of setPacketList and into MainWindow. Change-Id: Ibbe5a5619e06809eb71aee5145c4b0f7d54382a2 Reviewed-on: https://code.wireshark.org/review/22798 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: Roland Knall <rknall@gmail.com>
2017-07-25Qt: Make SimpleDialog a plain, non-QObject class.Gerald Combs4-30/+47
Don't assume that the application is initialized when we create a SimpleDialog. Bug: 13275 Change-Id: Ieeb52430500570db88463069833855c3789f686b Reviewed-on: https://code.wireshark.org/review/22778 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-23Qt: Compile InterfaceToolbar with Qt4Stig Bjørlykke1-0/+28
The InterfaceToolbar does not currently work with Qt4 because usage of some Qt 5.2 features, but this should at least make it compile. Change-Id: Id610e04d6c266556bfb84da5399e57a6c1fe9938 Ping-Bug: 13909 Reviewed-on: https://code.wireshark.org/review/22761 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-23Inhibit unhandled Ctrl key presses being redirected to the display filterLars Christensen1-1/+2
Pressing the display filter shortcut Ctrl-/ inserts a '/' into the LineEdit. On Windows QKeyEvent::text() contains a printable character when Ctrl is held down and are being redirected in MainWindow::eventFilter(). This patch filters events that has the CtrlModifier. Change-Id: Iefed962b7a2cc944a39b09de9d84b4522a39ff13 Reviewed-on: https://code.wireshark.org/review/22697 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-07-22Have UatFrame send out proper notifications.Michael Mann3-4/+21
UatFrame was originally written for filter expressions, so it still had some "filter expression specific" functionality in it. Move the "filter expression notifications" to the preferences dialog and add support for proper notification if UAT affects fields or dissection (like expert info UAT). Change-Id: I84cd0c7923450692916bbc6c2cdce93a9830d722 Reviewed-on: https://code.wireshark.org/review/22758 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-21Qt RTP: Add the default device and adjust sample rates.Gerald Combs4-18/+45
In the RTP player dialog, list the default audio device first, ensure it's selected by default and ensure that the list items are unique. According to http://code.qt.io/cgit/qt/qtmultimedia.git/tree/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp?h=5.9 the default device on Windows uses the special WAVE_MAPPER id, which appears to support various sample rates even when the underlying hardware doesn't. Ensuring the names are unique fixes an issue I'm seeing on a test machine here. When decoding, check to see if our sample rate is supported by our output device and adjust accordingly. Bug: 13906 Change-Id: Iddc0beb2459bfac42276ff29d227c2619b0a8d90 Reviewed-on: https://code.wireshark.org/review/22756 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-20.gitignore: move ui/qt/gitignore to root gitignoreAlexis La Goutte1-3/+0
Change-Id: I303c6998b7b825ebb89aa1a81296b1ad69786ec1 Reviewed-on: https://code.wireshark.org/review/22538 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-07-20Remove line numbers (locations) from .ts filesJoão Valverde7-22617/+7
To make translation updates less noisy. Change-Id: I3efee819ea10bb326862e0f818bfd3cd7eff48e3 Reviewed-on: https://code.wireshark.org/review/22654 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-07-18Qt: Don't clobber the itemview hover behavior on Windows.Gerald Combs1-0/+2
Change-Id: I47a8087a1d3303baec9b598135c3f8a3021dadbe Reviewed-on: https://code.wireshark.org/review/22707 Reviewed-by: Gerald Combs <gerald@wireshark.org>