Mercurial > octave
diff libinterp/corefcn/event-manager.h @ 30195:a7981aa5822b
event-manager: Add function to signal valid implementation of GUI dialogs (bug #60980).
The event-manager is also enabled when starting with --no-gui-libs. But not all
implementations of the event-manager have dialogs (only Qt at the moment which
isn't used when starting with --no-gui-libs). Add functions that return if the
event-manager has implemented dialogs.
* libinterp/corefcn/event-manager.h (interpreter_events::have_dialogs,
event_manager::have_dialogs): Add new function "have_dialogs".
(event_manager::file_dialog, event_manager::input_dialog,
event_manager::list_dialog, event_manager::question_dialog): Guard with
"have_dialogs".
* libinterp/corefcn/event-manager.cc (F__event_manager_have_dialogs__): Add new
function.
* libgui/src/qt-interpreter-events.h (qt_interpreter_events::have_dialogs): Add
new function.
* scripts/gui/inputdlg.m, scripts/gui/listdlg.m, scripts/gui/msgbox.m,
scripts/gui/questdlg.m, scripts/gui/uigetdir.m, scripts/gui/uigetfile.m,
scripts/gui/uiputfile.m: Check "____event_manager_have_dialogs__" instead of
"__event_manager_enabled__".
* scripts/gui/private/__get_funcname__.m: Try to use dialog functions specific
to the current graphics toolkit if the event-manager doesn't have implemented
dialogs.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 19 Sep 2021 15:36:19 +0200 |
| parents | 71d738ed015d |
| children | 91c6288781ba 796f54d4ddbf |
line wrap: on
line diff
--- a/libinterp/corefcn/event-manager.h Fri Sep 17 12:46:59 2021 -0700 +++ b/libinterp/corefcn/event-manager.h Sun Sep 19 15:36:19 2021 +0200 @@ -100,6 +100,8 @@ // Dialogs. + virtual bool have_dialogs (void) const { return false; } + typedef std::list<std::pair<std::string, std::string>> filter_list; virtual std::list<std::string> @@ -378,6 +380,13 @@ m_instance->close_gui (); } + // Dialogs + + bool have_dialogs (void) const + { + return m_qt_event_handlers && m_qt_event_handlers->have_dialogs (); + } + typedef std::list<std::pair<std::string, std::string>> filter_list; std::list<std::string> @@ -385,7 +394,7 @@ const std::string& filename, const std::string& dirname, const std::string& multimode) { - return (enabled () + return (enabled () && have_dialogs () ? m_instance->file_dialog (filter, title, filename, dirname, multimode) : std::list<std::string> ()); @@ -398,7 +407,7 @@ const std::list<float>& nc, const std::list<std::string>& defaults) { - return (enabled () + return (enabled () && have_dialogs () ? m_instance->input_dialog (prompt, title, nr, nc, defaults) : std::list<std::string> ()); } @@ -413,7 +422,7 @@ const std::string& ok_string, const std::string& cancel_string) { - return (enabled () + return (enabled () && have_dialogs () ? m_instance->list_dialog (list, mode, width, height, initial_value, name, prompt, ok_string, cancel_string) @@ -425,7 +434,7 @@ const std::string& btn1, const std::string& btn2, const std::string& btn3, const std::string& btndef) { - return (enabled () + return (enabled () && have_dialogs () ? m_instance->question_dialog (msg, title, btn1, btn2, btn3, btndef) : "");