Wireshark-commits: [Wireshark-commits] master 92f4c7c: Add JSON export to Qt/GTK UI
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=92f4c7c8d24d07ec83622e15310e8e8014c734ab
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
92f4c7c by Pascal Quantin (pascal.quantin@xxxxxxxxx):
Add JSON export to Qt/GTK UI
Change-Id: I5ff46a40cdb1f8f41565d2aa54c6f9e61d397e3a
Reviewed-on: https://code.wireshark.org/review/16013
Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from bea1950 Protect some code that's only for Wireshark-with-pcap.
adds 92f4c7c Add JSON export to Qt/GTK UI
Summary of changes:
file.c | 80 ++++++++++++++++++++++++++++++++++++
file.h | 9 ++++
ui/file_dialog.h | 3 +-
ui/gtk/main.h | 7 ++++
ui/gtk/main_menubar.c | 3 ++
ui/gtk/print_dlg.c | 76 ++++++++++++++++++++++++++++++++--
ui/qt/export_dissection_dialog.cpp | 7 +++-
ui/qt/main_window.cpp | 2 +
ui/qt/main_window.h | 1 +
ui/qt/main_window.ui | 6 +++
ui/qt/main_window_slots.cpp | 5 +++
ui/win32/file_dlg_win32.c | 6 ++-
12 files changed, 199 insertions(+), 6 deletions(-)