aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2015-06-03G_STRUCT_OFFSET gives warnings turned errors with MSVC2015,Anders1-1/+6
use offsetof if defined or define it ourselfs as done in other places in our code base. Change-Id: Ia1c72c9648336e93ba8c14d4bc0371d782835370 Reviewed-on: https://code.wireshark.org/review/8735 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-03Add the Display Filter Expression dialog.Gerald Combs19-85/+924
Changes from the GTK+ UI: - The display filter is built on the fly with immediate syntax feedback. - Slightly different layout. - You can search for fields. Make the plain SyntaxLineEdit a bit more plain. Bug: 11128 Change-Id: I06a48cd7b9ba7b9dc193b0199540aede4eb62fa7 Reviewed-on: https://code.wireshark.org/review/8742 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-01gtk: Don't handle deprecation warnings as errorsBalint Reczey2-2/+2
This fixes compilation with latest gdk-pixbuf. I plan rewriting the code to drop deprecaated function usage in a different commit and reverting this one. Ping-Bug: 10750 Change-Id: I400e34e625b147a4858e73240602d75910c6eece Reviewed-on: https://code.wireshark.org/review/8720 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-31[Automatic update for 2015-05-31]Gerald Combs8-31/+7
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I596469e49e1831939305178b0ab14b18f9b00d4b Reviewed-on: https://code.wireshark.org/review/8711 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-31[Automatic update for 2015-05-31]Gerald Combs13-3681/+3902
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I5ff709ae337949905bc4151bbbfcbb125eb9f5d3 Reviewed-on: https://code.wireshark.org/review/8707 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-30Qt: Always draw a byte view.Gerald Combs2-1/+7
When we clear the ByteViewTab add an placeholder ByteViewText. Change-Id: I9fbcd7e609c084d5724a30f80aa141b59ab1c0a1 Reviewed-on: https://code.wireshark.org/review/8688 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-29Qt: Add Conversation Filter sub menuAlexis La Goutte9-26/+85
Apply conversation filters using the new color_dissector_filters.[ch] from g1f03180. Change-Id: I2e535bb3d5b95fd26226422daf9f83c452a95e3c Reviewed-on: https://code.wireshark.org/review/3558 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28Use an "Open" instead of a "Save" dialog for UAT prefs.Gerald Combs1-1/+1
When selecting a file for a PT_TXTMOD_FILENAME UAT preference, use QFileDialog::getOpenFileName instead of QFileDialog::getSaveFileName. This matches current GTK+ behavior and the two preferences that use PT_TXTMOD_FILENAME. Add a comment noting that the PT_TXTMOD_FILENAME is Open-only. Bug: 11027 Change-Id: I29eb056422949eda700d448621e508cf094fd7b7 Reviewed-on: https://code.wireshark.org/review/8678 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28Don't warn about overwriting filename preferences.Gerald Combs1-4/+16
When specifying a filename preference (e.g. the SSL pre-master secret log filename) don't warn about overwriting the file. Most of the time we're reading the file and when we're not (e.g. for the SSL debug log) overwriting it is kind of the point. Preference descriptions are plain text. We display them in tooltips as rich text. Convert them accordingly. Fixup some of the SSL preference descriptions. Bug: 11010 Change-Id: I4f1b1f3dd270c01648d9dd52ae20381c3c0d2e37 Reviewed-on: https://code.wireshark.org/review/8665 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-05-25Fix out of tree buildsGraham Bloice34-34/+34
Stop out of tree builds picking up the in-tree version and config.h Change-Id: Icadc46cab66db72af2d475eac31b28d0ca10df90 Reviewed-on: https://code.wireshark.org/review/8204 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-05-23Qt: Update the status bar when saving.Gerald Combs7-28/+101
Plumb in more capture file callbacks. Add common functions for setting the status bar file information. Add and update code to match the GTK+ status bar behavior. Make sure we update the capture file length when rescanning. Bug: 10943 Change-Id: Ie84c7a57ee421d57ba3477f8dde3847aaafa1cd1 Reviewed-on: https://code.wireshark.org/review/8594 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-05-22Qt: Add a "[closed]" hint to the packet dialog.Gerald Combs3-6/+16
Try to make it more obvious that the file has closed. Ping-Bug: 11044 Change-Id: I76ae5724316c6fd9e7efdd817c39ac268b7d4dd0 Reviewed-on: https://code.wireshark.org/review/8593 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-22Qt: Don't crash after "Save As".Gerald Combs3-9/+9
Rename "stay_closed" to "dont_reopen" to match cf_save_records and its GTK+ equivalent. Set "dont_reopen" to FALSE when we "Save As", otherwise we crash on Windows. Bug: 10904 Change-Id: I4bb10abc230439e10cc55ffbd5595bfbc0a34b6f Reviewed-on: https://code.wireshark.org/review/8592 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-21Fixup capture filter completion logic.Gerald Combs1-1/+7
Don't add the current word to the completion list. Change-Id: Ia475520092f461c9e7b03f82cc3427585e095162 Reviewed-on: https://code.wireshark.org/review/8577 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-20Get rid of XML step for adding menubar items.Guy Harris1-175/+122
And don't create extra action groups; just add them to the main menubar's action group. Rename add_menu_item() to add_menu_item_to_main_menubar() to make that clearer. Change-Id: I6b564620decd8d0c9c4a2cb79b1a03df5ff27a4b Reviewed-on: https://code.wireshark.org/review/8555 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-20Autocompleting "and" and "or" probably isn't useful.Gerald Combs1-2/+2
Change-Id: Ia16a02a616fd052eeaa9eceff76bc1b20ee8d82e Reviewed-on: https://code.wireshark.org/review/8553 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-20Start exposing the filter field of a tap listener to the RTP GUI APIs.Michael Mann6-14/+16
A tap listener has the ability to apply a filter (typically the display filter). Add a parameter to RTP GUI API functions to allow them to pass in a filter. Bug: 996 Change-Id: Ib184dfb023be5d1d24a0d842b4039311426b5293 Reviewed-on: https://code.wireshark.org/review/8468 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>
2015-05-20Add capture filter autocompletion.Gerald Combs7-162/+251
Autocomplete on recent and saved capture filters along with the primitives in gencode.l in the libpcap sources. Move common autocomplete code to SyntaxLineEdit. Change-Id: I0931a6775bacf9c917c294befbbdaade51d19b93 Reviewed-on: https://code.wireshark.org/review/8542 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-05-20Have an add_menu_item() to add items to the menu bar, and use it.Guy Harris1-180/+143
Have it contain all the code to add an item to the menu bar; we may be able to get rid of the "construct the XML"/"have GTK+ parse the UI" code in favor of code that directly does the actions to add the item to the menu without the intermediate XML. Use it for both the items registered with register_menu_bar_menu_items() and for the items registered with the new external menu mechanism. Change-Id: Ibcac03173580bb83ae46cde1d1435f71767d8355 Reviewed-on: https://code.wireshark.org/review/8544 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-19Autocomplete saved display filters.Gerald Combs2-20/+41
Add saved display filters to the completion list. Fix a complex filter completion bug. Change-Id: I035923882fd8d6232d0b69e464bb1517f261dbd9 Reviewed-on: https://code.wireshark.org/review/8533 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-05-18Bluetooth: Remove duplicates by default for ATT Server Attributes dialogMichal Labedzki1-0/+3
Change-Id: Ic833c800f599eed465eddc3d17ca07bdf3e83aba Reviewed-on: https://code.wireshark.org/review/8511 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-17[Automatic update for 2015-05-17]Gerald Combs13-2928/+3019
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ic345ff4e7b46ee43af35ebbdda32ffc25e793c65 Reviewed-on: https://code.wireshark.org/review/8495 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-16Do all floating-point work in double-precision.Guy Harris2-5/+5
That squelches some double -> float warnings. Change-Id: I19b8049698c7931e8c146d9532fc65ee091e4c24 Reviewed-on: https://code.wireshark.org/review/8490 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-16Use nstime_t for time stamps.Guy Harris2-48/+30
Don't roll our own time stamp handling, use nstime_t. That also gives us nanosecond resolution, for what that's worth. Change-Id: Ib9945bdef5a70e1656b96995f510507da36b4b59 Reviewed-on: https://code.wireshark.org/review/8489 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-16Main (menubar): fix C++ style comments are not allowed in ISO C90Alexis La Goutte1-1/+1
Change-Id: Ia8ae6780027a63c4a88ea8d2a10ba1e0f8931f25 Reviewed-on: https://code.wireshark.org/review/8472 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-15Qt: Stop tapping when the I/O Graph dialog closes.Gerald Combs8-1/+37
Add a setCaptureStopFlag function to ProgressBar. Add a stopTapping function and setCaptureStopFlag signal to CaptureFile. Use the new plubming to stop tapping when the IO Graph dialog closes. Bug: 10116 Change-Id: Ic46814eed18933f511d9d1ff37e2e7918741f353 Reviewed-on: https://code.wireshark.org/review/8480 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-05-15Qt: Make sure we can fetch ExportDissectionDialog's layout.Gerald Combs2-1/+4
Make sure ExportDissectionDialog is a non-native, funny-looking file dialog so that we can fetch its layout. Fix and add some URLs while we're here. Bug: 11122 Change-Id: Icf62f7a436c7ba27ec20f84e7c1af1a5d7c9b949 Reviewed-on: https://code.wireshark.org/review/8479 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-15Qt: Fixup sequence dialog buttons.Gerald Combs1-1/+1
Switch from "Save As" + Cancel + OK to "Save As" + Close. Change-Id: I6f1093965f90fe9cbbfbf053779c05388c897641 Reviewed-on: https://code.wireshark.org/review/8474 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-15Qt: Fix packet deselection.Gerald Combs1-5/+14
When no packets are selected, clear the related item delegate, packet detail, and byte view. Also, don't crash. Bug: 10529 Change-Id: I1f46d0d60d060d517f1ee2f8b5a9124bc1fad00e Reviewed-on: https://code.wireshark.org/review/8470 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-15ui/mcast_stream.c: Add dependency on sys/time.h for struct timevalEdwin Groothuis1-0/+4
Needed to compile on FreeBSD. Bug: 11199 Change-Id: I6b10a0954020d58dcec93364ebecc8a7069ac8f3 Reviewed-on: https://code.wireshark.org/review/8467 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-15Qt: Implement "Apply as Column" for packet contextRoland Knall6-11/+39
Implement the same functionality for "Apply as Column" as it exists in the GTK version of Wireshark. Especially for the context menu in the packet view panel. Change-Id: Id25b7797616ff3b3acf7aa920395516c8a4e9bf9 Reviewed-on: https://code.wireshark.org/review/7604 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-14Pop the display filter status when it loses focus.Gerald Combs2-0/+8
Change-Id: I7878fd99f8b773f8c550a6d2416e9e2d44abd321 Reviewed-on: https://code.wireshark.org/review/8466 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14Don't complete the current field.Gerald Combs1-2/+4
Change-Id: If2b16783d08d23df427ac9b9c86984245db56d53 Reviewed-on: https://code.wireshark.org/review/8465 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14Fix display filter completion behavior.Gerald Combs1-9/+5
Allow completion for mismatched protocol and filter names. Change-Id: I1d1e6b8f16d4d2d331b915c199f857835dcc1c53 Ping-bug: 11187 Reviewed-on: https://code.wireshark.org/review/8464 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14Fix packet list font zooming.Gerald Combs1-2/+2
Change-Id: I376fc3b41e9ebbe1353527d8d3bbf8d4b86cc29a Reviewed-on: https://code.wireshark.org/review/8463 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14Qt: Apply protocol preferences.Gerald Combs1-0/+8
Make sure we call prefs_apply_all when saving preferences. Bug: 11119 Change-Id: Iacf1e28e69c2aebcbbd7dceaa210c8219663665f Reviewed-on: https://code.wireshark.org/review/8462 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14Qt: Column preference fixes.Gerald Combs5-18/+19
Don't call redrawVisiblePackets in PacketList::sectionResized. Otherwise we trigger the crash in bug 11179. Call recent_set_column_width instead. Clean up the slots called when column preferences change and when recent column widths change. Update our column visibility in redrawVisiblePackets. Use recent_get_column_width when writing the recent file. columnWidth doesn't return a valid value when we're not visible. Bug: 11179. Change-Id: I34ab93d944b341e42129a1c8ff94ba8f7ad4f5fc Reviewed-on: https://code.wireshark.org/review/8457 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-14Add a comment explaining completion misbehavior.Gerald Combs1-0/+5
Note that field name completion won't work correctly if a field's abbrev doesn't match its protocol filter name. Fixing this is left as an exercise for the reader. Change-Id: Ia9b55f20bf58b8252e27506bcce4a0dd71cc199c Reviewed-on: https://code.wireshark.org/review/8460 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-13Qt: Add the correct column width padding.Gerald Combs1-2/+5
When applying recent column widths, add the correct padding in the right place. Bug: 11175 Change-Id: I5a6fe7975764ddc5d9024d8839a837579b2bf799 Ping-Bug: 11179 Reviewed-on: https://code.wireshark.org/review/8456 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-05-13Qt: Don't set ProtoTree::uniformRowHeights.Gerald Combs1-13/+12
Some packet detail items contain multiple lines. Show them, which duplicates the GTK+ UI behavior. Add a note about adding a custom item delegate if this affects performance. Make item labels QStrings while we're here. Bug: 10225 Change-Id: Ia39320028ecff5fe7fa3e4c09ff37405986b7f6e Reviewed-on: https://code.wireshark.org/review/8445 Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-13Fix an error found by Valgrind.Gerald Combs1-1/+1
Change-Id: I9f0adac70129c90b4bf1e678bece6c6b8b8b4b75 Reviewed-on: https://code.wireshark.org/review/8455 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-13QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity ↵Alexis La Goutte1-3/+10
(CID 1159170 & 1159171) Try 2 Change-Id: I10c439ccd4b8e5ac24275332e35fb35ad95b8d1b Reviewed-on: https://code.wireshark.org/review/8447 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-13Try to avoid duplicate display filter completions.Gerald Combs1-11/+23
When adding recent filters to the completion list, skip over items that look like fields and assume they'll be added further down the line. Change-Id: Ief1e7aeebf91504becc2e07ba9cad66a90d8c7f3 Reviewed-on: https://code.wireshark.org/review/8453 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-13[VoIP] There has to be two separate routines for MEGACO and H248 asAndersBroman1-3/+17
tap_id_offset is used to access tapinfo. Fixes a crash rported in Bug: 11132 Change-Id: I32ada3e0eb16d0e128ff67c5aec499890602eab0 Reviewed-on: https://code.wireshark.org/review/8449 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-13Change the formatting strings used to create the Conversation Filter submenuMichael Mann1-7/+12
Bug: 11178 Change-Id: I4a5ae1399da8206efb29c059437d56da06a539a9 Reviewed-on: https://code.wireshark.org/review/8417 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: Evan Huus <eapache@gmail.com>
2015-05-12Qt: Display filter completion fixes.Gerald Combs1-6/+7
Fixup the logic for adding field names to the list. Connect our completer activation signal to its slot once, not twice. Bug: 11187 Change-Id: Ife1879fe05c870094ee31e59dd62e3004f588bfc Reviewed-on: https://code.wireshark.org/review/8440 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-12Qt: Add packet list navigation checks.Gerald Combs1-1/+6
Add sanity checks to go{First,Last,Next,Previous}Packet. Bug: 11085 Change-Id: I6c33ea314720935aa1881257e9f32732134eec31 Reviewed-on: https://code.wireshark.org/review/8433 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-12Qt: Expert info → Expert information.Gerald Combs3-5/+5
Change-Id: I6cf87a1c63a4b34678667396d836d15766155b1a Reviewed-on: https://code.wireshark.org/review/8420 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-11Speed up display filter completion.Gerald Combs1-2/+3
Don't loop over non-matching fields. This improves completion performance considerably on Windows (where it was noticeable). Change-Id: I7f526fe960c5c41da5ae847b04be25d65ca42bb1 Reviewed-on: https://code.wireshark.org/review/8418 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-11Qt: Provide a hint about the current display filter field.Gerald Combs1-0/+13
If the field under the DisplayFilterEdit cursor is valid, push its description. In the main window this shows up in the status bar. Change-Id: I7ba1255694941c64aa8cce896283a426b9a69f2c Reviewed-on: https://code.wireshark.org/review/8413 Reviewed-by: Gerald Combs <gerald@wireshark.org>