summaryrefslogtreecommitdiff
path: root/ui/qt
AgeCommit message (Collapse)AuthorFilesLines
2016-03-27[Automatic update for 2016-03-27]Gerald Combs8-857/+857
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I19f4ffca89acbd207cafe1f29f14aba293b068f4 Reviewed-on: https://code.wireshark.org/review/14650 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-27Pull the invocation of the Lex scanner into common code.Guy Harris1-7/+1
Instead of text_import_setup() and text_import_cleanup() routines, and the actual scanner invocation being done in the dialog box, have a text_import() routine that does all the work. Change-Id: Ifd8a999618dbb411d613e6596484e4c2e013431d Reviewed-on: https://code.wireshark.org/review/14647 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-26Push initial directory code up into CaptureFileDialog.Jeff Morriss3-87/+26
That way each (CaptureFileDialog) user doesn't have to (remember to) check the preference, etc., to figure out what directory to start in. Change-Id: Ifa60e1ef9dbd11689a3f72906997cf3ed8ce259c Reviewed-on: https://code.wireshark.org/review/14550 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26Choose the appropriate initial directory for the Export Dissections window.Jeff Morriss1-2/+26
Bug: 12105 Change-Id: Ib2398e5213b2ef2501660d1bba13dca66f04bd55 Reviewed-on: https://code.wireshark.org/review/14549 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-23Override shortcuts in SyntaxLineEdit.Gerald Combs2-0/+16
Add an ::event member function to SyntaxLineEdit that looks for ShortcutOverride events and accepts them. This keeps them from being interpreted as shortcuts in the main window. Note that the current code accepts everything, and that we should probably restrict this to AltGr only. Bug: 12270 Change-Id: I01765ce2447d220a102d97fcbbe47579341ce075 Reviewed-on: https://code.wireshark.org/review/14570 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-03-23EditorConfig: Add C++ to root fileJoão Valverde2-10/+0
Change-Id: I716bf59e401d7764692e524506756eb30ddb75f2 Reviewed-on: https://code.wireshark.org/review/14572 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21Qt: Normalize timerEventsGerald Combs4-14/+20
Make our timerEvent code more consistent. Make sure we use timer IDs and that we call our base class timerEvent everywhere. Change-Id: Ib67daa459a8a2f9b67487c3952b7b35c7f162f7e Reviewed-on: https://code.wireshark.org/review/14480 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-03-21Fix building without extcap enabledJoão Valverde10-24/+36
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap. Some documentation fixes too. Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99 Reviewed-on: https://code.wireshark.org/review/14522 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-03-20[Automatic update for 2016-03-20]Gerald Combs8-157/+157
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I1c1b5c902782d9250eab3341ff56e09f79c4c0e3 Reviewed-on: https://code.wireshark.org/review/14532 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-18Qt: Use single-dash option for Qt4 compatibilityJoão Valverde1-6/+6
Change-Id: Ib8a52eca74ac63704a31b4b48da936abb6a6331b Reviewed-on: https://code.wireshark.org/review/14511 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-18autotools: Generate Qt Resource Compiler source in /ui/qt dirJoão Valverde2-17/+38
Change-Id: I0acdc1ea4d2110111a5506104e5075962f580bd5 Reviewed-on: https://code.wireshark.org/review/14438 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-03-15Qt: Make sure the proto tree handles all of its timers.Gerald Combs3-2/+7
Call QTreeWidget::timerEvent from ProtoTree::timerEvent, otherwise we turn into the candy factory episode in I Love Lucy. Do the equivalent in WirelessFrame while we're here. Neither QFrame or QWidget use timers, but there's no guarantee that this will be the case in the future. Bug: 12258 Change-Id: I3cb0096fe2ed87176fec8d7361260b5388d75530 Reviewed-on: https://code.wireshark.org/review/14470 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: Jim Young <jim.young.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-14Qt: Add FunnelTextDialog geometry stateStig Bjørlykke2-5/+9
Use "Funnel <title>" as dialog name to avoid a user defined dialog title to be equal to a existing dialog title. Change-Id: I3d21c87de8fe5852f37a18b4751fb4d4428ce6ea Reviewed-on: https://code.wireshark.org/review/14450 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-03-13[Automatic update for 2016-03-13]Gerald Combs12-580/+492
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id764cddac44715977f4abbd1f55bfc961a1973a4 Reviewed-on: https://code.wireshark.org/review/14443 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-13Lua: Apply prefs when reload Lua pluginsStig Bjørlykke1-0/+1
Change-Id: I9003fd8c4eb52a868ad88b7ea00b6cf0e70e5c90 Reviewed-on: https://code.wireshark.org/review/14440 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-03-11Qt: Defer proto tree column content resizing.Gerald Combs2-9/+58
Try to avoid the following call graph: ProtoTree::expandAll ... ProtoTree::expand ... QTreeView::resizeColumnToContents QTreeView::resizeColumnToContents calls sizeHintForColumn, which iterates over a number of items (default 1000). Calling it from ProtoTree::expand can lead to excessive wheel-spinning. Add a single-shot timer for resizeColumnToContents. This is similar to what QTreeView does internally when columns are resized. Bug: 12228 Change-Id: I7b50c1486b3a25817efae58efbb8c9e961dbdab0 Reviewed-on: https://code.wireshark.org/review/14411 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-03-11Remove the last remnants of U3 support.Gerald Combs1-4/+1
Change-Id: Ide4c177e67a77c5f9495b3b4c0f817f40e6dde30 Reviewed-on: https://code.wireshark.org/review/14425 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-03-10Qt: Check for selected interface in filterEdited()Stig Bjørlykke1-2/+4
Add a check for selected filters in filterEdited() to avoid a out-of-bounds index into ui->interfaceTree->selectedItems(). Bug: 12241 Bug: 12245 Change-Id: Ie18fc34a17427dd5330a5a617051cbc061555e0c Reviewed-on: https://code.wireshark.org/review/14404 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-03-08Start adding EditorConfig files.Gerald Combs2-0/+10
Add EditorConfig files where we currently have consistent indentation. This might let us get rid of our editor modeline footers at some point. Change-Id: I156f8d25cfa0050786eb2186c4b2e6d183c3a9ce Reviewed-on: https://code.wireshark.org/review/12383 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07Qt: Remove unused version.h headerJoão Valverde1-2/+0
Change-Id: I3f9f38b2077077aca6106e22abe337bf724f33e7 Reviewed-on: https://code.wireshark.org/review/14379 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-06[Automatic update for 2016-03-06]Gerald Combs13-4007/+4110
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ibd8571b495bc8170a5f77f7461d86a9a02c8b0b4 Reviewed-on: https://code.wireshark.org/review/14364 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-03QT: TCP Stream Graph: Fix index numberUli Heilmeier1-1/+1
setMaximum() for stream index before calling setValue() Bug: 12163 Change-Id: Ic1678bc5282a7a01b96a39a44790949b743acf7f Reviewed-on: https://code.wireshark.org/review/14332 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-03Qt: Allow regex searching in the advanced prefs.Gerald Combs2-6/+7
Use a QRegex for Preferences → Advanced → Search. Change-Id: Iebf1cba9c17ff774ce50ef909b6d181751b272aa Reviewed-on: https://code.wireshark.org/review/13924 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-03Qt/Bluetooth: HCI Summary: Miscellaneous fixesMichal Labedzki1-1/+5
1. Count vendor commands once 2. Fill Event column in case of Command Status/Command Complete types while displaying command 3. Add missing Status from Connect Complete event 4. Add missing Command Complete events opcodes Change-Id: Ie5a0e373f92f62fcb890cef7ab54762df3bb8a35 Reviewed-on: https://code.wireshark.org/review/14315 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>
2016-03-01Add 802.11ac 80MHz and 160MHz channels support to wireless toolbarMikael Kanstrup2-4/+41
Add UI support for selecting 80MHz and 160MHz channel bandwidth to wireless toolbar. 80+80MHz was left out on purpose since will need updated UI to select the second center frequency. For 80MHz and 160MHz bandwidth the center frequency is calculated from selected control frequency. Change-Id: I2551ba396f732b3240d40dfa6ea1cf2617b799d2 Reviewed-on: https://code.wireshark.org/review/13965 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-03-01dumpcap: Add support for 802.11ac monitor modesMikael Kanstrup1-2/+3
Add dumpcap support for configuring 80MHz, 80+80MHz, 160MHz monitor modes via nl80211. Change-Id: I2ae8955670c2a9b5051e2223d45ce522459f2c5f Reviewed-on: https://code.wireshark.org/review/13964 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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-03-01Don't show a progress bar when previewing for the Qt print dialog.Guy Harris2-7/+9
We don't do much work to do that - we don't print anything before the first selected page, and once we're finished generating that page, we terminate the printing process - so it shouldn't need a progress bar. (If it needs a progress bar, We Have A Problem, as that slows down the drawing of the dialog box.) This should prevent the problem seen in bug 12040. Bug: 12040 Change-Id: I129191e06fff3e1eb59a9631c7395b9e7f650809 Reviewed-on: https://code.wireshark.org/review/14255 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-01Add a #define for the wildcard pattern that matches all files.Guy Harris3-12/+13
It's *.* on Windows, but just * on UN*X; add a header that provides the definition, and use it instead of hardwiring *.*. Call the entry "All Files", that being the conventional name, rather than "Any File", whilst we're at it. Change-Id: I7c29324fc5b41e93c150e1ec67f1529f171dc6a3 Reviewed-on: https://code.wireshark.org/review/14243 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-29Use *, not *.*, as the wildcard pattern on UN*X.Guy Harris1-9/+12
On Windows, the pattern that matches all files is *.*; *, by itself, doesn't work, as I remember. UN*Xes take the pattern a bit more literally, so if it has a dot in it, it has to match a dot. Bug: 12203 Change-Id: I11518c29c4ffd73485bad6e49b6dd9cc16bbd0b0 Reviewed-on: https://code.wireshark.org/review/14233 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-28Qt: Added geometry_state_dialog to Wireshark.proStig Bjørlykke1-0/+2
Change-Id: I8844469a1cef7e37d4ec0f7ad2aff10bac521af2 Reviewed-on: https://code.wireshark.org/review/14230 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28Qt: Improve Show Packet BytesStig Bjørlykke2-23/+66
- Add ShowAsASCIIandControl to keep ShowAsASCII only ASCII printable. - Enable show selected when ShowAsRAW. - Use QString::fromLatin1() when ShowAs8859_1. - Don't replace null with symbol for null when ShowAsUTF8. Change-Id: I25750247160e33d342fde12e6a998e3198270acf Reviewed-on: https://code.wireshark.org/review/14220 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28Qt: Add dialog geometry restoreStig Bjørlykke69-145/+279
Add GeometryStateDialog class to handle load and save dialog geometry. The QDialog class name will be used as window name. For shared classes the UAT name or the statistics title or abbr will be used. Change-Id: I5a019598307fb3861518f41e733de834788184d8 Reviewed-on: https://code.wireshark.org/review/14139 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28[Automatic update for 2016-02-28]Gerald Combs13-1236/+1488
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I01e2b802cce29c9390a85b2d12fe4fefef2357c2 Reviewed-on: https://code.wireshark.org/review/14225 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-27Have the interface list unsorted by default.Guy Harris1-1/+3
That way, they initially show up in pcap's order, putting the preferred interface at the top. If the user wants to sort them by some column, the user can click on the column in question. Change-Id: I30ac38519c42ae5317d99fdd0a079b030e6af308 Reviewed-on: https://code.wireshark.org/review/14194 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-26Empty out InterfaceTree::updateGlobalDeviceSelections() if no pcap.Guy Harris1-5/+4
It doesn't even need to bother checking the argument. Change-Id: I2cdc9d7da24392ff3fae84e31442530c2e854734 Reviewed-on: https://code.wireshark.org/review/14174 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-26Mark a variable unused when we're not using it.Gerald Combs1-1/+4
Change-Id: I020447859114551e71810bf17ba05dc353a1ff08 Reviewed-on: https://code.wireshark.org/review/14171 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-26tcp_stream_dialog: Integer overflow in Average Throughputkkoizumi1-1/+1
Overflow occurs in the TCP Stream Graphs window when Average Throughput exceeds 20-30 Gbps. * Screenshot examples https://raw.githubusercontent.com/koizumi-k/pub/master/misc/stream1-current-win64.png https://raw.githubusercontent.com/koizumi-k/pub/master/misc/stream2-current-win64.png Change-Id: I4e557fdeae659ef27b986fca18c74cc8983fe4d3 Reviewed-on: https://code.wireshark.org/review/14163 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-02-26Qt: Update selected interface filter behavior.Gerald Combs10-160/+276
Change the selected interface behavior in the main window and the capture interfaces dialog to better handle multiple selections. Attempt to document this at the top of interface_tree.cpp. Move the default capture filter code from CaptureFilterEdit to MainWelcome. Add a "conflicting filter" check to CaptureEdit which updates the placeholder text. Handle conflicting filters in the main welcome screen and the capture interfaces dialog. Propagate interface selections and filter updates in the capture interfaces dialog to the main welcome screen. Consolidate some of the interface handling code in InterfaceTree and CaptureInterfacesDialog. Make sure CaptureInterfacesDialog manages the global capture options by device name instead numeric index. Start deprecating prefs.capture_devices_filter and capture_dev_user_cfilter_find. Change some member function names so that they're hopefully more clear and consistent. Ping-Bug: 11886 Change-Id: I63b06dbae29c2c45ee9252092ad54bdcbacae6e6 Reviewed-on: https://code.wireshark.org/review/14129 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-26Qt: Capture Interfaces dialog geometry updates.Gerald Combs2-5/+30
Widen CaptureInterfacesDialog. Manually set some column widths. Change-Id: I84fd060d83b5f7bc186d79e22d5cc608dfdbd6c5 Reviewed-on: https://code.wireshark.org/review/14148 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-02-25Clean up modelines and indentation.Guy Harris12-33/+32
HT tab stops are set every 8 spaces on UN*X; UN*X tools that treat an HT character as tabbing to 4-space tab stops, or that even are configurable but *default* to 4-space tab stops (I'm looking at *you*, Xcode!) are broken. tab-width: 4, tabstop=4, and tabSize=4 are errors if you ever expect anybody to look at your file with a UN*X tool, and every text file will probably be looked at by a UN*X tool at some point, so Don't Do That. Adjust indentation to reflect the mode lines. Change-Id: Icf0831717de10fc615971fa1cf75af2f1ea2d03d Reviewed-on: https://code.wireshark.org/review/14150 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-25Qt: Emit textEdited from CaptureFilterEdit in more places.Gerald Combs2-1/+13
We should emit textEdited whenever the user changes the text interactively. Do so when the user clicks the clear button or selects a recent filter. We might want to copy this to DisplayFilterEdit. Change-Id: Icf02fead52947fcef6e7e617b0c49bfc9e1aec65 Reviewed-on: https://code.wireshark.org/review/14144 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-02-25Qt: Use UTF8_HORIZONTAL_ELLIPSIS for …Stig Bjørlykke1-1/+2
Bug: 12172 Change-Id: Icbb3011ff18fc53c3e77c62692ed977178d1aace Reviewed-on: https://code.wireshark.org/review/14138 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-02-24qt: show marker when capture file comment has changedPeter Wu1-1/+1
Fixes a missing "*" marker in the title and this warning when the capture file comment is modified: QWidget::setWindowModified: The window title does not contain a '[*]' placeholder Change-Id: Iea0a63cf8c8f9abd577397c8881f0399d2e798ba Reviewed-on: https://code.wireshark.org/review/14010 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-24De-canonicalize paths for file and directory path preferences.Guy Harris2-3/+3
Undo Qt's "helpful" canonicalization of paths returned by the file dialogs to use / as the pathname component separator rather than using the native pathname component separator. Bug: 12117 Change-Id: I6077191a2204574ca50f53b5424f7f421db33db3 Reviewed-on: https://code.wireshark.org/review/14109 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-23Qt: Add tooltips to the welcome screen interfaces.Gerald Combs1-1/+26
Show the interface address and saved capture filter. Change-Id: I8403f97ea584783abdbe2d89b8c9061a00ececdf Reviewed-on: https://code.wireshark.org/review/14100 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-02-23Qt: Select matching tree item and bytes in Find PacketStig Bjørlykke4-14/+42
Highlight the matching tree item and matching packet bytes when doing a Find Packet. Added cf->search_len to correctly highlight the matching bytes when doing a regex search. Bug: 12157 Change-Id: I84fbdb9b43be4355e24aff3cf5f8850f1119e2bf Reviewed-on: https://code.wireshark.org/review/14086 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-02-23Qt: Optimize Show Packet BytesStig Bjørlykke1-8/+16
Change-Id: Ia81f501d5495125d3633af729051e185609353e0 Reviewed-on: https://code.wireshark.org/review/14087 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-02-23Qt: add OS interface description to 'Manage Local Interfaces' windowPascal Quantin1-1/+3
In case the user did not provide a custom name for the interface, display the OS description in the 'Comment' column as how it is done in GTK UI. Bug: 12156 Change-Id: If9da58980169df3eaf25f74e7b81676cbc4f6ebd Reviewed-on: https://code.wireshark.org/review/14095 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-02-23Qt: Capture and display filter fixups.Gerald Combs2-0/+3
In SyntaxLineEdit make sure we emit textEdited when we complete a previously used filter. In CaptureInterfacesDialog, connect captureFilterComboBox::activated to filterEdited. These enusre that we fill in the capture filter column in CaptureInterfacesDialog. Change-Id: Ibbf7ab223e37f8f73d8ec0289f8c32692a7e17d4 Reviewed-on: https://code.wireshark.org/review/14081 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-02-21tshark: load decode_as_entries fileMichael Mann1-1/+9
With Wireshark 2.0, some dissector preferences were removed in favor of 'Decode As' functionality. But the settings saved in the GUI are not loaded in tshark, preventing their use without an explicit call to '-d' option. Let's load decode_as_entries file by default and have it overridden by the '-d' option if required. Ping-Bug: 12124 Change-Id: I134a424cb6cf8fc89b7096a659ef1605314a70a2 Reviewed-on: https://code.wireshark.org/review/13956 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-13 09:11:53 +0000