diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-08-11 15:26:41 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-08-11 22:27:22 +0000 |
| commit | beacbab55afa913526a0428478198db193a22dca (patch) | |
| tree | 621ee7be2eef31ee7b54ac9238fa39d009dc9f13 /ui | |
| parent | 530061b66e25e04ef6acb34da1077f015b2ac275 (diff) | |
Fix the "Manage interfaces" dialog columns.
Windows is not the only OS with "friendly" names for interfaces; macOS
has them as well, and some *BSDs let you tag interfaces with names as
well.
The column headings for the "Interface Name" and the "Friendly Name"
were backwards.
Change-Id: I72543505cec9d479d8ab8aab3850daab3667805f
Reviewed-on: https://code.wireshark.org/review/29082
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/manage_interfaces_dialog.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/models/interface_tree_model.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp index 514444d311..1fbb9d7c56 100644 --- a/ui/qt/manage_interfaces_dialog.cpp +++ b/ui/qt/manage_interfaces_dialog.cpp @@ -143,9 +143,7 @@ ManageInterfacesDialog::ManageInterfacesDialog(QWidget *parent) : QList<InterfaceTreeColumns> columns; columns.append(IFTREE_COL_HIDDEN); columns.append(IFTREE_COL_INTERFACE_NAME); -#ifdef Q_OS_WIN columns.append(IFTREE_COL_NAME); -#endif columns.append(IFTREE_COL_INTERFACE_COMMENT); proxyModel->setColumns(columns); proxyModel->setSourceModel(sourceModel); diff --git a/ui/qt/models/interface_tree_model.cpp b/ui/qt/models/interface_tree_model.cpp index d2b7217284..e0d2790358 100644 --- a/ui/qt/models/interface_tree_model.cpp +++ b/ui/qt/models/interface_tree_model.cpp @@ -254,11 +254,11 @@ QVariant InterfaceTreeModel::headerData(int section, Qt::Orientation orientation { return tr("Show"); } - else if ( section == IFTREE_COL_INTERFACE_NAME ) + else if ( section == IFTREE_COL_NAME ) { return tr("Friendly Name"); } - else if ( section == IFTREE_COL_NAME ) + else if ( section == IFTREE_COL_INTERFACE_NAME ) { return tr("Interface Name"); } |