diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2015-09-07 15:46:45 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-28 11:44:29 +0000 |
| commit | b9c663c16cea26f8b93bacaa7b061406f6c7465e (patch) | |
| tree | 064700c26f34e09833ebf9f9902bba149fc3fe82 /ui | |
| parent | c4d5050cbc9dd5a26319e49fa7f4d26575c7f190 (diff) | |
| download | wireshark-b9c663c16cea26f8b93bacaa7b061406f6c7465e.tar.gz | |
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>
(cherry picked from commit dae1286270af8cc9f6839e82102fa7433ac7acb4)
Reviewed-on: https://code.wireshark.org/review/11326
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/main_window.h | 6 | ||||
| -rw-r--r-- | ui/qt/main_window.ui | 16 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index dd883ffcac..4cd121a42c 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -551,9 +551,9 @@ private slots: void on_actionTelephonyUCPMessages_triggered(); void on_actionTelephonySipFlows_triggered(); - void on_actionATT_Server_Attributes_triggered(); - void on_actionDevices_triggered(); - void on_actionHCI_Summary_triggered(); + void on_actionBluetoothATT_Server_Attributes_triggered(); + void on_actionBluetoothDevices_triggered(); + void on_actionBluetoothHCI_Summary_triggered(); void externalMenuItem_triggered(); diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 878b2d77e5..cd62b48a21 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -612,9 +612,9 @@ <property name="title"> <string>&Wireless</string> </property> - <addaction name="actionATT_Server_Attributes"/> - <addaction name="actionDevices"/> - <addaction name="actionHCI_Summary"/> + <addaction name="actionBluetoothATT_Server_Attributes"/> + <addaction name="actionBluetoothDevices"/> + <addaction name="actionBluetoothHCI_Summary"/> <addaction name="separator"/> <addaction name="actionWirelessWlanStatistics"/> </widget> @@ -2494,19 +2494,19 @@ <string>Edit the packet list coloring rules.</string> </property> </action> - <action name="actionATT_Server_Attributes"> + <action name="actionBluetoothATT_Server_Attributes"> <property name="text"> <string>Bluetooth ATT Server Attributes</string> </property> </action> - <action name="actionDevices"> + <action name="actionBluetoothDevices"> <property name="text"> - <string>Devices</string> + <string>Bluetooth Devices</string> </property> </action> - <action name="actionHCI_Summary"> + <action name="actionBluetoothHCI_Summary"> <property name="text"> - <string>HCI Summary</string> + <string>Bluetooth HCI Summary</string> </property> </action> <action name="actionViewShowPacketInNewWindow"> diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 90f1a255c2..af1be9a060 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -3087,7 +3087,7 @@ void MainWindow::on_actionTelephonySipFlows_triggered() // 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_); connect(bluetooth_att_sever_attributes_dialog, SIGNAL(goToPacket(int)), @@ -3097,7 +3097,7 @@ void MainWindow::on_actionATT_Server_Attributes_triggered() 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_); connect(bluetooth_devices_dialog, SIGNAL(goToPacket(int)), @@ -3107,7 +3107,7 @@ void MainWindow::on_actionDevices_triggered() 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_); connect(bluetooth_hci_summary_dialog, SIGNAL(goToPacket(int)), |