diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-09-05 11:17:17 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-09-17 20:04:28 +0000 |
commit | 7e638057089bb9d599cd35d4673aef70e0ae58a1 (patch) | |
tree | ce2f546bac9c6c8bcac74b0d5ba0424ddefad0ca /ui/qt/traffic_table_dialog.cpp | |
parent | 478fab5206bf30a639ec9ba71edff2fb6ec2cad4 (diff) |
Qt: Add the "Map" button to the Endpoints dialog.
Move the map creation code from ui/gtk/hostlist_table.c to
ui/traffic_table_ui.c.
Add CMake commands to copy ipmap.html to the run directory so that
WIRESHARK_RUN_FROM_BUILD_DIRECTORY works for the endpoint map. Not sure
if they're entirely correct but they appear to work.
Add boundary checkes to geoip_db_lookup_ipv[46].
To do:
- It looks like there are prettier maps and newer APIs that we
might want to use.
Change-Id: Ie06992c9bc9c9aa683328aecab3f5f69c9cab966
Reviewed-on: https://code.wireshark.org/review/4011
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/traffic_table_dialog.cpp')
-rw-r--r-- | ui/qt/traffic_table_dialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp index ac59560b8e..561c46f228 100644 --- a/ui/qt/traffic_table_dialog.cpp +++ b/ui/qt/traffic_table_dialog.cpp @@ -112,7 +112,7 @@ void TrafficTableDialog::fillTypeMenu(QList<int> &enabled_protos) endp_action->setData(qVariantFromValue(proto_id)); endp_action->setCheckable(true); endp_action->setChecked(enabled_protos.contains(proto_id)); - connect(endp_action, SIGNAL(triggered()), this, SLOT(toggleConversation())); + connect(endp_action, SIGNAL(triggered()), this, SLOT(toggleTable())); traffic_type_menu_.addAction(endp_action); } } @@ -177,7 +177,7 @@ void TrafficTableDialog::setTabText(QWidget *tree, const QString &text) } } -void TrafficTableDialog::toggleConversation() +void TrafficTableDialog::toggleTable() { QAction *ca = qobject_cast<QAction *>(QObject::sender()); if (!ca) { |