diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-07-03 15:52:49 -0500 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-07-07 20:49:30 +0000 |
commit | e91ca72a445d51b71f958f140e2eb89747f499ff (patch) | |
tree | 8447adabdba8623cd8e045bc7a3d3d73fca54130 /ui/qt/capture_file_progress_frame.cpp | |
parent | e9622175f7aee7dbeff6e97c9ac6ab78460e239a (diff) |
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@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/capture_file_progress_frame.cpp')
-rw-r--r-- | ui/qt/capture_file_progress_frame.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/ui/qt/capture_file_progress_frame.cpp b/ui/qt/capture_file_progress_frame.cpp index 2a42958d26..329510f715 100644 --- a/ui/qt/capture_file_progress_frame.cpp +++ b/ui/qt/capture_file_progress_frame.cpp @@ -38,14 +38,10 @@ // - Start adding the progress bar to dialogs. // - Don't complain so loudly when the user stops a capture. -progdlg_t * -delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title, - gboolean terminate_is_stop, gboolean *stop_flag, - const GTimeVal *start_time, gfloat progress) -{ +progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title, + gboolean terminate_is_stop, gboolean *stop_flag) { Q_UNUSED(task_title); Q_UNUSED(item_title); - Q_UNUSED(start_time); CaptureFileProgressFrame *cfpf; QWidget *main_window; @@ -65,7 +61,18 @@ delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_t if (!cfpf) { return NULL; } - return cfpf->show(true, terminate_is_stop, stop_flag, progress * 100); + return cfpf->show(true, terminate_is_stop, stop_flag, 0); +} + +progdlg_t * +delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title, + gboolean terminate_is_stop, gboolean *stop_flag, + const GTimeVal *start_time, gfloat progress) +{ + Q_UNUSED(start_time); + progdlg_t *progress_dialog = create_progress_dlg(top_level_window, task_title, item_title, terminate_is_stop, stop_flag); + update_progress_dlg(progress_dialog, progress, item_title); + return progress_dialog; } /* |