diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 16:52:50 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-20 01:22:57 +0000 |
| commit | 92f4c7c8d24d07ec83622e15310e8e8014c734ab (patch) | |
| tree | 59151f9d7fcd60b5b0cc7e485df8948a70e6455e /ui/qt/export_dissection_dialog.cpp | |
| parent | bea1950d0701eba35af85b228f37dac849902ea8 (diff) | |
Add JSON export to Qt/GTK UI
Change-Id: I5ff46a40cdb1f8f41565d2aa54c6f9e61d397e3a
Reviewed-on: https://code.wireshark.org/review/16013
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/export_dissection_dialog.cpp')
| -rw-r--r-- | ui/qt/export_dissection_dialog.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp index 769393da7e..306da411fd 100644 --- a/ui/qt/export_dissection_dialog.cpp +++ b/ui/qt/export_dissection_dialog.cpp @@ -96,12 +96,14 @@ ExportDissectionDialog::ExportDissectionDialog(QWidget *parent, capture_file *ca << tr("Comma Separated Values - summary (*.csv)") << tr("PSML - summary (*.psml, *.xml)") << tr("PDML - details (*.pdml, *.xml)") + << tr("JSON (*.json)") << tr("C Arrays - bytes (*.c, *.h)"); export_type_map_[name_filters[0]] = export_type_text; export_type_map_[name_filters[1]] = export_type_csv; export_type_map_[name_filters[2]] = export_type_psml; export_type_map_[name_filters[3]] = export_type_pdml; - export_type_map_[name_filters[4]] = export_type_carrays; + export_type_map_[name_filters[4]] = export_type_json; + export_type_map_[name_filters[5]] = export_type_carrays; setNameFilters(name_filters); selectNameFilter(export_type_map_.key(export_type)); exportTypeChanged(export_type_map_.key(export_type)); @@ -206,6 +208,9 @@ int ExportDissectionDialog::exec() case export_type_pdml: /* PDML */ status = cf_write_pdml_packets(cap_file_, &print_args_); break; + case export_type_json: /* JSON */ + status = cf_write_json_packets(cap_file_, &print_args_); + break; default: return QDialog::Rejected; } |