aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
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 Combs7-14/+37
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 Valverde8-1208/+1105
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-28Global, not static.Guy Harris2-1/+3
Change-Id: I185a1786365f185f18f3ec492a8ef165d61595ed Reviewed-on: https://code.wireshark.org/review/16185 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-28Have commandline_other_options() directly fill in the global structure.Guy Harris3-34/+34
Other code looks at the global structure, so there won't be other structures; just fill in the global structure directly. Change-Id: I4dc87b79168c5a7c9ab1f085aa2d78cc6d2c9019 Reviewed-on: https://code.wireshark.org/review/16184 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-28Don't set quit_after_cap if no pcap, as it's not present.Guy Harris1-1/+1
Change-Id: I871f75394ba66967d7d7be203bd9e235575458e1 Reviewed-on: https://code.wireshark.org/review/16183 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-28Make quit_after_cap an item in commandline_param_info_t.Guy Harris5-58/+57
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 Harris6-8/+29
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-27We need global_capture_opts if we have extcap, even without pcap.Guy Harris1-1/+1
Change-Id: I16b778064c1cd2bbf281fb5192bf35da252e99dd Reviewed-on: https://code.wireshark.org/review/16179 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 Combs3-3/+11
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>
2016-06-26Qt: Handle unhandled filter actions.Gerald Combs7-21/+29
Handle FilterAction::ActionColorize and ::ActionFind. Remove ::ActionConversation since it was unused. Assert when we encounter a missing FilterAction, similar to what we do in other parts of the code. Bug: 12363 Change-Id: I5c1ecd488e5bdb9700a80fc70ec7c047311054b6 Reviewed-on: https://code.wireshark.org/review/16131 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-26Qt: Try to fix un-maximize behavior on OS X.Gerald Combs4-11/+40
On OS X, create dialogs with valid parents so that we don't trigger QTBUG-46701. Document QDialog's "on top", maximize, and minimize behaviors. Bug: 12544 Change-Id: I32c0ef01dba3f7132e5fd0cd61f9feb654b92009 Reviewed-on: https://code.wireshark.org/review/16127 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-26Qt: Conversation and Endpoint dialog performance tweaks.Gerald Combs9-170/+209
Generate column text dynamically. This keeps us from having to iterate over our tree items each time we receive updates. Set the uniformRowHeights property. Stop automatically resizing columns after 200 items. Fixup name resolution behavior. Disable the checkbox if host name resolution is disabled. Change-Id: Ib2fef604d6ee9e39a8b1edd72d58d0cb02d3bb64 Reviewed-on: https://code.wireshark.org/review/16110 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-26filter: rename shadow varDario Lombardo2-5/+5
Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545 Reviewed-on: https://code.wireshark.org/review/16102 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26srt: rename shadow variableDario Lombardo1-3/+3
Change-Id: I69bda25f79b6b46bdb288e32133847a853b614e0 Reviewed-on: https://code.wireshark.org/review/16101 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-25Minor UI locale updates.Gerald Combs3-9/+6
Qt: Call setlocale before commandline_early_options so that we get proper "-v" output, similar to the GTK+ UI. GTK+: Call setlocale once at startup. Bug: 11960 Change-Id: I3c3a196b9d94fc768e1085200891bc8d67e21a08 Reviewed-on: https://code.wireshark.org/review/16132 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: João Valverde <j@v6e.pt>
2016-06-24Qt: Fix "-l" behavior.Gerald Combs3-10/+3
gbcae998 didn't completely fix the missing "-l" behavior. Bug: 12311 Change-Id: Iee3c844013ac137e94848aaafca7aeb3de43e080 Reviewed-on: https://code.wireshark.org/review/16128 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-24Qt: Keep the syntax line edit cursor active.Gerald Combs2-0/+12
Ignore focusOutEvents when the syntax line edit completer is active. This keeps it from hiding its cursor. Bug: 12520 Change-Id: I8e25b92c097e039e26e2381c5209be1e27a6a7cd Reviewed-on: https://code.wireshark.org/review/16126 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jim Young <jim.young.ws@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-23No pcap, no live capture, so no auto_scroll_live.Guy Harris1-0/+2
Change-Id: Ic1993916cdb78c946bb291fa59f7cdc25e9cef2d Reviewed-on: https://code.wireshark.org/review/16088 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23Qt: quit the UI if WIRESHARK_QUIT_AFTER_CAPTURE is set (offline mode too).Dario Lombardo2-4/+16
This change is useful to use the offline mode in tests (like fuzzing) that require the software to quit after the processing of a sample. Change-Id: I311c642edecf4012dc518c2bf8bca66c97aa1b02 Reviewed-on: https://code.wireshark.org/review/16038 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 16:17:16 +0000