diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-06-17 08:41:41 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-06-18 00:46:50 +0000 |
| commit | 9c28594529b79619643948128dc2bbbaa3dcbb0e (patch) | |
| tree | 2bcff16babc1acceea9b0d83f7068c4b06f41443 /ui/qt/main_window.cpp | |
| parent | 2dd030d4f65286aad17f54c12b41471ec153ed4f (diff) | |
| download | wireshark-9c28594529b79619643948128dc2bbbaa3dcbb0e.tar.gz | |
Add a preferences editor frame.
This replaces the single preference editor dialog in the GTK+ UI.
Change-Id: I10e030981e9f7d1ec121811593586b65cf0797c5
Reviewed-on: https://code.wireshark.org/review/8966
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.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index eabfae5711..9212c593c2 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -249,6 +249,7 @@ MainWindow::MainWindow(QWidget *parent) : main_ui_->statusBar, SLOT(pushTemporaryStatus(const QString&))); main_ui_->columnEditorFrame->hide(); + main_ui_->preferenceEditorFrame->hide(); #ifndef HAVE_LIBPCAP main_ui_->menuCapture->setEnabled(false); @@ -378,6 +379,9 @@ MainWindow::MainWindow(QWidget *parent) : connect(main_welcome_, SIGNAL(popFilterSyntaxStatus()), main_ui_->statusBar, SLOT(popFilterStatus())); + connect(main_ui_->preferenceEditorFrame, SIGNAL(showProtocolPreferences(QString)), + this, SLOT(showPreferencesDialog(QString))); + connect(this, SIGNAL(setCaptureFile(capture_file*)), main_ui_->searchFrame, SLOT(setCaptureFile(capture_file*))); connect(this, SIGNAL(setCaptureFile(capture_file*)), @@ -420,6 +424,8 @@ MainWindow::MainWindow(QWidget *parent) : this, SLOT(showPreferencesDialog(PreferencesDialog::PreferencesPane))); connect(packet_list_, SIGNAL(showProtocolPreferences(QString)), this, SLOT(showPreferencesDialog(QString))); + connect(packet_list_, SIGNAL(editProtocolPreference(preference*,pref_module*)), + main_ui_->preferenceEditorFrame, SLOT(editPreference(preference*,pref_module*))); connect(packet_list_, SIGNAL(editColumn(int)), this, SLOT(showColumnEditor(int))); connect(main_ui_->columnEditorFrame, SIGNAL(columnEdited()), packet_list_, SLOT(redrawVisiblePackets())); @@ -436,6 +442,8 @@ MainWindow::MainWindow(QWidget *parent) : this, SLOT(openPacketDialog(bool))); connect(proto_tree_, SIGNAL(showProtocolPreferences(QString)), this, SLOT(showPreferencesDialog(QString))); + connect(proto_tree_, SIGNAL(editProtocolPreference(preference*,pref_module*)), + main_ui_->preferenceEditorFrame, SLOT(editPreference(preference*,pref_module*))); connect(byte_view_tab_, SIGNAL(byteFieldHovered(const QString&)), main_ui_->statusBar, SLOT(pushByteStatus(const QString&))); |