diff options
| author | Gerald Combs <gerald@zing.org> | 2016-05-31 18:29:39 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-06-01 23:37:25 +0000 |
| commit | 987ff3ee1bed5fe17d3889411687283818cee29f (patch) | |
| tree | 32a8079efadab5f0a51b06db69bcf16701f92035 /ui/qt/main_window_slots.cpp | |
| parent | 4b216aea944b0478fa0310b2e47a11761219ffe8 (diff) | |
Qt: Firewall Rules dialog.
Add the Firewall ACL Rules dialog. Try showing all valid rules for a
given product instead of making the user select from a combobox. We can
add the combo back easily enough if that's desired.
Add a rule hint field and use it in the Qt and GTK+ UIs.
Bug: 12469
Change-Id: I39dd840e9838f96d7c5e2b4c34662811c21d0386
Reviewed-on: https://code.wireshark.org/review/15689
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/main_window_slots.cpp')
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 447ee6609f..d7e6130aa4 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -106,6 +106,7 @@ #include "file_set_dialog.h" #include "filter_action.h" #include "filter_dialog.h" +#include "firewall_rules_dialog.h" #include "funnel_statistics.h" #include "gsm_map_summary_dialog.h" #include "iax2_analysis_dialog.h" @@ -1217,8 +1218,8 @@ void MainWindow::setMenusForSelectedPacket() // set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/ViewMenu/NameResolution/ResolveName", // frame_selected && (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || // gbl_resolv_flags.transport_name)); -// set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/ToolsMenu/FirewallACLRules", -// frame_selected); + + main_ui_->actionToolsFirewallAclRules->setEnabled(frame_selected); main_ui_->actionStatisticsTcpStreamRoundTripTime->setEnabled(is_tcp); main_ui_->actionStatisticsTcpStreamStevens->setEnabled(is_tcp); @@ -3231,7 +3232,7 @@ void MainWindow::on_actionTelephonySipFlows_triggered() openVoipCallsDialog(true); } -// Bluetooth Menu +// Wireless Menu void MainWindow::on_actionBluetoothATT_Server_Attributes_triggered() { @@ -3263,6 +3264,15 @@ void MainWindow::on_actionBluetoothHCI_Summary_triggered() bluetooth_hci_summary_dialog->show(); } +// Tools Menu + +void MainWindow::on_actionToolsFirewallAclRules_triggered() +{ + FirewallRulesDialog *firewall_rules_dialog = new FirewallRulesDialog(*this, capture_file_); + firewall_rules_dialog->show(); +} + + // Help Menu void MainWindow::on_actionHelpContents_triggered() { |