Wireshark-commits: [Wireshark-commits] master-2.6 7a60b5c: More interface view cleanups.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7a60b5c1b073e7374d4b25f9d07c3ae73c9102d5
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark
Commits:
7a60b5c by Guy Harris (guy@xxxxxxxxxxxx):
More interface view cleanups.
Rename some of the columns - IFTREE_COL_NAME is the interface name,
IFTREE_COL_DESCRIPTION is the description/friendly name, and a new
IFTREE_COL_DISPLAY_NAME column is the display name (which may include
both the description and the interface name). Rename
IFTREE_COL_INTERFACE_COMMENT to just IFTREE_COL_COMMENT - there's no
*other* type of comment, and "IF" is short for "interface".
In the interface frame, use IFTREE_COL_DISPLAY_NAME, as that's the only
column that shows both and thus has something for all interfaces.
In the "Manage interfaces" dialog, put the description before the
interface name, as it was in earlier versions.
Change-Id: If0d959dcd4ca99913c941df00621da3c478233f6
Reviewed-on: https://code.wireshark.org/review/29090
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
(cherry picked from commit 232dbfd0aef3acd79292184f7fa0ca1e5d498017)
Reviewed-on: https://code.wireshark.org/review/29091
Actions performed:
from 1d0c3bb Show just the description in the description column.
add 7a60b5c More interface view cleanups.
Summary of changes:
ui/qt/interface_frame.cpp | 8 ++++----
ui/qt/manage_interfaces_dialog.cpp | 6 +++---
ui/qt/models/interface_tree_cache_model.cpp | 6 +++---
ui/qt/models/interface_tree_model.cpp | 20 ++++++++++++++------
ui/qt/models/interface_tree_model.h | 5 +++--
5 files changed, 27 insertions(+), 18 deletions(-)