URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e91ca72a445d51b71f958f140e2eb89747f499ff
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
e91ca72 by Gerald Combs (gerald@xxxxxxxxxxxxx):
Qt: Add initial Lua support.
Add a FunnelStatistics class, which is the main interface between the Qt
UI and the Funnel API.
Add FunnelTextDialog, which implements the text_window, ProgDlg, menu,
and other routines. Add FunnelStringDialog, which implements dlg_new.
We currently only support "Tools" menu items (MENU_TOOLS_UNSORTED, aka
REGISTER_TOOLS_GROUP_UNSORTED). Add a disabled placeholder to the
"Tools" menu in case we don't load any scripts.
Use "struct progdlg" instead of needlessly casting to
funnel_progress_window_t.
To do:
- Add support for MENU_STAT_UNSORTED, MENU_STAT_GENERIC, etc.
- Make the firewall config generator a Lua script?
- Add FunnelGraphDialog? It seems like it would be useful to
make QCustomPlot accessible to Lua scripts.
Ping-Bug: 9845
Change-Id: Iefff02e9032ed1853666f7902509ed08b431e7a7
Reviewed-on: https://code.wireshark.org/review/9523
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from e962217 Added support for optional display of signed 16/32-bit integer Modbus register data
adds e91ca72 Qt: Add initial Lua support.
Summary of changes:
color_filters.c | 2 +-
color_filters.h | 2 +-
epan/funnel.c | 1 +
epan/funnel.h | 52 ++--
epan/wslua/wslua.h | 2 +-
epan/wslua/wslua_gui.c | 14 +-
ui/cli/tap-funnel.c | 1 +
ui/gtk/funnel_stat.c | 34 +--
ui/qt/CMakeLists.txt | 8 +
ui/qt/Makefile.am | 4 +
ui/qt/Makefile.common | 10 +
ui/qt/Wireshark.pro | 8 +
ui/qt/capture_file.cpp | 7 +
ui/qt/capture_file.h | 3 +
ui/qt/capture_file_progress_frame.cpp | 21 +-
ui/qt/funnel_statistics.cpp | 302 ++++++++++++++++++++
ui/qt/{wireshark_dialog.h => funnel_statistics.h} | 54 ++--
ui/qt/funnel_string_dialog.cpp | 101 +++++++
...te_settings_dialog.h => funnel_string_dialog.h} | 40 +--
...t_comment_dialog.ui => funnel_string_dialog.ui} | 20 +-
ui/qt/funnel_text_dialog.cpp | 239 ++++++++++++++++
ui/qt/funnel_text_dialog.h | 98 +++++++
...iled_filter_output.ui => funnel_text_dialog.ui} | 38 ++-
ui/qt/main_window.cpp | 47 ++-
ui/qt/main_window.h | 6 +-
ui/qt/main_window.ui | 21 ++
ui/qt/wireshark_application.cpp | 21 ++
ui/qt/wireshark_application.h | 2 +
28 files changed, 1034 insertions(+), 124 deletions(-)
create mode 100644 ui/qt/funnel_statistics.cpp
copy ui/qt/{wireshark_dialog.h => funnel_statistics.h} (52%)
create mode 100644 ui/qt/funnel_string_dialog.cpp
copy ui/qt/{remote_settings_dialog.h => funnel_string_dialog.h} (58%)
copy ui/qt/{packet_comment_dialog.ui => funnel_string_dialog.ui} (72%)
create mode 100644 ui/qt/funnel_text_dialog.cpp
create mode 100644 ui/qt/funnel_text_dialog.h
copy ui/qt/{compiled_filter_output.ui => funnel_text_dialog.ui} (55%)