Wireshark-commits: [Wireshark-commits] master 1dc608a: Morph ProgressBar into CaptureProgressFrame.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1dc608a05e4caa378dda710b829eee4d83d7cd80
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
1dc608a by Gerald Combs (gerald@xxxxxxxxxxxxx):
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@xxxxxxxxxxxxx>
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 0c71b13 prefs: fix memleak
adds 1dc608a Morph ProgressBar into CaptureProgressFrame.
Summary of changes:
cfile.h | 2 +
file.c | 44 +++---
ui/qt/CMakeLists.txt | 5 +-
ui/qt/Makefile.am | 2 +
ui/qt/Makefile.common | 6 +-
ui/qt/Wireshark.pro | 5 +-
ui/qt/capture_file.cpp | 9 +-
ui/qt/capture_file.h | 13 +-
...ess_bar.cpp => capture_file_progress_frame.cpp} | 140 +++++++++++---------
...rogress_bar.h => capture_file_progress_frame.h} | 45 ++++---
ui/qt/capture_file_progress_frame.ui | 62 +++++++++
ui/qt/io_graph_dialog.cpp | 2 +-
ui/qt/main_status_bar.cpp | 5 +-
ui/qt/main_status_bar.h | 17 ++-
ui/qt/main_window.cpp | 6 +-
ui/qt/main_window.h | 1 -
ui/qt/main_window_slots.cpp | 9 --
17 files changed, 232 insertions(+), 141 deletions(-)
rename ui/qt/{progress_bar.cpp => capture_file_progress_frame.cpp} (62%)
rename ui/qt/{progress_bar.h => capture_file_progress_frame.h} (65%)
create mode 100644 ui/qt/capture_file_progress_frame.ui
