summaryrefslogtreecommitdiff
path: root/ui/qt/main_window.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-06-16 17:24:19 -0700
committerGerald Combs <gerald@wireshark.org>2015-06-17 01:25:27 +0000
commit26dacfc8c3befed5fb6dacd84e7d6107c6920b2e (patch)
tree21c776b6be914699bafbdd816da1fd7e632b298d /ui/qt/main_window.cpp
parentd5215c2ef6e73b5f073eb0d50e01da7d06d34923 (diff)
downloadwireshark-26dacfc8c3befed5fb6dacd84e7d6107c6920b2e.tar.gz
Qt: Add protocol preferences menus.
Add protocol preferences in the packet list and packet detail context menus. Note that we need a PreferencesEditorFrame in the main window for editing numeric and string preferences. For now we just show the prefs dialog. Change-Id: Ice0cc8e9bc25963cc14aa47698f042f2a73088d8 Reviewed-on: https://code.wireshark.org/review/8957 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.cpp')
-rw-r--r--ui/qt/main_window.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 53d9d7ae52..09d2b85d07 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -416,8 +416,10 @@ MainWindow::MainWindow(QWidget *parent) :
this, SLOT(redissectPackets()));
connect(packet_list_, SIGNAL(packetSelectionChanged()),
this, SLOT(setMenusForFollowStream()));
- connect(packet_list_, SIGNAL(showPreferences(PreferencesDialog::PreferencesPane)),
+ connect(packet_list_, SIGNAL(showColumnPreferences(PreferencesDialog::PreferencesPane)),
this, SLOT(showPreferencesDialog(PreferencesDialog::PreferencesPane)));
+ connect(packet_list_, SIGNAL(showProtocolPreferences(QString)),
+ this, SLOT(showPreferencesDialog(QString)));
connect(packet_list_, SIGNAL(editColumn(int)), this, SLOT(showColumnEditor(int)));
connect(main_ui_->columnEditorFrame, SIGNAL(columnEdited()),
packet_list_, SLOT(redrawVisiblePackets()));
@@ -432,6 +434,8 @@ MainWindow::MainWindow(QWidget *parent) :
this, SLOT(setMenusForSelectedTreeRow(field_info *)));
connect(proto_tree_, SIGNAL(openPacketInNewWindow(bool)),
this, SLOT(openPacketDialog(bool)));
+ connect(proto_tree_, SIGNAL(showProtocolPreferences(QString)),
+ this, SLOT(showPreferencesDialog(QString)));
connect(byte_view_tab_, SIGNAL(byteFieldHovered(const QString&)),
main_ui_->statusBar, SLOT(pushByteStatus(const QString&)));