summaryrefslogtreecommitdiff
path: root/ui/qt/main_window.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-07-21 09:51:12 -0700
committerGerald Combs <gerald@wireshark.org>2015-07-21 22:43:05 +0000
commite30a0ff765ff63d4f461df7aafc7c8a365dc265b (patch)
tree0801b89fc98e1695be76dccc856e53a94bdde31f /ui/qt/main_window.cpp
parente8f24f319ed28d9b419201f431f028c691fc396f (diff)
downloadwireshark-e30a0ff765ff63d4f461df7aafc7c8a365dc265b.tar.gz
Add manual name address resolution.
Make it an editor frame instead of a dialog similar to the column editor and prototocol preference editor. Change-Id: If1a0cdf02dcab0eca98e8d39c94a3c2fe236df5a Reviewed-on: https://code.wireshark.org/review/9743 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.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 6aebee84e9..1be6b20f1b 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -301,6 +301,7 @@ MainWindow::MainWindow(QWidget *parent) :
connect(main_ui_->searchFrame, SIGNAL(visibilityChanged(bool)),
main_ui_->actionEditFindPacket, SLOT(setChecked(bool)));
+ main_ui_->addressEditorFrame->hide();
main_ui_->columnEditorFrame->hide();
main_ui_->preferenceEditorFrame->hide();
@@ -429,6 +430,12 @@ MainWindow::MainWindow(QWidget *parent) :
connect(main_welcome_, SIGNAL(popFilterSyntaxStatus()),
main_ui_->statusBar, SLOT(popFilterStatus()));
+ connect(main_ui_->addressEditorFrame, SIGNAL(editAddressStatus(QString)),
+ main_ui_->statusBar, SLOT(pushTemporaryStatus(QString)));
+ connect(main_ui_->addressEditorFrame, SIGNAL(redissectPackets()),
+ this, SLOT(redissectPackets()));
+ connect(main_ui_->addressEditorFrame, SIGNAL(showNameResolutionPreferences(QString)),
+ this, SLOT(showPreferencesDialog(QString)));
connect(main_ui_->preferenceEditorFrame, SIGNAL(showProtocolPreferences(QString)),
this, SLOT(showPreferencesDialog(QString)));