diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-01-20 16:05:56 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-01-21 06:50:30 +0000 |
| commit | 05fbb4826bcb182cc3895874a15585a96703ce1f (patch) | |
| tree | 448763b393a9ba79c49df7d98c94a77a9e05849d /ui/qt/capture_file.cpp | |
| parent | 317649f94984cf3d17f2a57badebb78d7703cdb5 (diff) | |
| download | wireshark-05fbb4826bcb182cc3895874a15585a96703ce1f.tar.gz | |
Qt: Show merge progress.
Add "file merge" callback plumbing. Use it to display "Merging files" in
the main statusbar.
Make sure we have a usable window pointer when we merge files.
Change-Id: I236b6edb30685f0b06703ab8304bc88ae592f83c
Reviewed-on: https://code.wireshark.org/review/19716
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/capture_file.cpp')
| -rw-r--r-- | ui/qt/capture_file.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ui/qt/capture_file.cpp b/ui/qt/capture_file.cpp index 2c04a35261..791e875ca1 100644 --- a/ui/qt/capture_file.cpp +++ b/ui/qt/capture_file.cpp @@ -221,6 +221,14 @@ void CaptureFile::captureFileEvent(int event, gpointer data) emit captureFileFlushTapsData(); emit captureFileRetapFinished(); break; + case(cf_cb_file_merge_started): + g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Merge started"); + emit captureFileMergeStarted(); + break; + case(cf_cb_file_merge_finished): + g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: Merge finished"); + emit captureFileMergeFinished(); + break; case(cf_cb_file_fast_save_finished): // gtk/main.c calls main_cf_cb_file_rescan_finished. Should we do |