Qt: Update the status bar when saving.

Plumb in more capture file callbacks. Add common functions for setting
the status bar file information. Add and update code to match the GTK+
status bar behavior.

Make sure we update the capture file length when rescanning.

Bug: 10943

Change-Id: Ie84c7a57ee421d57ba3477f8dde3847aaafa1cd1
Reviewed-on: https://code.wireshark.org/review/8594
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 40 insertions, 8 deletions

diff --git a/ui/qt/capture_file.cpp b/ui/qt/capture_file.cpp
index d580020e68..05e480289b 100644
--- a/ui/qt/capture_file.cpp
+++ b/ui/qt/capture_file.cpp
@@ -78,6 +78,17 @@ int CaptureFile::currentRow()
     return -1;
 }
 
+const QString CaptureFile::fileName()
+{
+    if (isValid()) {
+        QFileInfo cfi(QString::fromUtf8(cap_file_->filename));
+        file_name_ = cfi.baseName();
+    } else {
+        file_name_ = no_capture_file_;
+    }
+    return file_name_;
+}
+
 void CaptureFile::retapPackets()
 {
     if (cap_file_) {
@@ -123,14 +134,11 @@ void CaptureFile::captureFileEvent(int event, gpointer data)
 {
     switch(event) {
     case(cf_cb_file_opened):
-    {
         g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Opened");
         cap_file_ = (capture_file *) data;
-        QFileInfo cfi(QString::fromUtf8(cap_file_->filename));
-        file_name_ = cfi.baseName();
+        fileName();
         emit captureFileOpened();
         break;
-    }
     case(cf_cb_file_closing):
         g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Closing");
         file_state_ = tr(" [closing]");
@@ -154,11 +162,24 @@ void CaptureFile::captureFileEvent(int event, gpointer data)
         break;
     case(cf_cb_file_reload_started):
         g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Reload started");
-        emit captureFileReadStarted();
+        emit captureFileReloadStarted();
         break;
     case(cf_cb_file_reload_finished):
         g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Reload finished");
-        emit captureFileReadFinished();
+        emit captureFileReloadFinished();
+        break;
+
+    case(cf_cb_file_rescan_started):
+        g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Rescan started");
+        emit captureFileRescanStarted();
+        break;
+    case(cf_cb_file_rescan_finished):
+        g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Rescan finished");
+        emit captureFileRescanFinished();
+        break;
+
+    case(cf_cb_file_fast_save_finished):
+        // Ignored for now
         break;
 
     case(cf_cb_packet_selected):
@@ -167,11 +188,22 @@ void CaptureFile::captureFileEvent(int event, gpointer data)
         // Signals and slots handled elsewhere.
         break;
 
-    case(cf_cb_file_save_started): // data = string
+    case(cf_cb_file_save_started):
+    {
+        const QString file_path = (const char *) data;
+        captureFileSaveStarted(file_path);
+        break;
+    }
     case(cf_cb_file_save_finished):
+        emit captureFileSaveFinished();
+        break;
     case(cf_cb_file_save_failed):
-        // Ignored
+        emit captureFileSaveFailed();
+        break;
+    case(cf_cb_file_save_stopped):
+        emit captureFileSaveStopped();
         break;
+
     default:
         g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: main_cf_callback %d %p", event, data);
         g_warning("CaptureFile::captureFileCallback: event %u unknown", event);