summaryrefslogtreecommitdiff
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2015-11-26Qt: make Files Set dialog modelessPascal Quantin1-1/+1
Otherwise you need to close the window each time you change the file so as to browse its content... Change-Id: Ibf8485695cec34bb950ad98cb671e77d4f663b63 Reviewed-on: https://code.wireshark.org/review/12187 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> (cherry picked from commit c965fb06148d0144426ba1b3fb301281a30a39b8) Reviewed-on: https://code.wireshark.org/review/12200
2015-11-26Qt: clear new_visible_rows_ when closing a capture filePascal Quantin1-0/+1
Bug: 11756 Change-Id: Iccc92963f81c3ded143953c8c1fad27cd57a7bc2 Reviewed-on: https://code.wireshark.org/review/12193 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-26Qt: Use correct column width when switching profileStig Bjørlykke2-4/+21
QTreeView::setColumnHidden() saves column width on hide and restores column width on show. When switching from a profile with hidden columns to a profile where this columns are shown we get a sectionResized() signal with the saved width from the old profile, initiated from columnsChanged() -> setColumnVisibility(). We must avoid setting this as a new column width because this is recent values from a old column layout. In other cases we use setColumnVisibility() we don’t need to set a new column width either, because we store the column width ourself. Don't store column width when hiding column (new_width == 0). Restore column width when showing column because profiles may have changed the packet_list layout. Change-Id: I7e89c3477402ec6d621cd2015ee74b086f60d6cb Reviewed-on: https://code.wireshark.org/review/12111 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> (cherry picked from commit 4980d505f268b2b1d2ebabf815f3d0ce34e8cd71) Reviewed-on: https://code.wireshark.org/review/12192
2015-11-26Qt: Redissect packets when changing profileStig Bjørlykke1-0/+2
When changing profile the protocol/dissector preferences may change so we need to redissect according to new settings. We should probably have a preferences diff to check if a redissect is needed, like it is in the preferences dialog. Bug: 11757 Change-Id: I025bbc7297966986a697f2a6368d9a74e3c1ba72 Reviewed-on: https://code.wireshark.org/review/12156 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit ce9d2ee428ce699e8b1c0c184a38cd75441e8d25) Reviewed-on: https://code.wireshark.org/review/12169
2015-11-25qt: move file close (CID 1159303)Dario Lombardo1-2/+3
Change-Id: Ib21327babc77324313a1b3e2dd6ba0987a8fb333 Reviewed-on: https://code.wireshark.org/review/12144 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit b314342c0043d411912a7aff339d8cdd6ee413aa) Reviewed-on: https://code.wireshark.org/review/12154
2015-11-25Press Start instead of Manage Interfaces on EnterPeter Wu2-2/+2
In the Capture Interfaces dialog, the default dialog action was non-existing. Fix Extcap while at it (searched for "YesRole"). Reported on #wireshark at Freenode. Change-Id: I7920b806a855acc20dcd2081f6b0d58e993b4ac1 Reviewed-on: https://code.wireshark.org/review/12136 Petri-Dish: Peter Wu <peter@lekensteyn.nl> 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: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit dde848b3d925d040592bd3f86487e9bc86905550) Reviewed-on: https://code.wireshark.org/review/12140
2015-11-24Qt: Save preferences when hide/show columnsStig Bjørlykke1-0/+6
To preserve the hide/show column settings between switching profiles the settings have to be saved. Change-Id: I6f72b2980be149676e1c1099a604c8c6d0d995bf Reviewed-on: https://code.wireshark.org/review/12109 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 9601a4f724492b3f9960e1f051360b071997d7d6) Reviewed-on: https://code.wireshark.org/review/12110
2015-11-24VoIP: fix a null dereference when trying to retrieve the time of a T.38 ↵Pascal Quantin1-1/+1
tapped packet Rather than trying to retrieve frame_data from the packet number row (while it could be filtered) let's use pinfo. Bug: 11596 Change-Id: I53966bfdfbeb0c5918c3524f4b9748ea425fe8a5 Reviewed-on: https://code.wireshark.org/review/12103 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> (cherry picked from commit 8c46a728fed52b0432a234274cc3e7a6fcadaf6d) Reviewed-on: https://code.wireshark.org/review/12104
2015-11-24Qt: check that a file name was selected before trying to export follow contentPascal Quantin1-11/+13
Bug: 11763 Change-Id: Iab117fe9f572eccc3cf88a9f3ff86a22aa0e33c9 Reviewed-on: https://code.wireshark.org/review/12099 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> (cherry picked from commit 0981a50a57381fb33b010da791b7d82367b681cd) Reviewed-on: https://code.wireshark.org/review/12102
2015-11-24Qt (Recent Files): Fix typo on variable nameAlexis La Goutte1-1/+1
Wrong variable (display field max) is updated when set max recent files Change-Id: Ie995192ffbf56cbf6bd9cea5b029ab16ff547d2f Ping-Bug:11748 Reviewed-on: https://code.wireshark.org/review/12046 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit ac2008c46fe2c19b5f0e41492dedb49261d9bc8c) Reviewed-on: https://code.wireshark.org/review/12081 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-23Qt: Fix column resolve namesStig Bjørlykke1-0/+4
Reset columns when resolve names column menu item is toggled, and save preferences to preserve the setting. We should probably have functions to redraw only one column. Change-Id: I52dce8d104ab9bedd11edc5d200ab85154243cb5 Reviewed-on: https://code.wireshark.org/review/12077 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 9851bed7a444b73215305d1de6029dd3679d3c25) Reviewed-on: https://code.wireshark.org/review/12078
2015-11-23Qt: Fixed more column issues when changing profile.Stig Bjørlykke2-2/+11
When changing profile without a loaded capture file we have to rebuild cap_file_->cinfo when a capture is loaded. Bug: 11493 Change-Id: I9b561a360236056c104cfdb478b855fa550325e2 Reviewed-on: https://code.wireshark.org/review/12068 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> (cherry picked from commit 7324555c1fef30a435a9be3c11c936b735507781) Reviewed-on: https://code.wireshark.org/review/12075
2015-11-23Qt: Revert to more optimized codeStig Bjørlykke1-8/+5
Revert some changes in PacketListModel::headerData from c5fb4022 to preserve more optimized code. Change-Id: If708999a6d446d70eca7414670dec0c618190fe0 Reviewed-on: https://code.wireshark.org/review/12058 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 815b7fe728eadd15d9708afbc236b6399e4c46a0) Reviewed-on: https://code.wireshark.org/review/12059
2015-11-23Qt: Set tooltip for packet list headerStig Bjørlykke3-26/+17
Added get_column_tooltip() to use common code in GTK and Qt. Change-Id: I2f6ce95e2e129752bbb958a28aec6f42aa81be3d Reviewed-on: https://code.wireshark.org/review/12047 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-on: https://code.wireshark.org/review/12055 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-23Qt: Improved profiles popup menuStig Bjørlykke3-30/+31
* Don’t add a global profile if having a personal copy. * Fetch profiles from _current_ profiles list. * Separate personal and global profiles. * Use bold and checked for the the current profile. * Fixed selection of the current profile in the manage profiles dialog. * Aligned GTK version with Qt version, removed the “New from Global” sub menu. Change-Id: I2326b39f7d04411000b3c014e3775284392c48c7 Ping-Bug: 11704 Reviewed-on: https://code.wireshark.org/review/12034 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 35e5523dd2d90b6a964961b2eaea1457495b4a78) Reviewed-on: https://code.wireshark.org/review/12054 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-23Qt: Preserve selected file in welcome screen.Stig Bjørlykke1-0/+9
When closing a capture file the recent files list are updated to put the most recent opened file on top. Ensure we preserve the selection of the closed file instead of having the file in the closed file's previous position selected. Change-Id: I14c9edde55b88abf7ca7f1828e269ad49203b1db Reviewed-on: https://code.wireshark.org/review/12018 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit b9812a74325e9d08db09f17093f4cf9c9b5fe081) Reviewed-on: https://code.wireshark.org/review/12051
2015-11-22We *do* use setWindowModified; remove the XXX comment saying to do so.Guy Harris1-1/+0
Change-Id: I00ffc4c787681a6bf2c84da9e44b3b3a33c0cec5 Reviewed-on: https://code.wireshark.org/review/12039 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit cc9e444b4e92865aadd68a58e6d4f5d5453a340f) Reviewed-on: https://code.wireshark.org/review/12040
2015-11-22Qt: save columns position before freezingPascal Quantin1-0/+1
It allows to restore them properly in thaw() Bug: 11737 Change-Id: Ibee6ee701ab64019ee03666c652c232770b3bb74 Reviewed-on: https://code.wireshark.org/review/12037 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-22Qt: Added translate for "Capturing from ".Stig Bjørlykke1-9/+2
Change-Id: Ibd7b47169229395e5468ee2422c3dab7abe36413 Reviewed-on: https://code.wireshark.org/review/12022 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 358615019b63d4dbc62d8257cef3f9b00b7cb549) Reviewed-on: https://code.wireshark.org/review/12036
2015-11-22Qt: Set normal window icon when capture file closed.Stig Bjørlykke3-6/+6
Also rename and use setDefaultWindowTitle() to set the window title back to "The Wireshark Network Analyzer". Change-Id: Ifa87d1a9b9140de4f256effdfca8485f65e2f839 Reviewed-on: https://code.wireshark.org/review/12025 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit a02fc3b094628f504a13012f4cf5bb7ca61ff17f) Reviewed-on: https://code.wireshark.org/review/12035
2015-11-22Do not expand packets in packet dialog by defaultPeter Wu1-1/+0
Do not expand the packet tree in the packet dialog by default, it results in forgetting the previous collapse state and deviates from previous GTK+ behavior. It is just annoying to have all Frame, Ethernet, etc. trees expanded while you are just looking at application layer traffic. (The previous tree is restored when calling ProtoTree::fillProtocolTree which calls proto_tree_draw_node and then invokes setExpanded()). Bug: 11731 Change-Id: I48c7f28a1777874b1c23025335305493777bca1d Reviewed-on: https://code.wireshark.org/review/11998 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 759bfb6c45185c06be146b0705465e5560069dff) Reviewed-on: https://code.wireshark.org/review/12030
2015-11-22Fix RTP player crash on invalid streamsPeter Wu1-0/+5
On Linux with pulseaudio, the RTP player can crash when an invalid RTP stream is played. Prevent that by detecting when stream playback fails. Since the stateChanged signal receiver is registered on the same thread, it is guaranteed that any outputStateChanged calls happen before returning from audio_output_->start(). GTK+ not have this issue, its player simply does not show the decoded stream at all. Change-Id: I51a91a7f410ef3d46551bc8df0049542efbb806f Reviewed-on: https://code.wireshark.org/review/11997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 74247f96a998797e933f09f566f60406b9ba92b4) Reviewed-on: https://code.wireshark.org/review/12029
2015-11-21debian: Fix bumping SO versionsBalint Reczey3-0/+0
Make dist failed due to library package renames and a few changes were also missing in d/control Change-Id: Iea8c054a3a32e10df73286e1535f33137e543e96 Reviewed-on: https://code.wireshark.org/review/12006 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-20Qt: Fixed column issues when changing profile.Stig Bjørlykke1-1/+1
Always initialize prefs.col_list in pre_init_prefs. When switching to a profile without a saved 'preferences' file we have to initialize prefs.col_list to default values to avoid reusing settings from the profile we leave. This was introduced in 5012cf84e6d84a448171dac64c14d9c83e3d4ae6 Emit columnsChanged() before preferencesChanged(). This because columnsChanged() rebuilds cap_file_->cinfo which is used in preferencesChanged() to align columns (and possible other actions). Doing this in the wrong order will give an inconsistency and a heap-buffer-overflow if having different number of columns. Bug: 11493 Change-Id: I5792dfc0ede11b9457b96f092af8da00453787b1 Reviewed-on: https://code.wireshark.org/review/11971 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 0ae19656e12089271ea5941bcb4663bedc337b69) Reviewed-on: https://code.wireshark.org/review/11986
2015-11-18Revert: Free cf->edt before free cf->epan when redissecting.Gerald Combs1-1/+1
Instead of freeing cf->edt before clearing the packet list, add an extra check to MainWindow::setMenusForSelectedTreeRow. Semi-blind attempt at fixing bug 11719. This reverts commit 8c211d51ef66b64c708f7ad079e7e7e913ac9f14. This reverts commit da71ccbf778cca5d9c48e010597570a40fd190c0. Bug: 11719 Change-Id: Ifd07be414ffd03a40bdfa7110395c9542bd86fc4 Reviewed-on: https://code.wireshark.org/review/11943 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 3d3eb159a757c1b7f3abc0d2c81f8e38e206243b) Reviewed-on: https://code.wireshark.org/review/11953
2015-11-18Qt: Don't update expert icon without a capture file.Stig Bjørlykke1-2/+3
We don't show the expert info icon when not having a capture file, so this should not be enabled when emitting redissectPackets(). Change-Id: I6ae6124ed9f69c214a2beadbdc670b15dfe3d060 Reviewed-on: https://code.wireshark.org/review/11937 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 73ee9178414e8d6bf7df3f508c407920c47359ee) Reviewed-on: https://code.wireshark.org/review/11942
2015-11-18Lua: Disable Reload Lua Plugins while reading file.Stig Bjørlykke3-4/+9
Hide the menu item if built without Lua. Change-Id: I316cddd55064da590eb4167b495a7fb00a41581f Reviewed-on: https://code.wireshark.org/review/11931 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> (cherry picked from commit 13297438d98e3388d650fc55c2a77d5b52367e1f) Reviewed-on: https://code.wireshark.org/review/11936
2015-11-17Fix crash in RTP Player on stop and closePeter Wu3-8/+28
When dragging the UI, this somehow causes a great lag. Then by spam-clicking on the Stop button, a double free seems to occur. Fix this by moving the audio cleanup to the outputStateChanged callback as documented at https://doc.qt.io/qt-5/qaudiooutput.html. Note that calling stop() in the IdleState also triggers a change event, resulting in the desired cleanup. Stop streams before the dialog is closed (via accept/reject). This *cannot* be done in the destrutor of RtpPlayerDialog because destructing QAudioOutput processes events from the event queue, resulting in preature destruction of other objects... crash. Change-Id: I6bfb33c9396e9bc1ffd346519d22390a97b6bdaf Reviewed-on: https://code.wireshark.org/review/11894 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 0fef9d752f801986a81b7c294143eae21cd0de97) Reviewed-on: https://code.wireshark.org/review/11930
2015-11-17Qt: Fixup the I/O Graph color menu width on Windows.Gerald Combs1-0/+7
Change-Id: I2032709fe62810a292121e8624a4b51f40070c36 Reviewed-on: https://code.wireshark.org/review/11921 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit ec68330053267c6c368013f761d0cf7efe5a0cf3) Reviewed-on: https://code.wireshark.org/review/11926
2015-11-17Qt: Fix some flow graph issues.Gerald Combs2-17/+14
Make fillDiagram() a slot and call it after the dialog is visible. Use the activated() signals instead of currentIndexChanged() for our comboboxes. The former is only emitted as a result of user interaction and the latter is always emitted when the value changed. This was a problem for flowComboBox since initializing its value resulted an extra call to fillDiagram(). Add a progress frame. Change-Id: I17bcf5c990363ee758be9e3a0604dde34fc34f2d Ping-Bug: 11710 Reviewed-on: https://code.wireshark.org/review/11897 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 689334876ec12d5a037e5bb1fad3e0d023890049) Reviewed-on: https://code.wireshark.org/review/11919
2015-11-17Qt: Fix Follow Dialog crash.Gerald Combs1-5/+9
Don't set WA_DeleteOnClose. This keeps the dialog from deleting itself when we're inside a nested event loop (i.e. when we're reassembling (TCP) or retapping (UDP or TLS)). Make sure our beginRetapPackets() and endRetapPackets() calls are balanced. Move updateWidgets() calls to follow() so that we update on the first run. Bug: 11711 Change-Id: Id585be410a315b914b27f1a116d451c863087b00 Reviewed-on: https://code.wireshark.org/review/11892 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit a18f8c84cf4e8cd98a44ce3019d25fb48dc7b23e) Reviewed-on: https://code.wireshark.org/review/11915
2015-11-17Qt: Fix a merge crash.Gerald Combs2-5/+3
Update the logic in ui/qt/main_window.cpp:mergeCaptureFile to match ui/gtk/capture_file_dlg.c:file_merge_cmd. This ensures that we don't try to use a stale (and freed) read filter. Call cf_set_rfcode in both. Bug: 11718 Change-Id: I6da65e428bff39e907f45992bac7337880c02ce9 Reviewed-on: https://code.wireshark.org/review/11895 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 7518a74dbb32f941509a5dcabb5f74a3af14985d) Reviewed-on: https://code.wireshark.org/review/11909
2015-11-17Qt: Removed obsolete comments.Stig Bjørlykke1-4/+0
Change-Id: I7c0905b38a668a7a6dcaeee6ec16761c9b5c0a55 Reviewed-on: https://code.wireshark.org/review/11901 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 2dc3b98cca40b9ed3268cb03cf7542c7615eed30) Reviewed-on: https://code.wireshark.org/review/11902
2015-11-17Qt: avoid crash when use Go Next/Previous ConversationAlexis La Goutte1-0/+2
Only enable this menu when there is a packet Change-Id: I750f2af6e9f565afce83a5e84394cc96b3b071f9 Reviewed-on: https://code.wireshark.org/review/11868 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit d3f68e576677d46426af398f5a66499ac3f99e46) Reviewed-on: https://code.wireshark.org/review/11900
2015-11-17Qt: setMenusForSelectedPacket when capture file is closed.Stig Bjørlykke1-2/+2
Moved setMenusForSelectedPacket() to captureFileClosed() because capture_file_.capFile() is still valid in captureFileClosing(). Menu items depending on is_ip, is_tcp, is_udp, is_sctp, is_ssl, is_rtp and is_lte_rlc must be disabled when closing the capture file because many of the dialogs does crash when launched without a valid frame selected. All dialogs should probably have a guard for this to avoid crashes, but that may be an exercise for an enhancement to add support for the dialogs to follow the current loaded capture file. Change-Id: If5837a355d08df76547572a25d46ffa539070de3 Reviewed-on: https://code.wireshark.org/review/11883 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> (cherry picked from commit 062e5b3118de4c4658f4379d3e84f273e3976a97) Reviewed-on: https://code.wireshark.org/review/11899
2015-11-17Remove old, unused images.Gerald Combs2-461/+0
Change-Id: I25c3d4b7d346940c4885b3b11c26fd3415d7fca8 Reviewed-on: https://code.wireshark.org/review/11893 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 1aeb3cb9897ce23b397f308d6c1886400c863e1b) Reviewed-on: https://code.wireshark.org/review/11896
2015-11-16Qt: do not clear display filter when merging filesPascal Quantin1-7/+6
The merge file dialog box contains a read filter, not a display filter. Bug: 11713 Change-Id: Iff160e552e0440ea4c626d54d834d32f38dc54c2 Reviewed-on: https://code.wireshark.org/review/11875 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 4224aab3453ab98c76d80bebae6301aa7c962fe3) Reviewed-on: https://code.wireshark.org/review/11884
2015-11-16Label the filter in the file open dialog as a "read filter".Guy Harris12-128/+161
This matches what the Windows file open dialog says, and also should help prevent people thinking that it's a display filter, so that you can clear it and see all the packets in the file. I leave translations to native speakers. Bug: 11708 Change-Id: I060816357bf7958d516429d09708a7ce16d609c5 Reviewed-on: https://code.wireshark.org/review/11877 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e9dd7c8bd42cbb25ca92dde3cee0383db6c20705) Reviewed-on: https://code.wireshark.org/review/11878
2015-11-16Qt: deactivate save / close / reload buttons when rescanning a capturePascal Quantin1-1/+1
Bug: 11703 Change-Id: I34f5c15c41ebbc62877945eabd3604ba90d5cf74 Reviewed-on: https://code.wireshark.org/review/11804 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> (cherry picked from commit 92d487a461414c9b797130e5b845488164c984cd) Reviewed-on: https://code.wireshark.org/review/11876
2015-11-16Qt: add a reference counter to sequence analysis infoPascal Quantin6-47/+72
Increment the reference counter each time a flow sequence window is opened. Free seq_analysis_info_t structure once the last flow sequence / VoIP calls / SIP flow window is closed. Bug: 11712 Change-Id: I20fcb922b0516417d4bd74cdf75475dcb31f8b90 Reviewed-on: https://code.wireshark.org/review/11851 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> (cherry picked from commit 2773596970c362a6d81c7e44311781590074c43f) Reviewed-on: https://code.wireshark.org/review/11867
2015-11-16Qt iograph: Fix off-by-one, insure we plot the last interval.Jim Young1-1/+1
Bug: 11693 Change-Id: I035eaf7ff049e3631714c112daa5adb29bb90470 Reviewed-on: https://code.wireshark.org/review/11858 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 9451e529c475fb8108c7bfe53ad229f32631f517) Reviewed-on: https://code.wireshark.org/review/11859
2015-11-15[Automatic update for 2015-11-15]Gerald Combs13-4240/+4615
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icec0d139c9c72bfd56751f75e0ccca38eaa8d9c6 Reviewed-on: https://code.wireshark.org/review/11839 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-14Qt: Fixed use-of-deallocated-memory when removing a profile.Stig Bjørlykke1-1/+2
The memory used for profile item data is accessed in updateWidgets() which is called when setting the Default profile as selected. Ensure we free this memory after this has happened. Bug: 11705 Change-Id: I79e12d918289e1fcf25331c39439e9c6f3b774d5 Reviewed-on: https://code.wireshark.org/review/11827 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 9196fa96edc467b04b68e845eb735c97ed3c8d3a) Reviewed-on: https://code.wireshark.org/review/11828
2015-11-14UDP Multicast Stats: Fixed typoUli Heilmeier1-2/+2
Change-Id: I98d6ef48448b32f57349facb2bbef538319c5da4 Reviewed-on: https://code.wireshark.org/review/11825 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 76dec3ba681da2c315efba4433d3b1f995defd91) Reviewed-on: https://code.wireshark.org/review/11826
2015-11-13Qt: Add go to next + previous packet in conversation.Gerald Combs4-1/+92
Add "Go→Next Packet in Conversation" and "Go→Previous Packet in Conversation" menu items. Make sure the shortucts ("Ctrl+." and "Ctrl+,") don't get switched to "Cmd+." and "Cmd+," on OS X. "Cmd+," is already taken by the preferences dialog. Change-Id: Iab9c7f60fdcf55f12c055b4d0948019bf667ebc9 Reviewed-on: https://code.wireshark.org/review/11771 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> (cherry picked from commit 661c9771f6ffeeda4b2ba278a9f15d1d14dbe525) Reviewed-on: https://code.wireshark.org/review/11800
2015-11-13Qt: fix creation of a new profile broken by g328fbc0Pascal Quantin1-1/+3
Change-Id: Icbe8dbf6f0c4267d7ed4704f78e589a1a48e1424 Reviewed-on: https://code.wireshark.org/review/11783 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> (cherry picked from commit aa94bbedfe92b040f528192dd66be085a1bbacc1) Reviewed-on: https://code.wireshark.org/review/11793
2015-11-13Qt: Fixed signal name to avoid a warning.Stig Bjørlykke2-16/+16
Also terminate stream lines with endl. Change-Id: Icbbe5b47695506888c03607ff0af66c59306faae Reviewed-on: https://code.wireshark.org/review/11778 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> (cherry picked from commit 1b6bf766046aca882deb7f1b9f30f25ffcb3636a) Reviewed-on: https://code.wireshark.org/review/11792
2015-11-13Qt: Coloring Rules dialog fixups.Gerald Combs4-9/+22
Insert new rules at the top. This matches the GTK+ UI behavior. Recolor the packet list when we press "OK". Add a "to do" item about setting the filter column width. Change-Id: I2a9e58fe8642a89f12e1c34622b96613f3ec4c05 Reviewed-on: https://code.wireshark.org/review/11781 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit f5d7548497eb63ebe010e5199038ef2300bf95aa) Reviewed-on: https://code.wireshark.org/review/11791
2015-11-13Qt: fix UI artifacts seen in UAT window on Linux or OSXPascal Quantin1-0/+3
The QLabel::clear() method call does not seem to repaint the area on those platforms. Let's force an update of the widget. Bug: 11695 Change-Id: I9c708c8537140b26582e4365ceee3271eac23259 Reviewed-on: https://code.wireshark.org/review/11782 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 9fe7102b3a1bc72ac9921019938be71312b26b78) Reviewed-on: https://code.wireshark.org/review/11789 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-12Qt: initialize all remote interface optionsPascal Quantin1-0/+8
Bug: 11699 Bug: 11701 Change-Id: Ib470e69bba015a006f9360cfdb429a816b80e37c Reviewed-on: https://code.wireshark.org/review/11767 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> (cherry picked from commit 2ff3c750e9a01248dcc038ca1c45df91625ab52d) Reviewed-on: https://code.wireshark.org/review/11768