osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Add "Bluetooth" prefix for Bluetooth item in Wireless menu 

Now Bluetooth menu is named Wireless, so add Bluetooth prefix to distinguish them.

Change-Id: I7a3d1b73e0e5fd5e3cc9b1b13d0cb9a32868a8be
Reviewed-on: https://code.wireshark.org/review/10525
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Michal Labedzki 2015-09-07 15:46:45 +02:00 committed by Anders Broman
parent cd5706cb56
commit dae1286270
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/qt/main_window.h
View File

@ -551,9 +551,9 @@ private slots:
void on_actionTelephonyUCPMessages_triggered(); void on_actionTelephonyUCPMessages_triggered();
void on_actionTelephonySipFlows_triggered(); void on_actionTelephonySipFlows_triggered();
void on_actionATT_Server_Attributes_triggered(); void on_actionBluetoothATT_Server_Attributes_triggered();
void on_actionDevices_triggered(); void on_actionBluetoothDevices_triggered();
void on_actionHCI_Summary_triggered(); void on_actionBluetoothHCI_Summary_triggered();
void externalMenuItem_triggered(); void externalMenuItem_triggered();

16
ui/qt/main_window.ui
View File

@ -613,9 +613,9 @@
<property name="title"> <property name="title">
<string>&amp;Wireless</string> <string>&amp;Wireless</string>
</property> </property>
<addaction name="actionATT_Server_Attributes"/> <addaction name="actionBluetoothATT_Server_Attributes"/>
<addaction name="actionDevices"/> <addaction name="actionBluetoothDevices"/>
<addaction name="actionHCI_Summary"/> <addaction name="actionBluetoothHCI_Summary"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionWirelessWlanStatistics"/> <addaction name="actionWirelessWlanStatistics"/>
</widget> </widget>
@ -2495,19 +2495,19 @@
<string>Edit the packet list coloring rules.</string> <string>Edit the packet list coloring rules.</string>
</property> </property>
</action> </action>
<action name="actionATT_Server_Attributes"> <action name="actionBluetoothATT_Server_Attributes">
<property name="text"> <property name="text">
<string>Bluetooth ATT Server Attributes</string> <string>Bluetooth ATT Server Attributes</string>
</property> </property>
</action> </action>
<action name="actionDevices"> <action name="actionBluetoothDevices">
<property name="text"> <property name="text">
<string>Devices</string> <string>Bluetooth Devices</string>
</property> </property>
</action> </action>
<action name="actionHCI_Summary"> <action name="actionBluetoothHCI_Summary">
<property name="text"> <property name="text">
<string>HCI Summary</string> <string>Bluetooth HCI Summary</string>
</property> </property>
</action> </action>
<action name="actionViewShowPacketInNewWindow"> <action name="actionViewShowPacketInNewWindow">

6
ui/qt/main_window_slots.cpp
View File

@ -3080,7 +3080,7 @@ void MainWindow::on_actionTelephonySipFlows_triggered()
// Bluetooth Menu // Bluetooth Menu
void MainWindow::on_actionATT_Server_Attributes_triggered() void MainWindow::on_actionBluetoothATT_Server_Attributes_triggered()
{ {
BluetoothAttServerAttributesDialog *bluetooth_att_sever_attributes_dialog = new BluetoothAttServerAttributesDialog(*this, capture_file_); BluetoothAttServerAttributesDialog *bluetooth_att_sever_attributes_dialog = new BluetoothAttServerAttributesDialog(*this, capture_file_);
connect(bluetooth_att_sever_attributes_dialog, SIGNAL(goToPacket(int)), connect(bluetooth_att_sever_attributes_dialog, SIGNAL(goToPacket(int)),
@ -3090,7 +3090,7 @@ void MainWindow::on_actionATT_Server_Attributes_triggered()
bluetooth_att_sever_attributes_dialog->show(); bluetooth_att_sever_attributes_dialog->show();
} }
void MainWindow::on_actionDevices_triggered() void MainWindow::on_actionBluetoothDevices_triggered()
{ {
BluetoothDevicesDialog *bluetooth_devices_dialog = new BluetoothDevicesDialog(*this, capture_file_); BluetoothDevicesDialog *bluetooth_devices_dialog = new BluetoothDevicesDialog(*this, capture_file_);
connect(bluetooth_devices_dialog, SIGNAL(goToPacket(int)), connect(bluetooth_devices_dialog, SIGNAL(goToPacket(int)),
@ -3100,7 +3100,7 @@ void MainWindow::on_actionDevices_triggered()
bluetooth_devices_dialog->show(); bluetooth_devices_dialog->show();
} }
void MainWindow::on_actionHCI_Summary_triggered() void MainWindow::on_actionBluetoothHCI_Summary_triggered()
{ {
BluetoothHciSummaryDialog *bluetooth_hci_summary_dialog = new BluetoothHciSummaryDialog(*this, capture_file_); BluetoothHciSummaryDialog *bluetooth_hci_summary_dialog = new BluetoothHciSummaryDialog(*this, capture_file_);
connect(bluetooth_hci_summary_dialog, SIGNAL(goToPacket(int)), connect(bluetooth_hci_summary_dialog, SIGNAL(goToPacket(int)),