summaryrefslogtreecommitdiff
path: root/ui/qt/main_status_bar.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-06-19 16:56:44 -0700
committerGerald Combs <gerald@wireshark.org>2015-06-23 06:06:37 +0000
commit1dc608a05e4caa378dda710b829eee4d83d7cd80 (patch)
tree55d1fbbec6e7d3902422fa4600056f26843e3d91 /ui/qt/main_status_bar.cpp
parent0c71b13b3e444f7d6d891aa3c9a2bc22601392f5 (diff)
downloadwireshark-1dc608a05e4caa378dda710b829eee4d83d7cd80.tar.gz
Morph ProgressBar into CaptureProgressFrame.
Switch from a plain QProgressBar to a QFrame with a QProgressBar and a stop button. Add a stop_flag boolean to the capture_file struct. To do: - Start adding the progress bar to dialogs. - Don't complain so loudly when the user stops a capture. Change-Id: Iedd1d7d79f2044f1a53e4fb22186d25930a3ef03 Reviewed-on: https://code.wireshark.org/review/9029 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_status_bar.cpp')
-rw-r--r--ui/qt/main_status_bar.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index a327bd9405..e12e319758 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -138,7 +138,7 @@ MainStatusBar::MainStatusBar(QWidget *parent) :
info_progress_hb->addWidget(&expert_status_);
info_progress_hb->addWidget(&comment_label_);
info_progress_hb->addWidget(&info_status_);
- info_progress_hb->addWidget(&progress_bar_);
+ info_progress_hb->addWidget(&progress_frame_);
info_progress_hb->addStretch(10);
splitter->addWidget(info_progress);
@@ -182,6 +182,9 @@ MainStatusBar::MainStatusBar(QWidget *parent) :
this, SLOT(pushProfileName()));
connect(&profile_status_, SIGNAL(mousePressedAt(QPoint,Qt::MouseButton)),
this, SLOT(showProfileMenu(QPoint,Qt::MouseButton)));
+
+ connect(&progress_frame_, SIGNAL(stopLoading()),
+ this, SIGNAL(stopLoading()));
}
void MainStatusBar::showExpert() {