Mercurial > octave
diff scripts/gui/uigetdir.m @ 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 | 7854d5752dd2 |
children | 813b7827c5f8 |
line wrap: on
line diff
--- a/scripts/gui/uigetdir.m Fri Sep 17 12:46:59 2021 -0700 +++ b/scripts/gui/uigetdir.m Sun Sep 19 15:36:19 2021 +0200 @@ -49,7 +49,7 @@ init_path = fileparts (init_path); endif - if (__event_manager_enabled__ ()) + if (__event_manager_have_dialogs__ ()) file_filter = cell (0, 2); default_file_name = ""; dialog_position = [240, 120]; @@ -57,8 +57,8 @@ [filename, dirname, filterindex] ... = __event_manager_file_dialog__ (file_filter, dialog_name, - default_file_name, dialog_position, - dialog_mode, init_path); + default_file_name, dialog_position, + dialog_mode, init_path); else funcname = __get_funcname__ (mfilename ()); dirname = feval (funcname, init_path, dialog_name);