summaryrefslogtreecommitdiff
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2016-06-08Use separate main geometry settings for Qt and GTK+.Gerald Combs4-5/+32
Qt and GTK+ can have wildly different notions about the top-left position of the main window, particularly in multiple-screen configurations. For example, on OS X with the following monitor arrangment: g .---------. | | | | q--------.| | | |`---------' | | `--------' GTK+ positions windows relative to 'g' and Qt positions windows relative to 'q'. As a result it's easy for one UI to clobber the settings of the other. Split the geometry_main_x and geometry_main_y recent settings into Qt and GTK+ versions. In the Qt UI, try moving the main window onscreen before falling back to the default geometry. This keeps us from losing our size settings. Add a link to a Qt geometry bug. Change-Id: If7ae0dcc1719e646299ee3bbf1c88743f655c9a0 Ping-Bug: 12389 Reviewed-on: https://code.wireshark.org/review/15775 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-08Upgrade Filter Expressions preference to use DisplayFilterEdit.Michael Mann1-6/+6
That way you get dropdown suggestions for filter completion. Change-Id: I2b9d417ca50559ffdc8bd3f7f0e1bbc185c1384d Reviewed-on: https://code.wireshark.org/review/15592 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-07Qt: Fix "applicable" capture interface behavior.Gerald Combs1-2/+1
In the Capture Interfaces dialog, make sure we have exactly one of a "not applicable" dash or a checkbox. Otherwise if your interface falsely reports that it supports monitor mode you might end up with both. Change-Id: I9b256f1ef0e8ff32626e7f2b526130f3c110d142 Reviewed-on: https://code.wireshark.org/review/15761 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-07pcap: Remove the WinPcap version checking for the Details dialogYang Luo1-37/+1
This check only works on the GTK UI's "Details" window. And it only can check version numbers. So there's no way for this code to be able to differentiate Npcap from WinPcap. And Npcap uses a very small version like "0.07", which makes itself not welcomed by this checking code. Change-Id: I861e9decd123e7d30547789c0488043616b17032 Reviewed-on: https://code.wireshark.org/review/15304 Reviewed-by: Yang Luo <hsluoyz@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-06Qt: RTP audio stream fixups.Gerald Combs3-7/+14
Make sure audio_stream_ is non-NULL before we try to use it. Delete audio_stream_ more gracefully and add a note about mutexes on OS X and Windows. Bug: 12166 Change-Id: I12e76c49e631bc1de813c5c7d82c7d928c71237e Reviewed-on: https://code.wireshark.org/review/15759 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-06Qt: Add zoom to the flow / sequence dialog.Gerald Combs3-3/+63
Add zoom in and zoom out actions. Changes only affect the X axis (the spacing between the dashed lines). Bug: 10693 Change-Id: I145e8501239f26e1be6135bffabdebec14f262c1 Reviewed-on: https://code.wireshark.org/review/15746 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-06Qt: Improved ImportTextDialog layoutStig Bjørlykke1-44/+61
Put direction indication label and checkbox in a HBox to align vertical. Change-Id: I2aa7846aef25e9f080349e9dfef5c191b8d323e3 Reviewed-on: https://code.wireshark.org/review/15742 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>
2016-06-06Firewall rule fixups.Gerald Combs2-9/+16
Make the netfilter rules more sensible as described in bug 2482. Switch to long names while we're here. Ping-bug: 2482 Change-Id: I9e44c4ed88ed83ff1d7d478acea83fa0c2af5cac Reviewed-on: https://code.wireshark.org/review/15701 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: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-06*_stdup_printf -> strdup for "single string only" formatting.Michael Mann10-20/+20
Done for performance improvements. This could probably be done in checkAPIs.pl, but this was just a quick manual check with grepping. Change-Id: I91ff102cb528bb00fa2f65489de53890e7e46f2d Reviewed-on: https://code.wireshark.org/review/15751 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: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-06Add a routine to get an array of all instances of a string option.Guy Harris1-10/+17
Use it for OPT_COMMENT in the SHB, as there may be ore than one instance of OPT_COMMENT in an SHB. Also, use wtap_optionblock_get_option_string for OPT_SHB_HARDWARE, OPT_SHB_OS, and OPT_SHB_USERAPPL; they're specified as "only one instance allowed". Change-Id: I23ad87e41e40b7ae1155e96c0523a6f8caad5204 Reviewed-on: https://code.wireshark.org/review/15750 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-06Directly use wtap_opttypes calls to fetch SHB options.Guy Harris2-67/+97
Don't put them in the summary structure; the summary routines should calculate summary statistics, not dig up every bit of information that *could* appear in a summary. Instead, have the GUI code call wtap_file_get_shb() to get the SHB information and call wtap_optionblock_get_option_string() to fetch the option values. Move the option code definitions into wtap_opttypes.h, as they're used by the API. Change-Id: Icef11f5fb30fdc3df1bb0208aae9ed0aebaf0182 Reviewed-on: https://code.wireshark.org/review/15748 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-05Add missing initializer (CID 1362506)Jaap Keuter1-1/+2
Change-Id: I5a6133cb0ec0bf8807bb3bdfa3721657420b53a2 Reviewed-on: https://code.wireshark.org/review/15730 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> 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-05[Automatic update for 2016-06-05]Gerald Combs13-1285/+1982
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I2048c007b7700f1074caed6b0c208aabcb525ed8 Reviewed-on: https://code.wireshark.org/review/15733 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-05Don't copy details of hidden columns.Michael Mann2-11/+16
Bug: 11788 Change-Id: I3f4df884d98903222de8a340de6a08e680687b0a Reviewed-on: https://code.wireshark.org/review/15727 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>
2016-06-05Qt ui code: fix qreal type problems on ARM platformZdeněk Žamberský5-49/+49
fixing problems in qt ui code comming from the fact that qreal type is float on ARM platform and double on other platforms, which causes build errors on ARM (not all casts are probably strictly necessary) Bug: 12483 Change-Id: Ife5e6d3649a7ee1ad4e7eadffe9f4484ff2718de Reviewed-on: https://code.wireshark.org/review/15723 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-03Qt: Add UTF-16 output to Follow Stream.Gerald Combs2-1/+12
Add an option to display the "follow" data as UTF-16. Bug: 237 Change-Id: Id95ffc014b8ef718f3b6e9f3415806ada309c3a2 Reviewed-on: https://code.wireshark.org/review/15702 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: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-01Qt: Firewall Rules dialog.Gerald Combs16-256/+910
Add the Firewall ACL Rules dialog. Try showing all valid rules for a given product instead of making the user select from a combobox. We can add the combo back easily enough if that's desired. Add a rule hint field and use it in the Qt and GTK+ UIs. Bug: 12469 Change-Id: I39dd840e9838f96d7c5e2b4c34662811c21d0386 Reviewed-on: https://code.wireshark.org/review/15689 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-01Qt: Use checkboxes in the capture options dialog.Gerald Combs2-147/+137
Switch from enabled/disabled comboboxes to checkboxes. This requires less clicking on the user's part and less translating. Draw em dashes instead of "n/a" for non-applicable items, and use the disabled palette when drawing them. Change-Id: Ic97b6d44734b679bbeee00e9c2a322e7b8a67247 Reviewed-on: https://code.wireshark.org/review/15661 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-01Create a FieldFilterEdit class and apply it to custom column preference field.Michael Mann6-5/+381
DisplayFilterEdit deals with entire filters and some edit boxes just need a single protocol field. This control will do the trick. Bug: 12321 Change-Id: I8e5837ea9a6955ada29b7e516ea022ab1dd46f0d Reviewed-on: https://code.wireshark.org/review/15595 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-01Qt: Check for valid color filter before useStig Bjørlykke1-2/+4
Not all packet have a color filter, so check for this before use. Bug: 12065 Change-Id: Ieed8d369342bde50fe8a1562be9379695da9fbaa Reviewed-on: https://code.wireshark.org/review/15677 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-01Fix a compile error occurring on RedHat Enterprise Linux Workstation release ↵Jens Kilian1-0/+4
7.0 (Maipo). This fixes a compile error with Qt version 4.8.5-8 as installed in RHEL 7.0: sequence_dialog.cpp: In member function 'void SequenceDialog::mouseMoved(QMouseEvent*)': sequence_dialog.cpp:306:35: error: 'escape' is not a member of 'Qt' QString raw_comment = Qt::escape(sai->comment); ^ Change-Id: Ibbf62123441645471d66aa329f0d63d0ee198017 Reviewed-on: https://code.wireshark.org/review/15682 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2016-06-01Add data structures necessary to support multiple Section Header blocks.Michael Mann2-3/+8
This doesn't try to use any data from multiple Section Header blocks, it just converts single Section Header block usage into a GArray, so the potential is there to then use/support multiple Section Header blocks within a file format (like pcapng) Change-Id: I6ad1f7b8daf4b1ad7ba0eb1ecf2e170421505486 Reviewed-on: https://code.wireshark.org/review/15636 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-06-01Allow create_tempfile to support a suffix.Michael Mann5-7/+7
Ping-Bug: 10203 Change-Id: Ifa24870d711449b87e9839dd46af614e4aa28fde Reviewed-on: https://code.wireshark.org/review/15608 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2016-06-01Qt: Color _ANY and _TCP sequence analysis items.Gerald Combs3-3/+12
For SEQ_ANALYSIS_ANY, color each sequence diagram item according to its associated packet. For SEQ_ANALYSIS_TCP, color each item according to its stream. Bug: 12065 Change-Id: Ib43490fe55039fbcfa793223b5850233a2694a26 Reviewed-on: https://code.wireshark.org/review/15651 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-05-31Qt: Use a standard "Start" button in Capture Options.Gerald Combs3-11/+8
QDialogButtonBox does a fine job of creating and managing buttons. Instead of creating our own "Start" button, just rename the "OK" button. This matches what we do elsewhere, e.g. in the Extcap Options dialog. Change-Id: I3c5eec1f01925f7b82c4e7360d685acbe4bb2fea Reviewed-on: https://code.wireshark.org/review/15653 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-31Qt: Monitor mode fixups.Gerald Combs4-86/+171
When we update the monitor mode setting for an interface, update its link type list. Start filling in interface columns from a common function instead of multiple places. Rename some member function names to match https://www.wireshark.org/docs/wsdg_html_chunked/ChUIQt.html#_coding_practices_and_naming_conventions Bug: 11364 Change-Id: I26ac7e9719863169b62069e49ebf17ed97fbe516 Reviewed-on: https://code.wireshark.org/review/15583 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-31Qt: Expand "to do" comments in SequenceDialog.Gerald Combs1-1/+11
Copy in some text from bug 12419. Change-Id: Ice3c6cab1f5c32033de3a9a78d7945c31d932755 Reviewed-on: https://code.wireshark.org/review/15649 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-31Qt: Fix compilation for Qt 4.Gerald Combs1-2/+6
QString::toHtmlEscaped was introduced in Qt 5. Change-Id: I50b2df2f6ef441ec95972173a852d7950aedc028 Reviewed-on: https://code.wireshark.org/review/15644 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-31qt: fix crash when saving RTP audioDario Lombardo1-2/+2
The UI crashes when saving a RTP due to a division by zero. To reproduce: open a RTP capture file, Telephony->RTP->RTP Streams, then choose a stream, ANALYZE, SAVE, AUDIO, choose a path. Bug: 12211 Change-Id: I51d61eb6797fc82c1b03254abaec839d3a1e281d Reviewed-on: https://code.wireshark.org/review/15621 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-31Restore a preference column type if fields are empty.Michael Mann2-16/+36
The column type is automatically changed to Custom if user clicks on the "Fields" or "Field Occurrences" column. This can be accidental and cause the user grief if he doesn't realize it. If there is no text in the field, restore the type to its original value. Bug: 12465 Change-Id: I0453f43be13077aba58cca61011eeff9ca9b83b2 Reviewed-on: https://code.wireshark.org/review/15600 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>
2016-05-29[Automatic update for 2016-05-29]Gerald Combs13-562/+996
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id13bada7b6b5e5c9e697967e22c687d2f64e5329 Reviewed-on: https://code.wireshark.org/review/15605 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-28Qt: Sequence dialog page up+down.Gerald Combs1-0/+8
Handle page up, page down, and space key presses. Change-Id: I8447df53eef6c529f68532412b2e9e8bee267bfc Reviewed-on: https://code.wireshark.org/review/15597 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-05-28If we're "[Saving] the file and [closing] it", actually *close* it.Guy Harris1-1/+2
Otherwise, if you've modified the file (added, removed, or changed comments), and you try to close the file or quit, and answer "Save" to the "save your work?" question, Wireshark tries to clean up the wmem scopes, but the file scope hasn't been left, and wmem crashes with an assertion error. (The GTK+ version does the close, so it doesn't have the bug.) Change-Id: Ie5942e415cfab1907e29b09926a62e2679aca6ee Reviewed-on: https://code.wireshark.org/review/15598 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-28Consistently pass C++ Boolean constants to saveCaptureFile().Guy Harris2-2/+2
The second argument is a bool, so pass bool constants. (The C integer constants presumably get coerced correctly, but we might as well be clean.) Change-Id: Ia170b443bb9933a8916d9dc25d7492fc8acf1f22 Reviewed-on: https://code.wireshark.org/review/15596 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-27Qt: Sequence dialog navigation updates.Gerald Combs2-12/+25
Clean up the next / previous logic a bit. If the selected item is out of range, move it in-range. Change-Id: Idd5f83e7f4ccf960500f261e1c2292da6cecab57 Reviewed-on: https://code.wireshark.org/review/15591 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-05-26Qt: Don't use QMap::first or ::lastGerald Combs1-2/+7
QMap::first and ::last were added in Qt 5.2. Change-Id: I63bbb384aa75910bb96d8f75185ae90444b6c127 Reviewed-on: https://code.wireshark.org/review/15576 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-26Qt: Add next / previous sequence shortcuts.Gerald Combs5-52/+176
Add next (N) and previous (P) keyboard shortcuts. The GTK+ UI uses the down and up keys, but we're already using those for panning the Y axis. Add a scroll margin when using N and P. Add mouse wheel and trackpad support. Disable mouse dragging for now until we figure out how to limit it to our axis boundaries. Ping-Bug: 12419 Change-Id: I292319928db365206277bf2bb3e42e14ef811ff0 Reviewed-on: https://code.wireshark.org/review/15559 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-05-25Qt: Escape sequence dialog hint text.Gerald Combs1-1/+2
Escape HTML markup before showing hint text. Otherwise things like SIP addresses won't be displayed correctly. Change-Id: I5ceae978af0ff9e253dae4d3ec8ad9da20948de0 Reviewed-on: https://code.wireshark.org/review/15561 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-05-25Qt: Add Time and Comment labels to the sequence diagram.Gerald Combs5-75/+157
Add "Time" and "Comment" labels to the sequence diagram similar to the GTK+ UI. Draw a border around the diagram as well. Widen the default spacing and set it to a simple em-width multiple. Fix our port number alignment. Copy over the sequence diagram colors from the GTK+ UI and add them to ColorUtils. Color sequences according to their respective conversation numbers. To do: - Add zoom. Ping-Bug: 12419 Change-Id: I3f9b4ffbfcc34aae1c38e303cd36ff207be247b1 Reviewed-on: https://code.wireshark.org/review/15554 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-05-23qt follow stream: set the file name before openingMartin Kaiser1-1/+1
If we don't, Save As will always fail. (I broke this in 6a992182ce47d721ce73eabf99983cea480dcf97) Change-Id: I4abfe495af3aee470331ae5464acbd7d08028bf0 Reviewed-on: https://code.wireshark.org/review/15547 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-23Qt: Enable Analyze -> Conversation FilterD. Ulis1-1/+1
Exit early if there is no color rule before setting the parent menu enabled/disabled. Bug: 12458 Change-Id: I37dc093681d3dc28afb60df7fd45e49ab804b2a1 Reviewed-on: https://code.wireshark.org/review/15538 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: Gerald Combs <gerald@wireshark.org>
2016-05-22Add wtap_optionblock_set_option_string_formatMichael Mann2-18/+13
Also add a length parameter to wtap_optionblock_set_option_string Change-Id: I8c7bbc48aa96b5c2a91ab9a17980928d6894f1ee Reviewed-on: https://code.wireshark.org/review/15505 Reviewed-by: Anthony Coddington <anthony.coddington@endace.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-22qt follow stream: don't crash when saving to an non-writable fileMartin Kaiser1-2/+6
When the user clicks Save As in the Follow Stream window, check that the selected target file can be opened for writing. Bring up a warning box if the file is not writable. Change-Id: I76e67b064377dd432d3b14592f5096b99d9968c0 Reviewed-on: https://code.wireshark.org/review/15536 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-22[Automatic update for 2016-05-22]Gerald Combs8-963/+1138
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I6ac498e507c71fd917eb0cfc3c4330a4c0ffcb64 Reviewed-on: https://code.wireshark.org/review/15527 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-22Qt: fix parameter 'overlay_image' not found in the function declaration ↵Alexis La Goutte1-1/+1
[-Wdocumentation] Change-Id: I5f18d7ed5f4c830ce201fa6929fc1b7c0259692e Reviewed-on: https://code.wireshark.org/review/15515 Reviewed-by: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-22Revert "tango_color(.h): avoid ‘tango_butter_3’ defined but not used ↵João Valverde1-7/+0
[-Werror=unused-const-variable] found by gcc6" This reverts commit 5dbc727ae9c1ceebdaafab29eff89e487c9e824a. Change-Id: I71ad6a1468c10d515f73ee25a92fb1e35a995dc6 Reviewed-on: https://code.wireshark.org/review/15523 Reviewed-by: João Valverde <j@v6e.pt>
2016-05-20Qt/Bluetooth: Allow to use Enter button for jump to framesMichal Labedzki6-0/+24
Implement keyPressEvent and do nothing... However it "takes focus" from button box and jump to frame that some items in tree widget point. Change-Id: Ib08f1588f20bce66fa945bf952770600c625233c Reviewed-on: https://code.wireshark.org/review/15455 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> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-05-20Qt: Add a bottom border to the packet map.Gerald Combs1-0/+1
Draw a bottom border so it looks a bit less odd on OS X. This could use some further tweaking. Change-Id: Id76d0a0cece672b927d6217c7a9f970c1ba212bc Reviewed-on: https://code.wireshark.org/review/15391 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: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-05-19Qt: Add Decode as Quoted-Printable in Show Packet BytesStig Bjørlykke2-0/+33
Change-Id: I4697b979702e4df83b1ec85b9a3619409c0b366c Reviewed-on: https://code.wireshark.org/review/15500 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-05-19Add missing #include <algorithm> for std::sort()Michal Labedzki1-0/+2
Definition of std:sort() is in <algorithm> header. Include it to make Wireshark buildable again. Change-Id: Ice68013b0e06461faab1f4f0296e26b426ff92a1 Reviewed-on: https://code.wireshark.org/review/15456 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>