Mercurial > octave
view scripts/help/doc.m @ 29613:9367cba2a6d5
allow most dock widgets to be used from command line
This change is an initial attempt to allow the documentation, file,
history, variable editor, and workspace widgets to be opened from the
command line. While running in command line mode, some connections
between those widgets and the interpreter or between two widgets may
be missing. The aim is to eventually make those work but this is a
good start.
These dock widgets are now owned by the base_qobject object and shared
with the main_window object. If they exist when the main_window is
created (possible if using the new terminal widget) then a pointer to
the main_window object is passed to the dock_widget so that they may
be docked there. If the desktop is closed and control returns to the
command line, undocked widgets remain available.
* octave-qobject.h, octave-qobject.cc
(base_qobject::m_documentation_widget,
base_qobject::m_file_browser_widget, base_qobject::m_history_widget,
base_qobject::m_workspace_widget, base_qobject::m_editor_widget,
base_qobject::m_variable_editor_widget): New data members.
(base_qobject::documentation_widget, base_qobject::file_browser_widget,
base_qobject::history_widget, base_qobject::workspace_widget,
base_qobject::editor_widget, base_qobject::variable_editor_widget):
New functions to create dock widgets as needed.
(base_qobject::show_documentation_window,
base_qobject::show_file_browser_window,
base_qobject::show_command_history_window,
base_qobject::show_workspace_window, base_qobject::edit_variable,
base_qobject::handle_variable_editor_update): New functions. Make
signal slot connections that do not require the main window here, not
in main_window::construct_octave_qt_link.
* files-dock-widget.cc (files_dock_widget::files_dock_widget):
If no parent, call make_window.
* documentation-dock-widget.cc
(documentation_dock_widget::documentation_dock_widget): Likewise.
* history-dock-widget.cc (history_dock_widget::history_dock_widget):
Likewise.
* workspace-view.cc (workspace_view::workspace_view): Likewise.
* doc.m: Always give the event manager a chance to display the
documentation, not just if the GUI is running.
* documentation.cc (documentation::documentation): Make sub-objects
children of the documentation object, not children of the parent of
the documentation object.
* main-window.h, main-window.cc (main_window::m_command_window,
main_window::m_history_window, main_window::m_file_browser_window,
main_window::m_doc_browser_window, main_window::m_editor_window,
main_window::m_workspace_window,
main_window::m_variable_editor_window): Manage objects with QPointer.
(main_window::main_window): Acquire m_doc_browser_window,
m_history_window, m_workspace_window, and m_variable_editor_window
from octave_qobj.
* octave-dock-widget.cc (octave_dock_widget::octave_dock_widget):
Don't reference m_parent if it is nullptr.
(octave_dock_widget::handle_settings): Likewise. Return immediately
if settings is nullptr.
(octave_dock_widget::set_main_window): New function.
* variable-editor.h, variable-editor.cc
(variable_editor::~variable_editor): Explicitly delete m_tool_bar and
set it to nullptr.
(variable_editor::edit_variable, variable_editor::notice_settings,
variable_editor::variable_destroyed): Avoid referencing m_tool_bar if
it is nullptr.
* qt-interpreter-events.h, qt-interpreter-events.cc
(qt_interpreter_events::show_documentation): Rename from show_doc.
Change all uses.
(qt_interpreter_events::register_documentation): Rename from
register_doc. Change all uses.
(qt_interpreter_events::unregister_documentation): Rename from
unregister_doc. Change all uses.
(qt_interpreter_events::show_file_browser,
qt_interpreter_events::show_command_history,
qt_interpreter_events::show_workspace): New functions.
(qt_interpreter_events::show_documentation_signal):
Rename from show_doc_signal. Change all uses.
qt_interpreter_events::register_documentation_signal):
Rename from register_doc_signal. Change all uses.
qt_interpreter_events::unregister_documentation_signal):
Rename from unregister_doc_signal. Change all uses.
(qt_interpreter_events::show_file_browser_signal,
qt_interpreter_events::show_command_history_signal,
qt_interpreter_events::show_workspace_signal): New signals.
* event-manager.h, event-manager.cc
(F__event_manager_show_file_browser__,
F__event_manager_show_command_history__,
F__event_manager_show_workspace__): New functions.
(F__event_manager_show_documentation__): Rename from
__event_manager_show_doc__. Change all uses.
(F__event_manager_register_documentation__): Rename from
F__event_manager_register_doc__. Change all uses.
(F__event_manager_unregister_documentation__): Rename from
F__event_manager_unregister_doc__. Change all uses.
(Fopenvar): Don't require GUI to be running.
(interpreter_events::show_documentation): Rename from show_doc.
Change all uses.
(interpreter_events::register_documentation): Rename from
register_doc. Change all uses.
(interpreter_events::unregister_documentation): Rename from
unregister_doc. Change all uses.
(interpreter_events::show_file_browser,
interpreter_events::show_command_history,
interpreter_events::show_workspace): New functions.
(event_manager::show_documentation): Rename from show_doc. Change all
uses.
(event_manager::register_documentation): Rename from
register_doc. Change all uses.
(event_manager::register_documentation): Rename from unregister_doc.
Change all uses.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 29 Apr 2021 11:12:40 -0400 |
parents | 7854d5752dd2 |
children | 796f54d4ddbf |
line wrap: on
line source
######################################################################## ## ## Copyright (C) 2005-2021 The Octave Project Developers ## ## See the file COPYRIGHT.md in the top-level directory of this ## distribution or <https://octave.org/copyright/>. ## ## This file is part of Octave. ## ## Octave is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <https://www.gnu.org/licenses/>. ## ######################################################################## ## -*- texinfo -*- ## @deftypefn {} {} doc @var{function_name} ## @deftypefnx {} {} doc ## Display documentation for the function @var{function_name} directly from an ## online version of the printed manual, using the GNU Info browser. ## ## If invoked without an argument, the manual is shown from the beginning. ## ## For example, the command @kbd{doc rand} starts the GNU Info browser at the ## @code{rand} node in the online version of the manual. ## ## Once the GNU Info browser is running, help for using it is available using ## the command @kbd{C-h}. ## @seealso{help} ## @end deftypefn function retval = doc (function_name) if (nargin == 1) if (! ischar (function_name)) error ("doc: FUNCTION_NAME must be a string"); endif ftype = exist (function_name); else function_name = ""; ftype = 0; endif ## Give event manager the first shot. status = ! __event_manager_show_documentation__ (function_name); if (status) if (ftype == 2 || ftype == 3) ffile = which (function_name); else ffile = ""; endif if (isempty (ffile)) info_dir = __octave_config_info__ ("infodir"); else info_dir = fileparts (ffile); endif ## Determine if a file called doc.info exist in the same ## directory as the function. info_file_name = fullfile (info_dir, "doc.info"); [~, err] = stat (info_file_name); if (err < 0) info_file_name = info_file (); if (! exist (info_file_name, "file") && ! exist ([info_file_name ".gz"], "file") && ! exist ([info_file_name ".bz2"], "file")) __gripe_missing_component__ ("doc", "info-file"); endif endif ## FIXME: Don't change the order of the arguments below because ## the info-emacs-info script currently expects --directory DIR as ## the third and fourth arguments. Someone should fix that. cmd = sprintf ('"%s" --file "%s" --directory "%s"', info_program (), info_file_name, info_dir); have_fname = ! isempty (function_name); if (have_fname) status = system (sprintf ('%s --index-search "%s"', cmd, function_name)); endif if (! (have_fname && status == 0)) status = system (cmd); if (status == 127) warning ("doc: unable to find info program '%s'", info_program ()); endif endif endif if (nargout > 0) retval = status; endif endfunction %!testif ENABLE_DOCS %! ifile = info_file (); %! if (exist (ifile) != 2 && exist (sprintf ("%s.gz", ifile)) != 2) %! error ("Info file %s or %s.gz does not exist!", ifile, ifile); %! endif