aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/conversation_dialog.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-08-24 12:33:49 -0700
committerGerald Combs <gerald@wireshark.org>2015-08-26 14:47:07 +0000
commitf7e9a795a8575c8170346e878b898efe1e5be304 (patch)
tree917a6986675583f95d0b1b51f7f615bce948b2a0 /ui/qt/conversation_dialog.cpp
parent8b4ff246b5219f481c36cb6ef865213bdb162176 (diff)
Add per-dialog progress frames.
Add ProgressFame::addToButtonBox, which violates the UX guidelines on every platform we support by inserting a ProgressFrame into a QDialogButtonBox. Call addToButtonBox in the constructors of a bunch of dialogs. Change-Id: I33ac5fd7a976ee6e0527de569a5c4b528980dae1 Reviewed-on: https://code.wireshark.org/review/10242 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/conversation_dialog.cpp')
-rw-r--r--ui/qt/conversation_dialog.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp
index f26759edf5..89576c144a 100644
--- a/ui/qt/conversation_dialog.cpp
+++ b/ui/qt/conversation_dialog.cpp
@@ -30,7 +30,6 @@
#include "wsutil/str_util.h"
#include "qt_ui_utils.h"
-
#include "wireshark_application.h"
#include <QCheckBox>
@@ -70,6 +69,8 @@ ConversationDialog::ConversationDialog(QWidget &parent, CaptureFile &cf, int cli
graph_bt_->setToolTip(tr("Graph a TCP conversation."));
connect(graph_bt_, SIGNAL(clicked()), this, SLOT(graphTcp()));
+ addProgressFrame(&parent);
+
QList<int> conv_protos;
for (GList *conv_tab = recent.conversation_tabs; conv_tab; conv_tab = conv_tab->next) {
int proto_id = proto_get_id_by_short_name((const char *)conv_tab->data);