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/main_window.h | |
| 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/main_window.h')
| -rw-r--r-- | ui/qt/main_window.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index 440476a85e..ffbd8a3cf9 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -282,6 +282,8 @@ public slots: void captureFileRescanStarted() { setMenusForCaptureFile(true); captureFileReadStarted(tr("Rescanning")); } void captureFileRetapStarted(); void captureFileRetapFinished(); + void captureFileMergeStarted(); + void captureFileMergeFinished(); void captureFileFlushTapsData(); void captureFileClosing(); void captureFileClosed(); |