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, 10 insertions, 7 deletions

diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h
index 04148c0264..9a8aed0689 100644
--- a/ui/qt/main_status_bar.h
+++ b/ui/qt/main_status_bar.h
@@ -22,18 +22,20 @@
 #ifndef MAIN_STATUS_BAR_H
 #define MAIN_STATUS_BAR_H
 
-#include "wireshark_application.h"
+#include "config.h"
+
+#include "cfile.h"
+
+#include "capchild/capture_session.h"
+
+#include "capture_file_progress_frame.h"
 #include "label_stack.h"
-#include "progress_bar.h"
+#include "wireshark_application.h"
 
 #include <QLabel>
 #include <QMenu>
 #include <QStatusBar>
 
-#include "cfile.h"
-
-#include "capchild/capture_session.h"
-
 class CaptureFile;
 
 class MainStatusBar : public QStatusBar
@@ -50,7 +52,7 @@ private:
     QLabel expert_status_;
     QLabel comment_label_;
     LabelStack info_status_;
-    ProgressBar progress_bar_;
+    CaptureFileProgressFrame progress_frame_;
     LabelStack packet_status_;
     LabelStack profile_status_;
     capture_file *cap_file_;
@@ -62,6 +64,7 @@ private:
 signals:
     void showExpertInfo();
     void editCaptureComment();
+    void stopLoading();
 
 public slots:
     void setCaptureFile(capture_file *cf);