diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-06-19 16:56:44 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-06-23 06:06:37 +0000 |
| commit | 1dc608a05e4caa378dda710b829eee4d83d7cd80 (patch) | |
| tree | 55d1fbbec6e7d3902422fa4600056f26843e3d91 /ui/qt/Makefile.common | |
| parent | 0c71b13b3e444f7d6d891aa3c9a2bc22601392f5 (diff) | |
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>
Diffstat (limited to 'ui/qt/Makefile.common')
| -rw-r--r-- | ui/qt/Makefile.common | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common index e01bfb4bc3..ee46e60bfa 100644 --- a/ui/qt/Makefile.common +++ b/ui/qt/Makefile.common @@ -32,6 +32,7 @@ NODIST_GENERATED_HEADER_FILES = \ ui_about_dialog.h \ ui_bluetooth_att_server_attributes_dialog.h \ ui_bluetooth_devices_dialog.h \ + ui_capture_file_progress_frame.h \ ui_capture_file_properties_dialog.h \ ui_capture_interfaces_dialog.h \ ui_capture_preferences_frame.h \ @@ -133,6 +134,7 @@ MOC_HDRS = \ byte_view_text.h \ capture_file.h \ capture_file_dialog.h \ + capture_file_progress_frame.h \ capture_file_properties_dialog.h \ capture_filter_combo.h \ capture_filter_edit.h \ @@ -191,7 +193,6 @@ MOC_HDRS = \ preferences_dialog.h \ print_dialog.h \ profile_dialog.h \ - progress_bar.h \ proto_tree.h \ protocol_hierarchy_dialog.h \ protocol_preferences_menu.h \ @@ -233,6 +234,7 @@ UI_FILES = \ about_dialog.ui \ bluetooth_att_server_attributes_dialog.ui \ bluetooth_devices_dialog.ui \ + capture_file_progress_frame.ui \ capture_file_properties_dialog.ui \ capture_interfaces_dialog.ui \ capture_preferences_frame.ui \ @@ -350,6 +352,7 @@ WIRESHARK_QT_SRC = \ byte_view_text.cpp \ capture_file.cpp \ capture_file_dialog.cpp \ + capture_file_progress_frame.cpp \ capture_file_properties_dialog.cpp \ capture_filter_combo.cpp \ capture_filter_edit.cpp \ @@ -410,7 +413,6 @@ WIRESHARK_QT_SRC = \ preferences_dialog.cpp \ print_dialog.cpp \ profile_dialog.cpp \ - progress_bar.cpp \ proto_tree.cpp \ protocol_hierarchy_dialog.cpp \ protocol_preferences_menu.cpp \ |