summaryrefslogtreecommitdiff
path: root/ui/qt
AgeCommit message (Collapse)AuthorFilesLines
2016-04-28Use "system" for "use system language", and don't try to print a null string.Guy Harris2-2/+3
Add a #define USE_SYSTEM_LANGUAGE for the language string meaning "use the system setting", and use that instead of hardcoding "system" in various places. If "language" is null, don't try to write it to the file with fprintf() - on *most* systems, that prints "(null)", but on some systems, such as Solaris, it *crashes*. Write USE_SYSTEM_LANGUAGE instead. Check for "(null)" and treat it as meaning "use the system language". Map "auto" to "use the system language" as well, for backwards compatibility. Change-Id: Iba9be540a5139e9cca8bddd0761ee4cbf0f79a49 Reviewed-on: https://code.wireshark.org/review/15147 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-28Qt: Refresh the display filter toolbar layout.Gerald Combs1-1/+1
Force the display filter toolbar to update its layout when we recreate our filter buttons. This ensures that we draw the overflow icon in the right place. Change-Id: Ibfb34b77d565e8db15bb2576249e0e3016993083 Reviewed-on: https://code.wireshark.org/review/15145 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-04-28Qt: Refactor the packet list scroll bar.Gerald Combs4-163/+237
Split OverlayScrollBar into parent and child scroll bar widgets. This gives us two packet list scroll bars: a packet map, which draws and operates on nearby packets and a normal scroll bar. The packet map is drawn to the left of the child scroll bar. This gives us more room to draw and doesn't obscure the scroll bar itself (which is a problem on newer versions of Windows). When the user clicks on a portion of the map, scroll to that part of the packet list. Draw marked packet ticks over the normal scroll bar. Marked & ignored are on the left, time references are on the right. To do: - Borrow more from packet fence and graph something (packet size? time delta?) Change-Id: Ie952fcbd98fd0e047200f2279cb63227feabf5b1 Reviewed-on: https://code.wireshark.org/review/15046 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-04-28Qt: Display filter toolbar behavior tweaks.Gerald Combs3-5/+20
By default GtkToolbar shows overflow items in a menu. QToolBar shows them in a bigger toolbar. This is a problem for users with lots of display filter expressions because expanding the display filter toolbar can make it very tall. QToolBar can optionally overflow into a menu, but as noted in https://bugreports.qt.io/browse/QTBUG-2472 there isn't a way do so directly, e.g. with a setter. Force an overflow menu in the display filter toolbar by adding a child QToolBar and adding filter expression actions to it. While we're here, set the minimum width of the display filter edit to two-thirds of the width of the main window. Change-Id: I49cd58397e087f1aa79b5bbce471f827e9804148 Reviewed-on: https://code.wireshark.org/review/15134 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-04-28uat_dialog (Qt): uat_ can't be NULL here, no need to check it. (CID 1358793)Jeff Morriss1-1/+1
Change-Id: I58d402b95a029066abd41438d652a5c805ca166d Reviewed-on: https://code.wireshark.org/review/15140 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: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-25Qt: Speed up the Display Filter Expression dialog appearance.Gerald Combs3-34/+60
Copy over and adapt SupportedProtocolsDialog::fillTree, which fills in the protocol tree after the dialog is shown processes display events while the tree is being built. Change-Id: I25082fd94c511db6a94aaed1c463ba1c1e64855c Reviewed-on: https://code.wireshark.org/review/15079 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-04-25Fix nmake build after statically linking version codeMichael Mann1-1/+2
Change-Id: I86a01bdd778f2242aa534a687275a85a2f329c02 Reviewed-on: https://code.wireshark.org/review/15071 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-25Compile sshdump and ciscodump for WindowsPascal Quantin1-0/+1
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43 Reviewed-on: https://code.wireshark.org/review/12117 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-24[Automatic update for 2016-04-24]Gerald Combs13-1397/+518
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id3a7e3cf248df0c1c0159b4bf1d1a01e3f83efb9 Reviewed-on: https://code.wireshark.org/review/15074 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-24Qt UAT: call the UAT update callback after each field is updated.Jeff Morriss1-3/+15
This fixes a crash when changing the SCCP dissector's users table when finishing the edit of a string column by clicking elsewhere (rather than pressing Enter/Return) or when changing an enum column. (The SCCP dissector depends on that update callback being called before the copy callback.) To do this: 1) Use the editingFinished signal rather than looking for Enter/Return key presses (so that a focus change is processed as the end of an edit). 2) Call the update callback when an enum field changes. Bug: 12364 Change-Id: I1884c67b6e873b46afe33703581d0b3dccbbdaf1 Reviewed-on: https://code.wireshark.org/review/15059 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-23Get rid of unnecessary method override.Guy Harris2-6/+0
The conversation dialog doesn't do anything different with the name resolution checkbox than any other subclasses of the traffic table dialog do, so leave it up to the parent class. Change-Id: I07f6c09b931ed10655f5921c0a4ab5d439dd6bcd Reviewed-on: https://code.wireshark.org/review/15065 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-23Forcibly update all items if name resolution is turned on or off.Guy Harris6-23/+39
This makes the display change if you turn the name resolution checkbox on or off. Change-Id: I873832b103b61e1e566523a1ae1c4211937c7bae Reviewed-on: https://code.wireshark.org/review/15063 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-21Link version code statically againJoão Valverde5-5/+5
This allows keeping the code-sharing with the static linking. This "fixes" a hypothetical ABI mismatch with wsutil and avoids pulling more external dependencies to wsutil than strictly necessary. A nice side-effect is that libwsutil no longer depends on version.h. Follow up to f95976eefcbeb5d24df383c29d29ef888b503945. Change-Id: I8f0d6a557ab3f7ce6f0e2c269124c89f29d6ad23 Reviewed-on: https://code.wireshark.org/review/15002 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-04-21We have to call updateWidgets() to initialize the name resolution flag.Guy Harris1-0/+1
The conversation dialog does this, and we must do so to, in order to fetch the initial setting of the name resolution flag. Bug: 12353 Change-Id: I7ee97960216ff89a612c076edcfaad8e547a27d9 Reviewed-on: https://code.wireshark.org/review/15029 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-19QT translation: Remove shortcuts from *.ts filesUli Heilmeier6-80/+80
QT ships with a base set of translated terms (qt_xx.qm). Therefore we don't need to add these terms (like "Ctrl" or "Down") used in shortcuts to the wireshark_xx.ts files. The ts files are generated by running lupdate. To get the new ts files (without the shortcut terms) it is necessary to run lupdate with option "-no-obsolete". Change-Id: I6346a866ae9a1b58fa23ea089c43c90ec0dc0225 Reviewed-on: https://code.wireshark.org/review/14848 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> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-18Qt: highlight hovered bytePeter Wu2-17/+45
Make it easier to link the hex with ascii bytes. The background color will become yellow for bytes with the mouse focus. Bug: 11547 Change-Id: Iab87e598a302ecf7bb7b37cd6ad55ea291c02b82 Reviewed-on: https://code.wireshark.org/review/14716 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-04-17[Automatic update for 2016-04-17]Gerald Combs13-184/+184
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3e8de1dcb6cc8fbbe04a68a6488bc8c11d353972 Reviewed-on: https://code.wireshark.org/review/14951 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-15Qt: Make some menu items discoverable (or not).Gerald Combs3-33/+61
Enable and disable individual actions instead of their parent menus in order to keep them discoverable. Do the opposite for Colorize Conversation items so that we don't make the user traverse the menu hierarchy unnecessarily. Change-Id: I81770dbbb2d715a2131eb754fedaaadcc8803da2 Reviewed-on: https://code.wireshark.org/review/14558 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> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-14Qt: Make sure we call proto_initialize_all_prefixes.Gerald Combs1-0/+2
Call proto_initialize_all_prefixes when we open the Display Filter Expression Dialog. This matches the GTK+ UI behavior. Change-Id: Ie8f8a618d29667fce1f61b6e854baed85c54a569 Reviewed-on: https://code.wireshark.org/review/14920 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-04-13Windows: Remove the need for _CRT_NONSTDC_NO_DEPRECATE.Gerald Combs1-1/+1
Replace some function calls with their non-deprecated equivalents so that we can remove _CRT_NONSTDC_NO_DEPRECATE from CMakeLists.txt and config.nmake. Leave _CRT_SECURE_NO_DEPRECATE in place. Removing it failed with 145 warnings and 72 errors. Note that we could probably improve startup performance by using wmem in diam_dict.*. Change-Id: I6e130003de838aebedbdd1aa78c50de8a339ddcb Reviewed-on: https://code.wireshark.org/review/14883 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-04-12Qt: prevent input to the capture filter field during initializationPeter Wu2-10/+12
Mark the capture filter field as readonly until initialization is completed. This avoids useless entries in the recent capture filters list and fixes a use-after-free when typing during startup. (This use-after free occurred when a new item is added to the recent filters list which invalidates the previously retrieved list). Change-Id: Ifae9444986436a60781bf5f83a6e650501ccc4d5 Reviewed-on: https://code.wireshark.org/review/14740 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-10[Automatic update for 2016-04-10]Gerald Combs13-282/+310
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ibb63f9cb5cacb3b25f2038912a53d170be9cdaee Reviewed-on: https://code.wireshark.org/review/14876 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-08packet_list: fix Called C++ object pointer is null found by Clang AnalyzerAlexis La Goutte1-1/+1
Change-Id: Ie1a16973e94f09eeacea770936f9a9b4ab82b01d Reviewed-on: https://code.wireshark.org/review/14838 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-07Bring back the hotkey for "w" in "... without saving"Jiří Engelthaler1-5/+5
The hotkey was intentionally removed in Ie505650889212082e088a525f4b82e62b9177b0d. The hotkey is present in GTK version but missing in QT version. Change-Id: Id54e704cd0398b4f07f00c9d1d298409b90d927b Reviewed-on: https://code.wireshark.org/review/14845 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-04-07Cast away a warning.Guy Harris1-1/+1
Alas, QByteArray's constructor takes an int, not a size_t, as a size. Explicitly cast the size down to an int. Change-Id: Idc24b5920e8e417dd8555628d685f94224fe47e1 Reviewed-on: https://code.wireshark.org/review/14836 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-06Qt: Follow stream performance improvements.Gerald Combs4-44/+90
Make FollowStreamText a subclass of QPlainTextEdit instead of QTextEdit. For large amounts of text, the former should be less unbearably slow than the latter. Increase the maximum stream size to 500MB. This isn't perfect but it's much more usable than 2MB and much easier than the next step, which is to write our own text display widget. Process UI events while we fill in the stream data. This gives us behavior similar to the GTK+ UI and is similar to what we do in other dialogs. Switch from g_memdup+g_free to a QByteArray in the Qt UI and GByteArray in the GTK+ UI. Don't call readStream twice. Make sure we free all of our stream data in the Qt UI. This fixes a serious memory leak. Ping-Bug: 11777 Change-Id: Ibad9bde86692ae07a80660566d1e661ab8b64601 Reviewed-on: https://code.wireshark.org/review/14271 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-04-04Include ws_diag_control.h in config.hJoão Valverde1-1/+1
Change-Id: Ia394071710ecda3b0e6686a51fbca45a8ff20317 Reviewed-on: https://code.wireshark.org/review/14749 Petri-Dish: João Valverde <j@v6e.pt> 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-04-04Remove synchronous DNS name resolutionJoão Valverde1-2/+2
Change-Id: Ie5e670b769eb0674950f3679ef511047641c2873 Reviewed-on: https://code.wireshark.org/review/14751 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-03Make the Flex scanners and YACC parser in libraries reentrant.Guy Harris1-1/+7
master-branch libpcap now generates a reentrant Flex scanner and Bison/Berkeley YACC parser for capture filter expressions, so it requires versions of Flex and Bison/Berkeley YACC that support that. We might as well do the same. For libwiretap, it means we could actually have multiple K12 text or Ascend/Lucent text files open at the same time. For libwireshark, it might not be as useful, as we only read configuration files at startup (which should only happen once, in one thread) or on demand (in which case, if we ever support multiple threads running libwireshark, we'd need a mutex to ensure that only one file reads it), but it's still the right thing to do. We also require a version of Flex that can write out a header file, so we change the runlex script to generate the header file ourselves. This means we require a version of Flex new enough to support --header-file. Clean up some other stuff encountered in the process. Change-Id: Id23078c6acea549a52fc687779bb55d715b55c16 Reviewed-on: https://code.wireshark.org/review/14719 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-03[Automatic update for 2016-04-03]Gerald Combs9-1808/+1808
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I454d61dea623c65dbe425c8ad3f354452ce0c6a5 Reviewed-on: https://code.wireshark.org/review/14793 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-02Qt: Remember selected item in packet treePeter Wu3-0/+45
Previously, changing a packet in the packet list would lose the currently selected field item in the packet tree. After this patch, this issue no longer occurs because the selected field is focussed again. The approach is to remember the header field ID on the path from a field to its root. Limitations of the current simple approach is that multiple fields/trees under a tree might result in the wrong selection. This is better than nothing though. This patch greatly helps analyzing a capture file which has the same format, except that I need to check a data source for decrypted data. Previously I would have to scroll down and select the field to see the data source which also made it impossible to quickly switch between packets and compare them. Change-Id: Ic113ca9245fd9faa10f91182794c50cfde8d10f4 Reviewed-on: https://code.wireshark.org/review/14697 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-04-02Qt: Keep byte tab when reloading/closing capture filePeter Wu1-12/+0
Do not remove byte view on closing a capture file. For this to work, the tree items must also be remembered. Change-Id: Ice5cd1006b957e2d1331effc15c4c0a9de89916d Reviewed-on: https://code.wireshark.org/review/14715 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> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-04-02Qt: Lazily create dialogs.Gerald Combs3-52/+71
According to the Visual Studio 2013 profiler here, we spend about 4% of our startup time creating the Capture Interfaces dialog. Hold off on doing that until the user wants to see the dialog. Do the same for the File Set dialog. While we're here, make sure MainWindow has fewer children when setupUi is called. setupUi calls connectSlotsByName, which iterates over all child objects. Change-Id: I253e6dc5b7e73a6cb7b7036637e336f449449c4a Reviewed-on: https://code.wireshark.org/review/14732 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-04-02Qt: Try to speed up SplashOverlayGerald Combs3-16/+9
Limit the amount of event processing SplashOverlay does. Let QWidget take care of painting. Change-Id: I9176baeba2cc9203e50c02029d85689f8908daba Reviewed-on: https://code.wireshark.org/review/14771 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-31Fix byte pane not showing up in Packet dialogPeter Wu1-2/+6
When a packet dialog is being constructed, the layout is apparently not fixed yet and the byte view is technically not visible. Fix the hidden byte pane by not hiding it when it is not (yet) visible. Bug: 11760 Change-Id: I0494fa16a5ed89ff31f934ba682a6bb884cc0e2e Reviewed-on: https://code.wireshark.org/review/14713 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-30Qt: fix buffer alarm threshold parameter retrieval in multicast statistics ↵Benoit Grange1-1/+1
dialog Bug: 12309 Change-Id: Id67b676bfcb5b4497c48d4cd7ca7c8cc1cbda986 Reviewed-on: https://code.wireshark.org/review/14704 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-30Remove not needed initialisation breaking MSVC 15 nmake build.AndersBroman1-1/+0
Change-Id: Ia486209a8eef5bf02b5b3f6d793698c4cc802dc9 Reviewed-on: https://code.wireshark.org/review/14699 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>
2016-03-29Remove an unused variable from both the Gtk and Qt UIs.Jeff Morriss1-9/+1
Change-Id: I4c7c5aeaa1fa452605cf02a5c86dfe161c451f65 Reviewed-on: https://code.wireshark.org/review/14654 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: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-03-28Qt: Make conversation menu items static.Gerald Combs13-103/+321
Add a ConversationAction and ColorizeAction classes which respectively handle conversation filtering and colorization. Move conversation menu initialization to initConversationMenus and call it once at startup. This keeps us from leaking quite a bit of memory each time we select a packet or proto tree item. Bug: 12044 Change-Id: I32e8cedaba08a419d5da6a7a9db31c910909f450 Reviewed-on: https://code.wireshark.org/review/14516 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-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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-03 05:12:35 +0000