aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt
AgeCommit message (Collapse)AuthorFilesLines
2016-07-10[Automatic update for 2016-07-10]Gerald Combs7-1183/+1218
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9d1c7b06a449a3b0dc02dd99f33c4e7634e2d1c0 Reviewed-on: https://code.wireshark.org/review/16368 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-10Remember query after closing Follow StreamDavid Morsberger2-4/+31
Update main filter after follow stream dialog is closed - Use: previous_filter if new 'Back' button (passed in follow() method) filter_out_filter_ if 'Filter Out This Stream' button (built by appending !current_stream to previous_filter) leave filter alone if window closed using Close button or window close. (current stream) Change-Id: Ic02edeaffdc65ff0f33cac4cb9afb8cde28963c7 Reviewed-on: https://code.wireshark.org/review/16277 Reviewed-by: Jim Young <jim.young.ws@gmail.com> Petri-Dish: Jim Young <jim.young.ws@gmail.com> Tested-by: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10Qt: add assert (CID 1311486).Dario Lombardo1-1/+2
Change-Id: I62290f1f1c7856ee431705a64fae2022b850234a Reviewed-on: https://code.wireshark.org/review/16361 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-08Qt: Update scrollbars when change byte view formatStig Bjørlykke1-0/+1
Update scrollbars when changing display format between hex and bits view because the height of the phane will change. Change-Id: I81556c8dbdfb0a34f6c97e76834646a40aed62bb Reviewed-on: https://code.wireshark.org/review/16336 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-07-08Qt: add initializers (CID 1261463).Dario Lombardo1-0/+5
Change-Id: I5c2d5c73e188586a91dde342d6347d25495e0263 Reviewed-on: https://code.wireshark.org/review/16325 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-08Qt: add initializer (CID 1269610).Dario Lombardo1-1/+1
Change-Id: I483e5d3f239f4708f9fc6b11c98869bb1381fb44 Reviewed-on: https://code.wireshark.org/review/16324 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-08Qt: add initializers (CID 1317257).Dario Lombardo1-2/+12
Change-Id: I61a63c187990b119b62e99871832913a0e3f75e4 Reviewed-on: https://code.wireshark.org/review/16323 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-06Qt: add initializers (CID 1268205).Dario Lombardo1-10/+10
Change-Id: I7eb71876731df29c076a3a756b6748f165d1c327 Reviewed-on: https://code.wireshark.org/review/16306 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-06Qt: add initializers (CID 1162824).Dario Lombardo1-0/+18
Change-Id: Ib570d3531bfdd35404b75d49dbd7dd43db4c30d9 Reviewed-on: https://code.wireshark.org/review/16310 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-06Qt: remove unneeded constructors.Dario Lombardo2-9/+0
There is no need to have an empty private constructor if an explicit one is already present. The former private constructor didn't initialize the private members causing many CIDs from coverity. Change-Id: I8ba98d2b9fc32a867fdcf3421df7946b90bd7b09 Reviewed-on: https://code.wireshark.org/review/16311 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-05Qt: remove unused variable.Dario Lombardo1-1/+0
This fixes also CID 1159350. Change-Id: I21b55686f96131e3e1cff0feac5f16df1c7c7ca2 Reviewed-on: https://code.wireshark.org/review/16309 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-05Qt: remove unused variable.Dario Lombardo1-1/+0
This fixes CID 1232347. Change-Id: I42b5ac997dbde8fcb05665b24444a60b009871be Reviewed-on: https://code.wireshark.org/review/16290 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-05Qt: add initializers (CID 1233100).Dario Lombardo1-1/+1
Change-Id: I99e0d6bd10cc0faddb8a503ec877b3d03b927f4e Reviewed-on: https://code.wireshark.org/review/16293 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-05Qt: add initializers (CID 1249475).Dario Lombardo1-1/+5
Change-Id: Ic001c0dfab1e82c66473d6ca15633aaa57520659 Reviewed-on: https://code.wireshark.org/review/16294 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-04Qt: add initializer (CID 1230901).Dario Lombardo1-1/+1
Change-Id: Ie7874ef90ce14978adb2c62f208dbcc2a636d3cf Reviewed-on: https://code.wireshark.org/review/16289 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-04Qt: add initializers (CID 1159363).Dario Lombardo1-0/+2
Change-Id: I5d8c2c847c842ddc172d26a3c8aee5d877201a4d Reviewed-on: https://code.wireshark.org/review/16276 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-04Qt: add initializer (CID 1159361).Dario Lombardo1-0/+1
Change-Id: Ib7b66b4e1d600048b8a66b47d035c27ef126da29 Reviewed-on: https://code.wireshark.org/review/16275 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-04Qt: add initializer (CID 1159360).Dario Lombardo1-0/+1
Change-Id: I0ade3925497022d5ac16e66c02727be7fd9f4aa5 Reviewed-on: https://code.wireshark.org/review/16274 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-04Qt: add initializers (CID 1159359).Dario Lombardo1-1/+3
Change-Id: I21de7d1b5f69bdcfa91da560abc262906d412777 Reviewed-on: https://code.wireshark.org/review/16273 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-04Qt: add initializer (CID 1159358).Dario Lombardo1-0/+1
Change-Id: I3002015d793e48c87017571f8997dd5a78438f75 Reviewed-on: https://code.wireshark.org/review/16272 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-04Qt: add initializers (CID 1159357).Dario Lombardo1-1/+4
Change-Id: I27d561d8d63e0d15f7811dd7a033c38df17dfb36 Reviewed-on: https://code.wireshark.org/review/16271 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-04Qt: add initializer (CID 1159355).Dario Lombardo1-0/+1
Change-Id: If2504ea4a9d806005a6d7631ec4645df1af0206a Reviewed-on: https://code.wireshark.org/review/16270 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-04Qt: add initializer (CID 1159354).Dario Lombardo1-1/+3
Change-Id: I0aa4b9db902d084fe33eff5b69ac5cdc85c3fec8 Reviewed-on: https://code.wireshark.org/review/16269 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-03[Automatic update for 2016-07-03]Gerald Combs7-579/+647
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ie8e9bf51a9c25c6693597ba1109c221a111e3b58 Reviewed-on: https://code.wireshark.org/review/16264 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-02Qt: add initializer (CID 1159352).Dario Lombardo1-1/+2
Change-Id: Ie355a31284685ca0c160a46a4daa6c28b39e3093 Reviewed-on: https://code.wireshark.org/review/16247 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-02Qt: remove unneeded check (CID 1159309).Dario Lombardo1-1/+1
fi has already been checked in line 51. Change-Id: Idd4d09a35ef1d4897479538979debd708e2cfe5b Reviewed-on: https://code.wireshark.org/review/16246 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-02Qt: Fixup byte view context menusGerald Combs1-3/+5
Shorten text similar to other context menus. Change-Id: I8806ed4dddb6fc3c51ddbd4150d9090f5b2ca787 Reviewed-on: https://code.wireshark.org/review/16238 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-01Qt: Add ASCII+EBCDIC actions to the byte view context menu.Gerald Combs2-10/+34
Add actions to switch between ASCII and EBCDIC, similar to the hex and bits items. Bug: 5298 Change-Id: Ib601ac6e89411e6482f3e4172726e16a08fdbd2b Reviewed-on: https://code.wireshark.org/review/16225 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-01Qt+Gtk: Fix the -t command line flag.Gerald Combs4-1/+18
Add the time format to commandline_param_info_t and apply it when we've finished application initialization. Bug: 12489 Change-Id: Ice626198a610567e945a8e53c0c1093797e8208e Reviewed-on: https://code.wireshark.org/review/16232 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-30Add missing breaks.Gerald Combs1-1/+3
Add a couple of missing breaks. Fixes CIDs 1362970 and 1362971. Change-Id: If37bcfed9b48ba30ce8ed85df6e232a6bc5d36f4 Reviewed-on: https://code.wireshark.org/review/16223 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-30Remove Makefile.common filesJoão Valverde2-597/+572
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 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>
2016-06-30Qt: Show the correct data in the packet dialog.Gerald Combs1-1/+2
Set our pointers and copy our data *after* we read our packet. Bug: 12556 Change-Id: I5b373f94ad5b2fa2e6563142200a80912e717a96 Reviewed-on: https://code.wireshark.org/review/16211 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: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-30remove Wireshark.pro, modify update-tx accordinglyMartin Kaiser2-641/+0
Wireshark.pro is the qt project file used by qmake which in turn was used by nmake now that nmake is gone, the only reason to keep Wireshark.pro was the update-tx script that syncs our translation files with Transifex update-tx calls lupdate to create a list of texts to translate and lrelease to convert such a list into a binary file lupdate and lrelase can read file names from a project file or get them on the command line modify update-tx to pass the required file names on the command line we can use wildcards so there's no need to change update-tx when a new source file is added remove Wireshark.pro from the release tarball as well Change-Id: I7ff4ebc96f13b4ffc6fb1b2f4e045999fbfbed5e Reviewed-on: https://code.wireshark.org/review/16151 Reviewed-by: Gerald Combs <gerald@wireshark.org> 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-30ui/qt/i18n.qrc is a generated file; ignore it.Guy Harris1-0/+3
Change-Id: Ifc8b45d42d9dbf9560ec825e3ce1784534df7b3b Reviewed-on: https://code.wireshark.org/review/16216 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-29Remove an unused image.Gerald Combs1-0/+0
Remove ui/qt/progress_overlay.png. Change-Id: I2016c6aa5f77314add9870ba95d1c297d72a05c3 Reviewed-on: https://code.wireshark.org/review/16207 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-29Distribute i18n.qrc.in in the release tarball.Guy Harris1-0/+1
Change-Id: I4f974351ab1f4781e140873f460d028f49640ca1 Reviewed-on: https://code.wireshark.org/review/16200 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-29Don't assume GNU sed.Guy Harris1-2/+2
Not all versions of sed support "\n" as meaning "newline" in the replacement string of an s command. POSIX requires tr to support "\n" in the replacement string, however, so use % as meaning "newline" in the sed script, and translate it to a newline using tr. Change-Id: Icdbc0b55787340953dfc90ea82e0421b4e77a896 Reviewed-on: https://code.wireshark.org/review/16199 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-28Qt: Generate .qm files during buildJoão Valverde12-37/+40
Change-Id: Ia2ee723227e1b331eeec0f0463654f35a4c9f37b Reviewed-on: https://code.wireshark.org/review/14508 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-06-28Qt: Make the packet map work with Qt 5.7.Gerald Combs3-7/+12
It's not safe to assume that the overlay scroll bar range is equal(ish) to the number of packets. Adjust our arithmetic accordingly. Change-Id: Ic8cc8a746bdd2bdc6771794303e95a810bc3d1d2 Reviewed-on: https://code.wireshark.org/review/16186 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-28Qt: Make recent preferences changes work with Qt4.Gerald Combs1-9/+11
Cast a pointer to a QWidget * so that compilation and pref selection works for Qt4. Add an assert and some comments. Change-Id: Ide89b698220a9af7b7252488f0770ff35081432e Reviewed-on: https://code.wireshark.org/review/16195 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-28Qt: Add a missing Q_DECLARE_METATYPE to fix a compile error on RHEL 7.Jens Kilian1-0/+1
Change-Id: I6cf0a95525334d5a7561a477093b892a3f821b98 Reviewed-on: https://code.wireshark.org/review/16189 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>
2016-06-28Qt: Preferences dialog performance improvements.Gerald Combs2-190/+285
Fill in advanced and module tree item text when requested. Create ModulePreferencesScrollAreas only when we need to show them. Change-Id: I5aa7d5dba8f5d20de088de3a9d1ee9d58e779269 Reviewed-on: https://code.wireshark.org/review/16181 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-28Make quit_after_cap an item in commandline_param_info_t.Guy Harris2-5/+9
And make the commandline_info structure global, so all the places that look at quit_after_cap can get at it. Change-Id: I006329cf8842c655cca36f024570855d1b16e107 Reviewed-on: https://code.wireshark.org/review/16182 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-28Pull quit_after_cap out of the global capture options.Guy Harris3-5/+18
Really, all the GUI-related options should be pulled out, so they're not cluttering up dumpcap and tshark. Change-Id: I0276dee2be48bae3498a819d8c0c2747fe1352e7 Reviewed-on: https://code.wireshark.org/review/16180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27Qt: Clean up capture file callbacks.Gerald Combs1-4/+5
Mark some callbacks GTK+ only as appropriate. Change a debug message to an assert since we handle all callbacks. Change-Id: I4266f0d7134d19a9c0432354ea36de67501275b4 Reviewed-on: https://code.wireshark.org/review/16171 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-27There's no need to check the return from g_array_index().Jeff Morriss1-8/+0
g_array_index() returns an index into an array: we're sure to find something at that index (whether that something is in bounds is a-whole-nother question). This fixes CIDs 1362829 and 1362890/1362830. There were other CIDs like this but they've already been fixed. Change-Id: I94af0931b9adf3abd3bedc969e399cda98bbdd07 Reviewed-on: https://code.wireshark.org/review/16168 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27endpoint dialog: fix compilation when we don't HAVE_GEOIP.Jeff Morriss1-3/+7
Also fix some indentation and white space. Remove a break-after-return. Bug: 12562 Change-Id: I912ccdac62aceaabcffec8f7739da56cc6036abf Reviewed-on: https://code.wireshark.org/review/16159 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-26[Automatic update for 2016-06-26]Gerald Combs13-4458/+4576
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id5cc1bbd3d7f899e48ae9c2de48613ef0366cc29 Reviewed-on: https://code.wireshark.org/review/16142 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-26Qt: Don't use QStyleOptionViewItemV4.Gerald Combs3-39/+47
It was deprecated in Qt 5.7. Just use QStyleOptionViewItem. Change-Id: I890305a11393940e21bdc68d90ca6602ade16769 Reviewed-on: https://code.wireshark.org/review/16137 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26Add an RA_INTERFACES register action.Gerald Combs1-1/+4
Add RA_INTERFACES between RA_PREFERENCES and RA_CONFIGURATION. Wireshark was spending a suspiciously long time loading module preferences here. (Now we just need to find out why that section of the code is slow.) Change-Id: Iecbe55e8e10c8844bcb151a13e383cb13a3f6eb1 Reviewed-on: https://code.wireshark.org/review/16133 Reviewed-by: Anders Broman <a.broman58@gmail.com>