Mercurial > octave
comparison scripts/gui/uiputfile.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 | 0a5b15007766 |
children | 813b7827c5f8 |
comparison
equal
deleted
inserted
replaced
30194:d603f1229301 | 30195:a7981aa5822b |
---|---|
115 elseif (! isempty (varargin{3})) | 115 elseif (! isempty (varargin{3})) |
116 print_usage (); | 116 print_usage (); |
117 endif | 117 endif |
118 endif | 118 endif |
119 | 119 |
120 if (__event_manager_enabled__ ()) | 120 if (__event_manager_have_dialogs__ ()) |
121 [retfile, retpath, retindex] = __event_manager_file_dialog__ (outargs{:}); | 121 [retfile, retpath, retindex] = __event_manager_file_dialog__ (outargs{:}); |
122 else | 122 else |
123 funcname = __get_funcname__ (mfilename ()); | 123 funcname = __get_funcname__ (mfilename ()); |
124 [retfile, retpath, retindex] = feval (funcname, outargs{:}); | 124 [retfile, retpath, retindex] = feval (funcname, outargs{:}); |
125 endif | 125 endif |