diff options
| author | Dario Lombardo <lomato@gmail.com> | 2015-01-13 15:13:27 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-27 13:19:20 +0000 |
| commit | 9bbc33730622e117d9edfa3f393da883624510f1 (patch) | |
| tree | 12ed187d9572b70ee82298b6138c15e3f0ce5419 /ui | |
| parent | c80aa1041544d92cd5599ab5894a9e826c24ae83 (diff) | |
Added HPFEEDS stats_tree.
Change-Id: I256fd5395b062fa954ebd60598721323ea1d7ff1
Bug: 10875
Reviewed-on: https://code.wireshark.org/review/6713
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/main_menubar.c | 2 | ||||
| -rw-r--r-- | ui/qt/main_window.h | 1 | ||||
| -rw-r--r-- | ui/qt/main_window.ui | 9 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 5 |
4 files changed, 17 insertions, 0 deletions
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 630dcb13cd..dbff56869a 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -1048,6 +1048,7 @@ static const char *ui_desc_menubar = " <menuitem name= 'DNS' action='/Statistics/dns'/>\n" " <menuitem name='FlowGraph' action='/Statistics/FlowGraph'/>\n" " <menuitem name='HART-IP' action='/Statistics/hart_ip'/>\n" +" <menuitem name= 'Hpfeeds' action='/Statistics/hpfeeds'/>\n" " <menu name= 'HTTPMenu' action='/Statistics/HTTP'>\n" " <menuitem name='http' action='/Statistics/HTTP/http'/>\n" " <menuitem name='http_req' action='/Statistics/HTTP/http_req'/>\n" @@ -1481,6 +1482,7 @@ static const GtkActionEntry main_menu_bar_entries[] = { { "/Statistics/dns", NULL, "DNS", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, { "/Statistics/FlowGraph", WIRESHARK_STOCK_FLOW_GRAPH, "Flo_w Graph...", NULL, NULL, G_CALLBACK(flow_graph_launch) }, { "/Statistics/hart_ip", NULL, "HART-IP", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/Statistics/hpfeeds", NULL, "HPFEEDS", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, { "/Statistics/HTTP", NULL, "HTTP", NULL, NULL, NULL }, { "/Statistics/HTTP/http", NULL, "Packet Counter", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, { "/Statistics/HTTP/http_req", NULL, "Requests", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index b254f4214e..d1fedbeaa1 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -423,6 +423,7 @@ private slots: void on_actionStatisticsSametime_triggered(); void on_actionStatisticsDNS_triggered(); void actionStatisticsPlugin_triggered(); + void on_actionStatisticsHpfeeds_triggered(); void openVoipCallsDialog(bool all_flows = false); void on_actionTelephonyVoipCalls_triggered(); diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 2502f8cfa5..0e1888faed 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -427,6 +427,7 @@ <addaction name="actionStatisticsDNS"/> <addaction name="actionStatisticsFlowGraph"/> <addaction name="actionStatisticsHART_IP"/> + <addaction name="actionStatisticsHpfeeds"/> <addaction name="menuHTTP"/> <addaction name="actionStatisticsSametime"/> <addaction name="menuTcpStreamGraphs"/> @@ -1569,6 +1570,14 @@ <string>HART-IP statistics</string> </property> </action> + <action name="actionStatisticsHpfeeds"> + <property name="text"> + <string>HPFEEDS</string> + </property> + <property name="toolTip"> + <string>hpfeeds statistics</string> + </property> + </action> <action name="actionStatisticsHTTPPacketCounter"> <property name="text"> <string>Packet Counter</string> diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index d53e9545bd..dad5df9943 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1593,6 +1593,11 @@ void MainWindow::on_actionFileExportObjectsDICOM_triggered() new ExportObjectDialog(*this, capture_file_, ExportObjectDialog::Dicom); } +void MainWindow::on_actionStatisticsHpfeeds_triggered() +{ + openStatisticsTreeDialog("hpfeeds"); +} + void MainWindow::on_actionFileExportObjectsHTTP_triggered() { new ExportObjectDialog(*this, capture_file_, ExportObjectDialog::Http); |