URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ea6fa049c9c43a6852c2a1e8b72598e13a27786b
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
ea6fa04 by Gerald Combs (gerald@xxxxxxxxxxxxx):
Update the simple dialog code.
Rename simple_dialog_qt.{cpp,h} to simple_dialog.{cpp,h}. Make it a
subclass of QMessageBox. Queue messages at startup similar to GTK+.
Move the GTK+-specific simple_dialog declarations to
gtk/simple_dialog.h.
Don't yell at the user so much. Replace exclamation points with periods.
Change-Id: I1cc771106222d5e06f1f52d67ac29d6dc367cce4
Reviewed-on: https://code.wireshark.org/review/4288
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 2ee45fe openSAFETY: Heuristic marks packet as truncated
adds ea6fa04 Update the simple dialog code.
Summary of changes:
dumpcap.c | 14 +-
file.c | 18 +-
tshark.c | 18 +-
ui/capture.c | 26 +--
ui/gtk/Makefile.common | 1 +
ui/gtk/capture_dlg.c | 2 +-
ui/gtk/capture_if_details_dlg_win32.c | 8 +-
ui/gtk/color_dlg.c | 2 +-
ui/gtk/main.c | 2 +-
ui/gtk/main_airpcap_toolbar.c | 10 +-
ui/gtk/manual_addr_resolv.c | 2 +-
ui/gtk/prefs_dlg.c | 4 +-
ui/gtk/proto_dlg.c | 3 +-
ui/gtk/simple_dialog.c | 16 +-
ui/gtk/simple_dialog.h | 109 ++++++++++++
ui/qt/CMakeLists.txt | 4 +-
ui/qt/Makefile.common | 5 +-
ui/qt/Wireshark.pro | 4 +-
ui/qt/main.cpp | 4 +-
ui/qt/main_window.cpp | 63 +++++++
ui/qt/simple_dialog.cpp | 266 +++++++++++++++++++++++++++++
ui/qt/{color_utils.h => simple_dialog.h} | 32 ++--
ui/qt/simple_dialog_qt.cpp | 268 ------------------------------
ui/qt/simple_dialog_qt.h | 52 ------
ui/simple_dialog.h | 57 +------
25 files changed, 532 insertions(+), 458 deletions(-)
create mode 100644 ui/gtk/simple_dialog.h
create mode 100644 ui/qt/simple_dialog.cpp
copy ui/qt/{color_utils.h => simple_dialog.h} (68%)
delete mode 100644 ui/qt/simple_dialog_qt.cpp
delete mode 100644 ui/qt/simple_dialog_qt.h