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>

1 files changed, 7 insertions, 2 deletions

diff --git a/ui/qt/capture_file.cpp b/ui/qt/capture_file.cpp
index 05e480289b..37358e044d 100644
--- a/ui/qt/capture_file.cpp
+++ b/ui/qt/capture_file.cpp
@@ -96,9 +96,9 @@ void CaptureFile::retapPackets()
     }
 }
 
-void CaptureFile::stopTapping()
+void CaptureFile::stopLoading()
 {
-    emit setCaptureStopFlag(true);
+    setCaptureStopFlag(true);
 }
 
 capture_file *CaptureFile::globalCapFile()
@@ -112,6 +112,11 @@ gpointer CaptureFile::window()
     return NULL;
 }
 
+void CaptureFile::setCaptureStopFlag(bool stop_flag)
+{
+    if (cap_file_) cap_file_->stop_flag = stop_flag;
+}
+
 void CaptureFile::captureFileCallback(gint event, gpointer data, gpointer user_data)
 {
     CaptureFile *capture_file = static_cast<CaptureFile *>(user_data);