diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2017-05-09 14:04:18 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-05-28 18:50:06 +0000 |
| commit | 866178eb1f244ccad722eec7c7aadbb7655a688d (patch) | |
| tree | 2227795d61a84c08fb58ad4abec57f34b9d63443 /ui | |
| parent | 24d991dab493d249167e913c652ef463cfcd5245 (diff) | |
GTK+Qt: Show Osmux Packet Counter on Telephony menu
Change-Id: I565b0d2d43dd98781f77a302a20bd841e3e4650e
Reviewed-on: https://code.wireshark.org/review/21598
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/main_menubar.c | 5 | ||||
| -rw-r--r-- | ui/qt/main_window.h | 1 | ||||
| -rw-r--r-- | ui/qt/main_window.ui | 15 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 5 |
4 files changed, 26 insertions, 0 deletions
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 8669743135..a34be9c5ba 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -1096,6 +1096,9 @@ static const char *ui_desc_menubar = " <menu name= 'MTP3menu' action='/Telephony/MTP3'>\n" " <menuitem name='MSUSummary' action='/Telephony/MTP3/MSUSummary'/>\n" " </menu>\n" +" <menu name= 'Osmuxmenu' action='/Telephony/Osmux'>\n" +" <menuitem name='osmux' action='/Telephony/Osmux/osmux'/>\n" +" </menu>\n" " <menu name= 'RTPmenu' action='/Telephony/RTP'>\n" " <menuitem name='ShowAllStreams' action='/Telephony/RTP/ShowAllStreams'/>\n" " <menuitem name='StreamAnalysis' action='/Telephony/RTP/StreamAnalysis'/>\n" @@ -1516,6 +1519,8 @@ static const GtkActionEntry main_menu_bar_entries[] = { { "/Telephony/LTE/RLCGraph", NULL, "RLC _Graph...", NULL, NULL, G_CALLBACK(rlc_lte_graph_cb) }, { "/Telephony/MTP3", NULL, "_MTP3", NULL, NULL, NULL }, { "/Telephony/MTP3/MSUSummary", NULL, "MSU Summary", NULL, NULL, G_CALLBACK(mtp3_sum_gtk_sum_cb) }, + { "/Telephony/Osmux", NULL, "Osmux", NULL, NULL, NULL }, + { "/Telephony/Osmux/osmux", NULL, "Packet Counter", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, { "/Telephony/RTP", NULL, "_RTP", NULL, NULL, NULL }, { "/Telephony/RTP/StreamAnalysis", NULL, "Stream Analysis...", NULL, NULL, G_CALLBACK(rtp_analysis_cb) }, { "/Telephony/RTP/ShowAllStreams", NULL, "Show All Streams", NULL, NULL, G_CALLBACK(rtpstream_launch) }, diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index 23e1de7cce..b6c41ea1c1 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -620,6 +620,7 @@ private slots: void on_actionTelephonyIax2StreamAnalysis_triggered(); void on_actionTelephonyISUPMessages_triggered(); void on_actionTelephonyMtp3Summary_triggered(); + void on_actionTelephonyOsmuxPacketCounter_triggered(); void on_actionTelephonyRTPStreams_triggered(); void on_actionTelephonyRTPStreamAnalysis_triggered(); void on_actionTelephonyRTSPPacketCounter_triggered(); diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 8ee6ec69c9..e38896a5e9 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -595,6 +595,12 @@ </property> <addaction name="actionTelephonyMTP3Placeholder"/> </widget> + <widget class="QMenu" name="menuOsmux"> + <property name="title"> + <string>Osmux</string> + </property> + <addaction name="actionTelephonyOsmuxPacketCounter"/> + </widget> <addaction name="actionTelephonyVoipCalls"/> <addaction name="menuANSI"/> <addaction name="menuGSM"/> @@ -602,6 +608,7 @@ <addaction name="actionTelephonyISUPMessages"/> <addaction name="menuLTE"/> <addaction name="menuMTP3"/> + <addaction name="menuOsmux"/> <addaction name="menuRTP"/> <addaction name="menuRTSP"/> <addaction name="menuTelephonySCTP"/> @@ -1916,6 +1923,14 @@ <string>ISUP message statistics</string> </property> </action> + <action name="actionTelephonyOsmuxPacketCounter"> + <property name="text"> + <string>Packet Counter</string> + </property> + <property name="toolTip"> + <string>Osmux packet counts</string> + </property> + </action> <action name="actionTelephonyRTSPPacketCounter"> <property name="text"> <string>Packet Counter</string> diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index a9db64ffc5..4f550b3bbd 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -3390,6 +3390,11 @@ void MainWindow::on_actionTelephonyMtp3Summary_triggered() mtp3s_dialog->show(); } +void MainWindow::on_actionTelephonyOsmuxPacketCounter_triggered() +{ + openStatisticsTreeDialog("osmux"); +} + void MainWindow::on_actionTelephonyRTPStreams_triggered() { RtpStreamDialog *rtp_stream_dialog = new RtpStreamDialog(*this, capture_file_); |