summaryrefslogtreecommitdiff
path: root/ui/qt
AgeCommit message (Collapse)AuthorFilesLines
2015-06-28[Automatic update for 2015-06-28]Gerald Combs13-3571/+3660
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Idf976da88eab4126089b612084ce9d4a4643d80c Reviewed-on: https://code.wireshark.org/review/9201 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-26Qt: tweaks to Capture Interfaces dialogPascal Quantin3-18/+67
- Add option to stop capture after X files are created - Increase the max value for number of packets / files / bytes / seconds from 1000 to INT_MAX - Fix capture name file selection Change-Id: I9fb8eeaa925e5bd5380bb654686575f41126546a Reviewed-on: https://code.wireshark.org/review/9162 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-26Commit d4aa1a1c24e984339806c4ddb000ea9f9b352659 added some Q_UNUSEDJoerg Mayer2-6/+2
statements to c++ files. The standard method to mark function parameters as unused in cpp is to just leave out the variable name. Change-Id: I4f07ad9f494ad16388eadb67e93ea7b26ae70eb5 Reviewed-on: https://code.wireshark.org/review/9152 Reviewed-by: Guy Harris <guy@alum.mit.edu> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-25Qt: when a capture file is closed, go back to the welcome screen onlyMartin Kaiser1-2/+3
if we're not capturing to multiple files Change-Id: I18d36ef8e7e3525b2bd8d94f2b2349cefa3ecb52 Reviewed-on: https://code.wireshark.org/review/9161 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-25Make sure the byte view maintains visibility.Gerald Combs1-1/+2
In ByteViewTab::clear, make sure we stay hidden or visible as appropriate. Bug: 11313 Change-Id: I12fa5169e840dbc4d27b6525fe6be72e13acce5d Reviewed-on: https://code.wireshark.org/review/9155 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-25Remove the other g_hash_table_containsEvan Huus1-8/+7
Missed a bunch of them in g131f8f0. Change-Id: I5b1df810a31c26c3ab3cd778f8774519283217c8 Reviewed-on: https://code.wireshark.org/review/9143 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-25Qt, cmake: put the build dir before the source dir in the include pathMartin Kaiser1-1/+1
this should prevent Visual Studio from picking up generated include files which may be lying around in the source tree (as leftovers from previous in-tree builds) Change-Id: I2406c31bc0638eb13ed4b539ddc607512051033d Reviewed-on: https://code.wireshark.org/review/9130 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-25Qt: use <> for including the generated ui_*.h filesMartin Kaiser61-61/+61
this should make Visual Studio pick up the generated include files from the build directory instead of the source directory (which may contain lefovers from an in-tree build) Change-Id: Ie3de4cdd85a2865e203118a42ab10f443372f03b Reviewed-on: https://code.wireshark.org/review/9129 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-25Plugin Interface: Add GUI callbacksRoland Knall2-2/+44
Rename ext_menubar to a more appropriate plugin_if. External menus can be implemented by plugins to present additional menus for deep-packet analysis. One side-effect of such menus being implemented as plugins is, that they are being executed in different threads and therefore can only use limited access to the main GUI. Also, there is no safe cross-gui (GTK and Qt) way for many features. This patch implements a first functionality, by which a plugin implemented using ext_menubar can apply a display filter to the main view. For now the implementation supports filtering, as well as saving a preference. Change-Id: Iffe4caa954bbeb8ce356352de4dae348a50efba9 Reviewed-on: https://code.wireshark.org/review/8773 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-25Qt: mark unused parameters as suchPascal Quantin2-0/+3
Change-Id: Ib53d6da0d6660cf2c6a3283ff6123a2f18a8abda Reviewed-on: https://code.wireshark.org/review/9128 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-25Qt: fix crashes when Wireshark is closed while running a captureMartin Kaiser1-1/+2
if we haven't captured any packets yet, don't display a warning about unsaved changes make sure that we're not running into a scenario where MainWindow::testCaptureFileClose() tries to close the capture file at the same time as the pipe handler who sees an eof on the pipe cf_has_unsaved_data() should return false if we have a temporary file that contains no packets Change-Id: I18d75bd658b85d45dd3313d49e2cd654c6300de5 Reviewed-on: https://code.wireshark.org/review/9109 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-25Add minimize and maximize buttons to the TCP stream dialogs.Jeff Morriss2-2/+2
The first thing I generally do when I open a graph is to maximize it. Having a maximize button makes that a lot easier. Call QDialog(NULL, Qt::Window) similar to g80342e4. Call QDialog(NULL) in the about box. Change-Id: I4f229ab579d0912cb03ba8f8d0300d933d0ba914 Reviewed-on: https://code.wireshark.org/review/7072 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-24Disable "Refresh Interfaces" when capturingEvan Huus1-0/+1
It breaks restarts, and doesn't do anything useful at this point anyways. Bug: 11176 Change-Id: I6a010becf851fea8690b445874b29b54546fb2e3 Reviewed-on: https://code.wireshark.org/review/9106 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-24qt: fix more button statesEvan Huus1-0/+3
As in gcc614a9 we have to manually uncheck buttons if we decide not to action them. Change-Id: Ia5dc29a292bc6d75a1e8753da06a053cafa66866 Reviewed-on: https://code.wireshark.org/review/9107 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-24qt: fix button state when cancelling saveEvan Huus1-1/+6
If the user decides not to capture after all, by hitting cancel when prompted for their unsaved changes, we have to manually uncheck the button again because Qt helpfully checks it for us. Bug: 11145 Change-Id: I362d72787ddb138d382a899d091698c6652eebb2 Reviewed-on: https://code.wireshark.org/review/9102 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-24Qt: Add Reload button on MainToolBarAlexis La Goutte2-2/+3
Add @2x versions of x-capture-file-reload as well. Change-Id: I08819cf66903884e0344a4f9bcd891befb582e90 Reviewed-on: https://code.wireshark.org/review/9066 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-24Remove another batch of deprecated tvb_length callsEvan Huus2-3/+3
Change-Id: Icfdde38e40cca05d0705a081153a4ea3e8782ee7 Reviewed-on: https://code.wireshark.org/review/9086 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-23[Qt] switch screens only if we're acutally starting a captureMartin Kaiser1-2/+2
don't do the switch when the capture can't be started (e.g. because we didn't select any interface from which to capture) Change-Id: Ibabd703863d546c95b9fbe9bd2280d67a22dfc26 Reviewed-on: https://code.wireshark.org/review/9072 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23[Qt] if the capture is stopped before we received any packet...Martin Kaiser1-0/+2
... we go back to the main welcome screen like we do in GTK Change-Id: I64ef29665af61da55c1971ca59d1fab25d205874 Reviewed-on: https://code.wireshark.org/review/9071 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23Qt: change default behavior of 'Decode As' windowPascal Quantin3-7/+20
Up to know Qt 'Decode As' window was saving manual configuration automatically, contrary to GTK UI. This can be misleading when decoding protocols without a fixed identifier (port number, USB bus/device id, ...). Opening a new trace might lead to previous and now irrelevant settings being applied. Make this optional and add a Save button to permanently store the current configuration. Change-Id: I077c560f9e71cab16a74247e2e9d87523c0ed85e Reviewed-on: https://code.wireshark.org/review/9058 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-23Qt: Be less aggressive about reselecting packets.Gerald Combs1-7/+2
Don't reselect the current row in redrawVisiblePackets. That routine is called in quite a few places, including ones where we don't want to automatically scroll to the current packet. Change-Id: Ia29a832235c0e260d8b17f1ce76745047700537b Reviewed-on: https://code.wireshark.org/review/9064 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-23Morph ProgressBar into CaptureProgressFrame.Gerald Combs15-117/+210
Switch from a plain QProgressBar to a QFrame with a QProgressBar and a stop button. Add a stop_flag boolean to the capture_file struct. To do: - Start adding the progress bar to dialogs. - Don't complain so loudly when the user stops a capture. Change-Id: Iedd1d7d79f2044f1a53e4fb22186d25930a3ef03 Reviewed-on: https://code.wireshark.org/review/9029 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-22gtk,qt: Fix minor buffer underrunPeter Wu1-1/+1
Avoid accessing the first byte before an empty dirname. No idea why this was not triggered before. Reproduced with an empty Wireshark profile and wireshark and wireshark-qt. Caught with ASAN. Change-Id: I44f8fdab03ad0f24e663df63a1c54567996a3dfc Reviewed-on: https://code.wireshark.org/review/9037 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-22Use StockIcon to load toolbar icons.Gerald Combs1-1/+2
StockIcon loads each available icon size. Change-Id: Ia5604cc11ed8350e7f4f782312939cf30c94f548 Reviewed-on: https://code.wireshark.org/review/9030 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-22fix the interface list in the main welcome screenMartin Kaiser1-0/+5
when no interfaces are available at startup, the number of columns in the interface tree is set to 1 when new interfaces become available later, the column number is not reset to the default value and we end up with an interface list whose entries are not visible reset the number of columns each time the interface list is updated Change-Id: I267c5b47da6d5ae9e7769b1036622f79da4d97f2 Reviewed-on: https://code.wireshark.org/review/8996 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-21[Automatic update for 2015-06-21]Gerald Combs13-3817/+5235
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I266509d729803494666458651ab3ae88cac50a21 Reviewed-on: https://code.wireshark.org/review/9012 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-20(trivial) fix a spelling mistake in a commentMartin Kaiser1-1/+1
Change-Id: I3f9feab57032c8c701c4ea487c0f5acca428d5d9 Reviewed-on: https://code.wireshark.org/review/8995 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-20qt_ui_utils: fix parameter 'glib_string' not found in the function declarationAlexis La Goutte1-1/+1
Only a small typo glib_string => glib_gstring Change-Id: Ia3ad0a8086f6c1a47065754dee33eff1e0ad770f Reviewed-on: https://code.wireshark.org/review/8988 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-18Qt: remove some compilation warningsPascal Quantin2-2/+4
Change-Id: If14d6b46cfb3d42798afdaa0721f9892af93fddc Reviewed-on: https://code.wireshark.org/review/8981 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-18Add a preferences editor frame.Gerald Combs17-56/+562
This replaces the single preference editor dialog in the GTK+ UI. Change-Id: I10e030981e9f7d1ec121811593586b65cf0797c5 Reviewed-on: https://code.wireshark.org/review/8966 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-17Fix the Qt main window popup behavior.Gerald Combs4-1/+29
By default QMainWindow::createPopupMenu shows a checkable list of toolbars which aren't synced with our actions under the View menu. Replace it with a version that handles all the main window widgets. Change-Id: I5f5c23880133e97e815d3bbbf19ea3bacc482096 Reviewed-on: https://code.wireshark.org/review/8958 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-17Qt: Add protocol preferences menus.Gerald Combs10-7/+447
Add protocol preferences in the packet list and packet detail context menus. Note that we need a PreferencesEditorFrame in the main window for editing numeric and string preferences. For now we just show the prefs dialog. Change-Id: Ice0cc8e9bc25963cc14aa47698f042f2a73088d8 Reviewed-on: https://code.wireshark.org/review/8957 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16Save the wireless toolbar recent settings.Gerald Combs1-2/+2
Change-Id: I2b0417b7dae8679e80f30de2cd10c7bb6fdc1dbf Reviewed-on: https://code.wireshark.org/review/8956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16[Qt] Delete generated file config.pri at "clean"AndersBroman1-1/+1
Change-Id: Ia8469a91eebf92bf8349d2507bdfcfdba55da916 Reviewed-on: https://code.wireshark.org/review/8949 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-16Qt: Remove redundant actions from UI fileMichal Labedzki1-10/+0
Change-Id: Ia571844a2729683ef5f9487fca0aa9d5fd09b235 Reviewed-on: https://code.wireshark.org/review/8948 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-16Check for NL and AIRPCAP defines.Gerald Combs1-11/+11
This should hopefully fix compilation on OS X. Change-Id: I621c92499232dafb6d6db867615baed8dc81eb17 Reviewed-on: https://code.wireshark.org/review/8947 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16Add the wireless toolbar.Gerald Combs10-12/+645
Add the wireless toolbar to the Qt UI. Start adding AirPcap support to ui/80211_utils. Add FCS validation routines to ws80211_utils. Move a bunch of AirPcap routines that require epan from caputils to ui/gtk. They were required for driver key management, which we'll leave to the AirPcap Control Panel in the Qt UI. Move frequency-utils to wsutil. Change-Id: I44446758046621d183f5c2ba9f6526bf01e084f1 Reviewed-on: https://code.wireshark.org/review/8910 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-15Accept drop events immediately.Gerald Combs1-1/+1
Accept drop events before opening our capture file instead after. Change-Id: I48fe1cd1e3b5e6f7b076aaa0e3a0d035938a5af7 Reviewed-on: https://code.wireshark.org/review/8929 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-15Qt/Bluetooth: Add Devices dialogueMichal Labedzki10-0/+757
Please found it under Bluetooth menu. It shows all devices found in logs, not only connected, all that its address can be found in logs. Show if device is local (in most cases: capturing on it side) and manufacturer and LMP version what should answer the question what version of Bluetooth is used by Bluetooth device chip. Also firmware version. Change-Id: I32e3b7100cdebcaa850b6541de0ab89dff41c0e1 Reviewed-on: https://code.wireshark.org/review/8901 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-15Qt: Add the ability to show preferences by module name.Gerald Combs5-11/+53
Currently unused, but allows feature parity with the GTK+ UI. Change-Id: I33e0bfb434949aabd75ecd2ed36e696731195542 Reviewed-on: https://code.wireshark.org/review/8922 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-14Include QUrl.Gerald Combs1-0/+1
It's apparently required by Qt4. Change-Id: Ic5f32b9acd0a244477b7631bff39b3ed5ba86a39 Reviewed-on: https://code.wireshark.org/review/8918 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-14Qt: Enable Drag and Drop in the main window.Gerald Combs3-2/+30
Change-Id: I446163dd9e1a277118caab2f7296a3605cb23fd5 Reviewed-on: https://code.wireshark.org/review/8917 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-14[Automatic update for 2015-06-14]Gerald Combs13-430/+897
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id3ff0d609b0a34066c3d23053b8d8bbebfc43070 Reviewed-on: https://code.wireshark.org/review/8914 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-12Qt/Bluetooth/ATT: Add SaveAsImage option for tableMichal Labedzki3-8/+31
Also remove CopyAll button and move this option to table's context menu, where "Save as image" is placed. Change-Id: Ifbdd0c1625f449cb2af33a6cf2de2d282e4c6e6e Reviewed-on: https://code.wireshark.org/review/8900 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-12Qt/Bluetooth/ATT: Fix behaviour when capture file is closedMichal Labedzki2-1/+8
Disable go to frame and control components when capture is closed. You can only browse data and copy them. Change-Id: I05aee5eae5f91f39ab3bb942afdf9000d9b86add Reviewed-on: https://code.wireshark.org/review/8899 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-10Use pid_t on UN*X, and HANDLE on Windows, for the process ID.Guy Harris2-4/+4
This avoids type punning; at least with Xcode 7 beta on El Capitan beta, that produces warnings that get turned into errors. Change-Id: I57f47455b9630f359828c07c92a190b5cb33816f Reviewed-on: https://code.wireshark.org/review/8862 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-09Qt: fix a V595 warning reported by PVS-StudioPascal Quantin1-2/+3
The 'cur_item' pointer was utilized before it was verified against nullptr. Change-Id: I46185f24cf5700e2137f6e40bed45575197c36e7 Reviewed-on: https://code.wireshark.org/review/8858 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-09[MSVC 2015] Use intptr_t for "pointer stored as int" to make MSVC happy.Anders2-4/+4
Change-Id: I5dbbea8527a8bb73b17e5a8a5611c3923d82459c Reviewed-on: https://code.wireshark.org/review/8852 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>
2015-06-08Add TapParameterDialog.Gerald Combs11-186/+383
Split StatsTreeDialog into StatsTreeDialog and TapParameterDialog (its base class). This more closely matches the GTK+ UI and paves the way for more statistics dialogs. Change-Id: I2630385534e829d99724673ade372fcb33200d07 Reviewed-on: https://code.wireshark.org/review/8842 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-07[Automatic update for 2015-06-07]Gerald Combs13-2956/+4377
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I8051df9353cdce000f3b76229df1b2bf7e6b0d57 Reviewed-on: https://code.wireshark.org/review/8811 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-30 07:02:38 +0000