URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=83a9aadf3c910348d2c212d06398415ccceae2a1
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
83a9aad by Gerald Combs (gerald@xxxxxxxxxxxxx):
Qt: Update selected interface filter behavior.
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.
Conflicts:
ui/qt/capture_interfaces_dialog.cpp
Ping-Bug: 11886
Change-Id: I63b06dbae29c2c45ee9252092ad54bdcbacae6e6
Reviewed-on: https://code.wireshark.org/review/14129
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
(cherry picked from commit 070fc33e8501168debf879b9068da5da8e6445d6)
Reviewed-on: https://code.wireshark.org/review/14166
Actions performed:
from 91fd72c HTTP: Fix full_uri when using a Proxy
adds 83a9aad Qt: Update selected interface filter behavior.
Summary of changes:
ui/capture_ui_utils.h | 2 +
ui/qt/capture_filter_combo.h | 1 +
ui/qt/capture_filter_edit.cpp | 59 ++++++++---
ui/qt/capture_filter_edit.h | 6 +-
ui/qt/capture_interfaces_dialog.cpp | 193 ++++++++++++++++-------------------
ui/qt/capture_interfaces_dialog.h | 7 +-
ui/qt/interface_tree.cpp | 110 ++++++++++++++------
ui/qt/interface_tree.h | 9 +-
ui/qt/main_welcome.cpp | 36 ++++++-
ui/qt/main_welcome.h | 6 ++
ui/qt/main_window.cpp | 13 ++-
11 files changed, 282 insertions(+), 160 deletions(-)