octave: libgui/src/octave-qobject.cc annotate

annotate libgui/src/octave-qobject.cc @ 31771:21f9b34eb893

maint: Eliminate "(void)" in C++ function prototypes/declarations. * mk-opts.pl, external.txi, embedded.cc, make_int.cc, standalone.cc, standalonebuiltin.cc, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.h, qdialog.cpp, qfontdialog.cpp, qprintdialog_win.cpp, liboctgui-build-info.h, liboctgui-build-info.in.cc, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, gui-preferences.cc, gui-preferences.h, gui-settings.cc, gui-settings.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, release-notes.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcuts-tree-widget.cc, shortcuts-tree-widget.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h, build-env.h, Cell.cc, Cell.h, __contourc__.cc, __magick_read__.cc, auto-shlib.cc, auto-shlib.h, base-text-renderer.h, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, debug.cc, defaults.cc, defaults.h, defun.cc, display.cc, display.h, dynamic-ld.cc, dynamic-ld.h, environment.cc, environment.h, error.cc, error.h, errwarn.cc, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, ft-text-renderer.cc, ft-text-renderer.h, genprops.awk, gh-manager.cc, gh-manager.h, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, jsondecode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, ls-hdf5.cc, ls-hdf5.h, mxarray.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc, oct-fstrm.h, oct-handle.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, pager.cc, pager.h, pr-flt-fmt.cc, pr-flt-fmt.h, pr-output.cc, pr-output.h, procstream.cc, procstream.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, stack-frame.cc, stack-frame.h, svd.cc, syminfo.cc, syminfo.h, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, toplev.cc, url-handle-manager.cc, url-handle-manager.h, variables.cc, xpow.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, gzip.cc, liboctinterp-build-info.h, liboctinterp-build-info.in.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-legacy-range.cc, ov-legacy-range.h, ov-magic-int.cc, ov-magic-int.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, ovl.h, octave.cc, octave.h, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.h, pt.cc, pt.h, token.cc, token.h, usage.h, Array-base.cc, Array.h, CColVector.cc, CColVector.h, CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.h, MSparse.h, MatrixType.cc, MatrixType.h, PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-b.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc, boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc, dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc, dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h, fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc, fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, DET.h, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, aepbalance.cc, aepbalance.h, base-dae.h, base-de.h, chol.cc, chol.h, eigs-base.cc, fEIG.h, gepbalance.h, gsvd.cc, gsvd.h, hess.h, lu.cc, lu.h, oct-fftw.cc, oct-fftw.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randmtzig.cc, randmtzig.h, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc, file-info.h, glob-match.cc, glob-match.h, kpse.cc, kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-regexp.h, oct-inttypes.cc, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, oct-sparse.cc, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, singleton-cleanup.cc, singleton-cleanup.h, str-vec.cc, str-vec.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h, version.cc, version.in.h, cxx-signal-helpers.cc, acinclude.m4, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.h, octave-build-info.in.cc, octave-config.in.cc, octave-svgconvert.cc, shared-fcns.h: maint: Eliminate "(void)" in C++ function prototypes/declarations.

author	Rik <rik@octave.org>
date	Tue, 24 Jan 2023 17:19:44 -0800
parents	eacd3dee4b01
children	90621682cc03

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
31706 597f3ee61a48 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 31648 diff changeset	3 // Copyright (C) 2011-2023 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	25
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	26 #if defined (HAVE_CONFIG_H)
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	27 # include "config.h"
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	29
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	30 #include <utility>
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	31
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include <QApplication>
27648 2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 27630 diff changeset	33 #include <QClipboard>
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include <QFile>
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	35 #include <QTextCodec>
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include <QThread>
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	37 #include <QTimer>
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include <QTranslator>
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	39
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	40 // QTerminal includes
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	41 #include "QTerminal.h"
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	42
31222 1a0756f7c90a disable experimental terminal widget when building without qscintilla Torsten Lilge <ttl-octave@mailbox.org> parents: 31087 diff changeset	43 #if defined (HAVE_QSCINTILLA)
1a0756f7c90a disable experimental terminal widget when building without qscintilla Torsten Lilge <ttl-octave@mailbox.org> parents: 31087 diff changeset	44 # include "command-widget.h"
1a0756f7c90a disable experimental terminal widget when building without qscintilla Torsten Lilge <ttl-octave@mailbox.org> parents: 31087 diff changeset	45 #endif
29835 a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	46 #include "community-news.h"
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	47 #include "documentation-dock-widget.h"
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	48 #include "files-dock-widget.h"
31621 0645ea65ca6b handle icons and themes in gui_settings class, not resource_manager John W. Eaton <jwe@octave.org> parents: 31614 diff changeset	49 #include "gui-settings.h"
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	50 #include "history-dock-widget.h"
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	51 #include "interpreter-qobject.h"
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	52 #include "main-window.h"
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	53 #include "octave-qobject.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	54 #include "qt-application.h"
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	55 #include "qt-interpreter-events.h"
29836 56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	56 #include "release-notes.h"
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	57 #include "terminal-dock-widget.h"
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	58 #include "variable-editor.h"
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	59 #include "workspace-model.h"
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	60 #include "workspace-view.h"
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	61
27616 1c13a0f36160 Temporarily disable code in cset d0fe6e344c41 (bug #55940) Rik <rik@octave.org> parents: 27604 diff changeset	62 // Bug #55940 (Disable App Nap on Mac)
27575 d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	63 #if defined (Q_OS_MAC)
d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	64 # include <objc/runtime.h>
d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	65 # include <objc/message.h>
d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	66 #endif
d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	67
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	68 #include "interpreter.h"
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	69 #include "oct-env.h"
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	70 #include "version.h"
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	71
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	72 #include "ovl.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	73
27621 39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	74 // Bug #55940 (Disable App Nap on Mac)
39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	75 #if defined (Q_OS_MAC)
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	76 static void disable_app_nap ()
27624 d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	77 {
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	78 Class process_info_class;
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	79 SEL process_info_selector;
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	80 SEL begin_activity_with_options_selector;
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	81 id process_info;
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	82 id reason_string;
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	83 id osx_latencycritical_activity;
27621 39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	84
27624 d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	85 // Option codes found at https://stackoverflow.com/questions/22784886/what-can-make-nanosleep-drift-with-exactly-10-sec-on-mac-os-x-10-9/32729281#32729281
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	86 unsigned long long NSActivityUserInitiatedAllowingIdleSystemSleep = 0x00FFFFFFULL;
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	87 unsigned long long NSActivityLatencyCritical = 0xFF00000000ULL;
27621 39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	88
27624 d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	89 // Avoid errors on older versions of OS X
30702 36be88bf3525 Use reinterpret_cast for return value of objc_getClass. Markus Mützel <markus.muetzel@gmx.de> parents: 30564 diff changeset	90 process_info_class = reinterpret_cast<Class> (objc_getClass ("NSProcessInfo"));
27624 d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	91 if (process_info_class == nil)
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	92 return;
27621 39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	93
27624 d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	94 process_info_selector = sel_getUid ("processInfo");
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	95 if (class_getClassMethod (process_info_class, process_info_selector)
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	96 == nullptr)
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	97 return;
27621 39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	98
27624 d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	99 begin_activity_with_options_selector = sel_getUid ("beginActivityWithOptions:reason:");
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	100 if (class_getInstanceMethod (process_info_class,
27935 f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	101 begin_activity_with_options_selector)
27624 d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	102 == nullptr)
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	103 return;
27621 39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	104
28063 60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	105 process_info = reinterpret_cast<id (*) (id, SEL)> (objc_msgSend)
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	106 (reinterpret_cast<id> (process_info_class),
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	107 process_info_selector);
27624 d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	108 if (process_info == nil)
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	109 return;
27621 39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	110
28063 60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	111 reason_string = reinterpret_cast<id (*) (id, SEL)> (objc_msgSend)
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	112 (reinterpret_cast<id> (objc_getClass ("NSString")),
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	113 sel_getUid ("alloc"));
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	114 reason_string = reinterpret_cast<id () (id, SEL, const char )> (objc_msgSend)
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	115 (reason_string, sel_getUid ("initWithUTF8String:"),
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	116 "App Nap causes pause() malfunction");
27621 39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	117
27624 d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	118 // Start an Activity that suppresses App Nap. This Activity will run for
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	119 // the entire duration of the Octave process. This is intentional,
d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	120 // not a leak.
28063 60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	121 osx_latencycritical_activity =
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	122 reinterpret_cast<id (*) (id, SEL, unsigned long long, id)> (objc_msgSend)
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	123 (process_info,
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	124 begin_activity_with_options_selector,
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	125 NSActivityUserInitiatedAllowingIdleSystemSleep
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	126 \| NSActivityLatencyCritical,
60e4a9909fac Fix App Nap for new prototype of "objc_msgSend" in OS X Mojave (bug #57754). Markus Mützel <markus.muetzel@gmx.de> parents: 27935 diff changeset	127 reason_string);
27624 d6b561842eeb maint: Fix indentation in static function to disable App Nap. Andrew Janke <andrew@apjanke.net> parents: 27621 diff changeset	128 }
27621 39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	129 #endif
39fac14ab25a Enable App Nap disabling on macOS (bug #55490). Andrew Janke <andrew@apjanke.net> parents: 27620 diff changeset	130
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31222 diff changeset	131 OCTAVE_BEGIN_NAMESPACE(octave)
c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31222 diff changeset	132
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	133 // Disable all Qt messages by default.
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	134
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	135 static void
30398 d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29836 diff changeset	136 message_handler (QtMsgType, const QMessageLogContext&, const QString&)
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	137 { }
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	138
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	139 //! Reimplement QApplication::notify. Octave's own exceptions are
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	140 //! caught and rethrown in the interpreter thread.
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	141
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	142 bool octave_qapplication::notify (QObject receiver, QEvent ev)
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	143 {
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	144 try
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	145 {
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	146 return QApplication::notify (receiver, ev);
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	147 }
27481 458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	148 catch (execution_exception& ee)
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	149 {
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	150 emit interpreter_event
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	151 ([=] ()
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	152 {
27393 efe72866b483 mark all interpreter_event lambda functions with special comment John W. Eaton <jwe@octave.org> parents: 27302 diff changeset	153 // INTERPRETER THREAD
27481 458adc344819 avoid possible crash due to execution_exception in GUI thread John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	154 throw ee;
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	155 });
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	156 }
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	157
27935 f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	158 return false;
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	159 }
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	160
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	161 // We will create a QApplication object, even if START_GUI is false,
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	162 // so that we can use Qt widgets for plot windows when running in
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	163 // command-line mode. Note that we are creating an
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	164 // octave_qapplication object but handling it as a QApplication object
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	165 // because the octave_qapplication should behave identically to a
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	166 // QApplication object except that it overrides the notify method so
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	167 // we can handle forward Octave interpreter exceptions from the GUI
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	168 // thread to the interpreter thread.
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	169
29153 02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	170 base_qobject::base_qobject (qt_application& app_context, bool gui_app)
29549 cf02394695b3 * octave-qobject.cc: Minor style fixes. John W. Eaton <jwe@octave.org> parents: 29548 diff changeset	171 : QObject (),
cf02394695b3 * octave-qobject.cc: Minor style fixes. John W. Eaton <jwe@octave.org> parents: 29548 diff changeset	172 m_app_context (app_context),
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	173 m_argc (m_app_context.sys_argc ()),
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	174 m_argv (m_app_context.sys_argv ()),
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	175 m_qapplication (new octave_qapplication (m_argc, m_argv)),
29549 cf02394695b3 * octave-qobject.cc: Minor style fixes. John W. Eaton <jwe@octave.org> parents: 29548 diff changeset	176 m_qt_tr (new QTranslator ()),
cf02394695b3 * octave-qobject.cc: Minor style fixes. John W. Eaton <jwe@octave.org> parents: 29548 diff changeset	177 m_gui_tr (new QTranslator ()),
cf02394695b3 * octave-qobject.cc: Minor style fixes. John W. Eaton <jwe@octave.org> parents: 29548 diff changeset	178 m_qsci_tr (new QTranslator ()),
cf02394695b3 * octave-qobject.cc: Minor style fixes. John W. Eaton <jwe@octave.org> parents: 29548 diff changeset	179 m_translators_installed (false),
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27582 diff changeset	180 m_qt_interpreter_events (new qt_interpreter_events (*this)),
f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27582 diff changeset	181 m_interpreter_qobj (new interpreter_qobject (*this)),
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	182 m_main_thread (new QThread ()),
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	183 m_gui_app (gui_app),
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	184 m_interpreter_ready (false),
29785 8ba6f4d0373c eliminate unused reference to base_qobject in workspace_model John W. Eaton <jwe@octave.org> parents: 29783 diff changeset	185 m_workspace_model (new workspace_model ()),
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	186 m_documentation_widget (),
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	187 m_file_browser_widget (),
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	188 m_history_widget (),
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	189 m_workspace_widget (),
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	190 m_editor_widget (),
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	191 m_variable_editor_widget (),
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	192 m_main_window (nullptr)
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	193 {
31696 8fed04d0607c eliminate shortcut_manager class and revamp shortcut handling John W. Eaton <jwe@octave.org> parents: 31690 diff changeset	194 std::string show_gui_msgs = sys::env::getenv ("OCTAVE_SHOW_GUI_MESSAGES");
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	195
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	196 // Installing our handler suppresses the messages.
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	197
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	198 if (show_gui_msgs.empty ())
29549 cf02394695b3 * octave-qobject.cc: Minor style fixes. John W. Eaton <jwe@octave.org> parents: 29548 diff changeset	199 qInstallMessageHandler (message_handler);
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	200
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	201 // Set the codec for all strings (before wizard or any GUI object)
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	202 #if ! defined (Q_OS_WIN32)
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	203 QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8"));
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	204 #endif
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	205
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	206 // Register octave_value_list for connecting thread crossing signals.
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	207
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	208 qRegisterMetaType<octave_value_list> ("octave_value_list");
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	209
31696 8fed04d0607c eliminate shortcut_manager class and revamp shortcut handling John W. Eaton <jwe@octave.org> parents: 31690 diff changeset	210 // Bug #55940 (Disable App Nap on Mac)
27575 d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	211 #if defined (Q_OS_MAC)
d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	212 // Mac App Nap feature causes pause() and sleep() to misbehave.
d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	213 // Disable it for the entire program run.
d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	214 disable_app_nap ();
31696 8fed04d0607c eliminate shortcut_manager class and revamp shortcut handling John W. Eaton <jwe@octave.org> parents: 31690 diff changeset	215
8fed04d0607c eliminate shortcut_manager class and revamp shortcut handling John W. Eaton <jwe@octave.org> parents: 31690 diff changeset	216 // Don't let Qt interpret CMD key ("Meta" in Qt terminology) as Ctrl.
8fed04d0607c eliminate shortcut_manager class and revamp shortcut handling John W. Eaton <jwe@octave.org> parents: 31690 diff changeset	217 QCoreApplication::setAttribute (Qt::AA_MacDontSwapCtrlAndMeta, true);
27575 d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	218 #endif
d0fe6e344c41 Disable Mac App Nap feature so that pause, sleep work correctly (bug #55940). Andrew Janke <andrew@apjanke.net> parents: 27551 diff changeset	219
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	220 // Force left-to-right alignment (see bug #46204)
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	221 m_qapplication->setLayoutDirection (Qt::LeftToRight);
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	222
29548 f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	223 // Qt docs recommend using Qt::QueuedConnection when connecting to
f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	224 // the QCoreApplication::exit slot.
f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	225 connect (m_interpreter_qobj, &interpreter_qobject::shutdown_finished,
f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	226 m_qapplication, &octave_qapplication::exit,
f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	227 Qt::QueuedConnection);
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	228
29786 63c515ff762f eliminate more signal connections to parent objects John W. Eaton <jwe@octave.org> parents: 29785 diff changeset	229 connect (m_interpreter_qobj, &interpreter_qobject::ready,
63c515ff762f eliminate more signal connections to parent objects John W. Eaton <jwe@octave.org> parents: 29785 diff changeset	230 this, &base_qobject::interpreter_ready);
63c515ff762f eliminate more signal connections to parent objects John W. Eaton <jwe@octave.org> parents: 29785 diff changeset	231
29575 c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	232 connect (m_main_thread, &QThread::finished,
c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	233 m_main_thread, &QThread::deleteLater);
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	234
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	235 // Handle any interpreter_event signal from the octave_qapplication
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	236 // object here.
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	237
29575 c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	238 connect (m_qapplication, QOverload<const fcn_callback&>::of (&octave_qapplication::interpreter_event),
c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	239 this, QOverload<const fcn_callback&>::of (&base_qobject::interpreter_event));
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	240
29575 c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	241 connect (m_qapplication, QOverload<const meth_callback&>::of (&octave_qapplication::interpreter_event),
c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	242 this, QOverload<const meth_callback&>::of (&base_qobject::interpreter_event));
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27582 diff changeset	243
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	244 if (m_app_context.experimental_terminal_widget ())
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	245 {
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	246 connect (qt_link (), &qt_interpreter_events::start_gui_signal,
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	247 this, &base_qobject::start_gui);
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	248
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	249 connect (qt_link (), &qt_interpreter_events::show_terminal_window_signal,
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	250 this, &base_qobject::show_terminal_window);
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	251 }
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	252
29575 c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	253 connect (qt_link (), &qt_interpreter_events::copy_image_to_clipboard_signal,
c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	254 this, &base_qobject::copy_image_to_clipboard);
29153 02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	255
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	256 connect (qt_link (), &qt_interpreter_events::show_documentation_signal,
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	257 this, &base_qobject::show_documentation_window);
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	258
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	259 connect (qt_link (), &qt_interpreter_events::show_file_browser_signal,
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	260 this, &base_qobject::show_file_browser_window);
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	261
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	262 connect (qt_link (), &qt_interpreter_events::show_command_history_signal,
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	263 this, &base_qobject::show_command_history_window);
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	264
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	265 connect (qt_link (), &qt_interpreter_events::show_workspace_signal,
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	266 this, &base_qobject::show_workspace_window);
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	267
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	268 connect (qt_link (), &qt_interpreter_events::edit_variable_signal,
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	269 this, &base_qobject::show_variable_editor_window);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	270
29835 a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	271 connect (qt_link (), &qt_interpreter_events::show_community_news_signal,
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	272 this, &base_qobject::show_community_news);
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	273
29836 56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	274 connect (qt_link (), &qt_interpreter_events::show_release_notes_signal,
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	275 this, &base_qobject::show_release_notes);
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	276
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	277 if (m_app_context.experimental_terminal_widget ())
29153 02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	278 {
02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	279 m_qapplication->setQuitOnLastWindowClosed (false);
02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	280 }
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	281 else
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	282 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	283 if (gui_app)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	284 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	285 m_main_window = new main_window (*this);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	286
29835 a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	287 connect (m_main_window, &main_window::show_community_news_signal,
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	288 this, &base_qobject::show_community_news);
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	289
29836 56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	290 connect (m_main_window, &main_window::show_release_notes_signal,
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	291 this, &base_qobject::show_release_notes);
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	292
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	293 if (m_interpreter_ready)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	294 m_main_window->handle_octave_ready ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	295 else
29575 c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	296 connect (m_interpreter_qobj, &interpreter_qobject::ready,
c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	297 m_main_window, &main_window::handle_octave_ready);
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	298
29575 c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	299 connect (qt_link (), &qt_interpreter_events::focus_window_signal,
c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	300 m_main_window, &main_window::focus_window);
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	301
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	302 m_app_context.gui_running (true);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	303 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	304 else
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	305 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	306 // Get settings file.
31638 474e184321d3 move some functions from resource_manager to gui_settings John W. Eaton <jwe@octave.org> parents: 31625 diff changeset	307 gui_settings settings;
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	308
31638 474e184321d3 move some functions from resource_manager to gui_settings John W. Eaton <jwe@octave.org> parents: 31625 diff changeset	309 settings.reload ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	310
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	311 // After settings.
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	312 config_translators ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	313
31621 0645ea65ca6b handle icons and themes in gui_settings class, not resource_manager John W. Eaton <jwe@octave.org> parents: 31614 diff changeset	314 settings.config_icon_theme ();
29780 d79f65e37e89 provide shortcuts in widgets launched from the cli Torsten Lilge <ttl-octave@mailbox.org> parents: 29775 diff changeset	315
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	316 m_qapplication->setQuitOnLastWindowClosed (false);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	317 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	318 }
29153 02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	319
02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	320 start_main_thread ();
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	321 }
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	322
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	323 base_qobject::~base_qobject ()
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	324 {
27219 b88d66c631c8 delete translator objects in base_qobject destructor John W. Eaton <jwe@octave.org> parents: 27218 diff changeset	325 // Note that we don't delete m_main_thread here. That is handled by
b88d66c631c8 delete translator objects in base_qobject destructor John W. Eaton <jwe@octave.org> parents: 27218 diff changeset	326 // deleteLater slot that is called when the m_main_thread issues a
b88d66c631c8 delete translator objects in base_qobject destructor John W. Eaton <jwe@octave.org> parents: 27218 diff changeset	327 // finished signal.
b88d66c631c8 delete translator objects in base_qobject destructor John W. Eaton <jwe@octave.org> parents: 27218 diff changeset	328
29757 f8322ca49578 delete main window before dock widgets (bug #60646) John W. Eaton <jwe@octave.org> parents: 29756 diff changeset	329 // FIXME: Why are dock widget settings and/or the main window
f8322ca49578 delete main window before dock widgets (bug #60646) John W. Eaton <jwe@octave.org> parents: 29756 diff changeset	330 // configuration not saved correctly if the main window is deleted
f8322ca49578 delete main window before dock widgets (bug #60646) John W. Eaton <jwe@octave.org> parents: 29756 diff changeset	331 // after the dock widgets?
f8322ca49578 delete main window before dock widgets (bug #60646) John W. Eaton <jwe@octave.org> parents: 29756 diff changeset	332
29756 7db4a4e94556 use deleteLater to delete dock widgets (bug #60646) John W. Eaton <jwe@octave.org> parents: 29755 diff changeset	333 // Calling close will cause settings to be saved.
29758 1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	334 // If m_main_window exists, the widgets are closed by the main window
29755 23cf249a0ad8 explicitly close all dock widgets in base_qobject destructor (bug #60646) John W. Eaton <jwe@octave.org> parents: 29754 diff changeset	335
29758 1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	336 if (! m_main_window)
29756 7db4a4e94556 use deleteLater to delete dock widgets (bug #60646) John W. Eaton <jwe@octave.org> parents: 29755 diff changeset	337 {
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	338 if (m_terminal_widget)
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	339 m_terminal_widget->close ();
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	340
29758 1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	341 if (m_documentation_widget)
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	342 m_documentation_widget->close ();
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	343
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	344 if (m_file_browser_widget)
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	345 m_file_browser_widget->close ();
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	346
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	347 if (m_history_widget)
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	348 m_history_widget->close ();
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	349
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	350 if (m_workspace_widget)
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	351 m_workspace_widget->close ();
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	352
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	353 if (m_editor_widget)
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	354 m_editor_widget->close ();
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	355
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	356 if (m_variable_editor_widget)
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	357 m_variable_editor_widget->close ();
29835 a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	358
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	359 if (m_community_news)
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	360 m_community_news->close ();
29756 7db4a4e94556 use deleteLater to delete dock widgets (bug #60646) John W. Eaton <jwe@octave.org> parents: 29755 diff changeset	361 }
29758 1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	362 else
29756 7db4a4e94556 use deleteLater to delete dock widgets (bug #60646) John W. Eaton <jwe@octave.org> parents: 29755 diff changeset	363 {
29758 1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	364 delete m_main_window;
29756 7db4a4e94556 use deleteLater to delete dock widgets (bug #60646) John W. Eaton <jwe@octave.org> parents: 29755 diff changeset	365 }
29755 23cf249a0ad8 explicitly close all dock widgets in base_qobject destructor (bug #60646) John W. Eaton <jwe@octave.org> parents: 29754 diff changeset	366
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	367 delete m_terminal_widget;
29758 1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	368 delete m_documentation_widget;
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	369 delete m_file_browser_widget;
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	370 delete m_history_widget;
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	371 delete m_workspace_widget;
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	372 delete m_editor_widget;
1511b7cd3474 only close dock widgets when main window does not exist (bug #60646) Torsten Lilge <ttl-octave@mailbox.org> parents: 29757 diff changeset	373 delete m_variable_editor_widget;
29835 a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	374 delete m_community_news;
29755 23cf249a0ad8 explicitly close all dock widgets in base_qobject destructor (bug #60646) John W. Eaton <jwe@octave.org> parents: 29754 diff changeset	375
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	376 delete m_interpreter_qobj;
27219 b88d66c631c8 delete translator objects in base_qobject destructor John W. Eaton <jwe@octave.org> parents: 27218 diff changeset	377 delete m_qsci_tr;
b88d66c631c8 delete translator objects in base_qobject destructor John W. Eaton <jwe@octave.org> parents: 27218 diff changeset	378 delete m_gui_tr;
b88d66c631c8 delete translator objects in base_qobject destructor John W. Eaton <jwe@octave.org> parents: 27218 diff changeset	379 delete m_qt_tr;
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	380 delete m_qapplication;
28799 6aba3944b608 fix deleting pointer when octave exists Torsten Lilge <ttl-octave@mailbox.org> parents: 28795 diff changeset	381 delete m_workspace_model;
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	382
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	383 string_vector::delete_c_str_vec (m_argv);
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	384 }
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	385
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	386 void base_qobject::config_translators ()
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	387 {
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	388 if (m_translators_installed)
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	389 return;
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	390
31690 1a1f47f17ed4 eliminate resource_manager class John W. Eaton <jwe@octave.org> parents: 31649 diff changeset	391 gui_settings settings;
1a1f47f17ed4 eliminate resource_manager class John W. Eaton <jwe@octave.org> parents: 31649 diff changeset	392
1a1f47f17ed4 eliminate resource_manager class John W. Eaton <jwe@octave.org> parents: 31649 diff changeset	393 settings.config_translators (m_qt_tr, m_qsci_tr, m_gui_tr);
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	394
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	395 m_qapplication->installTranslator (m_qt_tr);
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	396 m_qapplication->installTranslator (m_gui_tr);
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	397 m_qapplication->installTranslator (m_qsci_tr);
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	398
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	399 m_translators_installed = true;
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	400 }
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	401
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	402 void base_qobject::start_main_thread ()
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	403 {
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	404 // Note: if using the new experimental terminal widget, we defer
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	405 // initializing and executing the interpreter until the main event
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	406 // loop begins executing.
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	407
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	408 // With the old terminal widget, we defer initializing and executing
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	409 // the interpreter until after the main window and QApplication are
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	410 // running to prevent race conditions.
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	411
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	412 QTimer::singleShot (0, m_interpreter_qobj, SLOT (execute ()));
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	413
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	414 m_interpreter_qobj->moveToThread (m_main_thread);
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	415
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	416 m_main_thread->start ();
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	417 }
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	418
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	419 int base_qobject::exec ()
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	420 {
29548 f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	421 int status = m_qapplication->exec ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	422
29548 f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	423 #if defined (Q_OS_MAC)
f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	424 // fprintf to stderr is needed by macOS, for poorly-understood reasons.
f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	425 fprintf (stderr, "\n");
f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	426 #endif
f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	427
f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	428 m_main_thread->quit ();
f6ad83cbe3c4 simplify interpreter shutdown in the GUI John W. Eaton <jwe@octave.org> parents: 29544 diff changeset	429 m_main_thread->wait ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	430
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	431 return status;
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	432 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	433
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	434 // Provided for convenience. Will be removed once we eliminate the
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	435 // old terminal widget.
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	436 bool base_qobject::experimental_terminal_widget () const
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	437 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	438 return m_app_context.experimental_terminal_widget ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	439 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	440
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	441 bool base_qobject::gui_running () const
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	442 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	443 return m_app_context.gui_running ();
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	444 }
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	445
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	446 QPointer<terminal_dock_widget>
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	447 base_qobject::terminal_widget (main_window *mw)
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	448 {
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	449 if (m_terminal_widget && mw)
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	450 {
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	451 m_terminal_widget->set_main_window (mw);
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	452 m_terminal_widget->set_adopted (true);
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	453 }
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	454 else if (! m_terminal_widget)
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	455 {
31725 32bc0f1c0a88 fix error introduced in changeset 286306a9a393 John W. Eaton <jwe@octave.org> parents: 31707 diff changeset	456 bool etw = m_app_context.experimental_terminal_widget ();
32bc0f1c0a88 fix error introduced in changeset 286306a9a393 John W. Eaton <jwe@octave.org> parents: 31707 diff changeset	457
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	458 m_terminal_widget
31725 32bc0f1c0a88 fix error introduced in changeset 286306a9a393 John W. Eaton <jwe@octave.org> parents: 31707 diff changeset	459 = QPointer<terminal_dock_widget> (new terminal_dock_widget (mw, etw));
32bc0f1c0a88 fix error introduced in changeset 286306a9a393 John W. Eaton <jwe@octave.org> parents: 31707 diff changeset	460
32bc0f1c0a88 fix error introduced in changeset 286306a9a393 John W. Eaton <jwe@octave.org> parents: 31707 diff changeset	461 if (etw)
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	462 {
31222 1a0756f7c90a disable experimental terminal widget when building without qscintilla Torsten Lilge <ttl-octave@mailbox.org> parents: 31087 diff changeset	463 #if defined (HAVE_QSCINTILLA)
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	464 command_widget *cmd_widget
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	465 = m_terminal_widget->get_command_widget ();
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	466
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	467 connect (cmd_widget, &command_widget::interpreter_pause,
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	468 this, &base_qobject::interpreter_pause);
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	469
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	470 connect (cmd_widget, &command_widget::interpreter_resume,
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	471 this, &base_qobject::interpreter_resume);
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	472
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	473 connect (cmd_widget, &command_widget::interpreter_stop,
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	474 this, &base_qobject::interpreter_stop);
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	475
29796 a0fce019cd1f additional reorganization of signal/slot connections in main_window class John W. Eaton <jwe@octave.org> parents: 29787 diff changeset	476 connect (qt_link (), &qt_interpreter_events::interpreter_output_signal,
31087 9c0099048264 exp cmd widget: fix missing promt after error Torsten Lilge <ttl-octave@mailbox.org> parents: 30964 diff changeset	477 m_terminal_widget, &terminal_dock_widget::interpreter_output_signal);
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	478
29796 a0fce019cd1f additional reorganization of signal/slot connections in main_window class John W. Eaton <jwe@octave.org> parents: 29787 diff changeset	479 connect (qt_link (), &qt_interpreter_events::update_prompt_signal,
31087 9c0099048264 exp cmd widget: fix missing promt after error Torsten Lilge <ttl-octave@mailbox.org> parents: 30964 diff changeset	480 m_terminal_widget, &terminal_dock_widget::update_prompt_signal);
29796 a0fce019cd1f additional reorganization of signal/slot connections in main_window class John W. Eaton <jwe@octave.org> parents: 29787 diff changeset	481
31087 9c0099048264 exp cmd widget: fix missing promt after error Torsten Lilge <ttl-octave@mailbox.org> parents: 30964 diff changeset	482 connect (qt_link (), &qt_interpreter_events::new_command_line_signal,
9c0099048264 exp cmd widget: fix missing promt after error Torsten Lilge <ttl-octave@mailbox.org> parents: 30964 diff changeset	483 m_terminal_widget, &terminal_dock_widget::new_command_line_signal);
29796 a0fce019cd1f additional reorganization of signal/slot connections in main_window class John W. Eaton <jwe@octave.org> parents: 29787 diff changeset	484
31726 eacd3dee4b01 eliminate some uses of the event manager in GUI callback functions John W. Eaton <jwe@octave.org> parents: 31725 diff changeset	485 connect (mw, &main_window::update_prompt_signal,
eacd3dee4b01 eliminate some uses of the event manager in GUI callback functions John W. Eaton <jwe@octave.org> parents: 31725 diff changeset	486 m_terminal_widget, &terminal_dock_widget::update_prompt_signal);
eacd3dee4b01 eliminate some uses of the event manager in GUI callback functions John W. Eaton <jwe@octave.org> parents: 31725 diff changeset	487
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	488 connect_interpreter_events (cmd_widget);
31222 1a0756f7c90a disable experimental terminal widget when building without qscintilla Torsten Lilge <ttl-octave@mailbox.org> parents: 31087 diff changeset	489 #endif
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	490 }
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	491 else
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	492 {
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	493 QTerminal *cmd_widget = m_terminal_widget->get_qterminal ();
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	494
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	495 // Connect the interrupt signal (emitted by Ctrl-C)
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	496 connect (cmd_widget, &QTerminal::interrupt_signal,
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	497 this, &base_qobject::interpreter_interrupt);
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	498
31697 dd904ce6f53f use interpreter event to display documentation in terminal and editor widgets John W. Eaton <jwe@octave.org> parents: 31696 diff changeset	499 connect_interpreter_events (cmd_widget);
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	500 }
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	501 }
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	502
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	503 return m_terminal_widget;
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	504 }
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	505
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	506 QPointer<documentation_dock_widget>
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	507 base_qobject::documentation_widget (main_window *mw)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	508 {
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	509 if (m_documentation_widget && mw)
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	510 {
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	511 m_documentation_widget->set_main_window (mw);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	512 m_documentation_widget->set_adopted (true);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	513 }
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	514 else if (! m_documentation_widget)
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	515 {
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	516 m_documentation_widget
31701 286306a9a393 eliminate base_qobject from octave_dock_widget and other classes John W. Eaton <jwe@octave.org> parents: 31697 diff changeset	517 = QPointer<documentation_dock_widget> (new documentation_dock_widget (mw));
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	518
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	519 connect (qt_link (),
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	520 &qt_interpreter_events::register_documentation_signal,
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	521 m_documentation_widget,
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	522 &documentation_dock_widget::registerDoc);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	523
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	524 connect (qt_link (),
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	525 &qt_interpreter_events::unregister_documentation_signal,
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	526 m_documentation_widget,
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	527 &documentation_dock_widget::unregisterDoc);
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	528 }
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	529
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	530 return m_documentation_widget;
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	531 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	532
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	533 QPointer<files_dock_widget>
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	534 base_qobject::file_browser_widget (main_window *mw)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	535 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	536 if (m_file_browser_widget)
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	537 {
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	538 m_file_browser_widget->set_main_window (mw);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	539 m_file_browser_widget->set_adopted (true);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	540 }
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	541 else if (! m_file_browser_widget)
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	542 m_file_browser_widget
31701 286306a9a393 eliminate base_qobject from octave_dock_widget and other classes John W. Eaton <jwe@octave.org> parents: 31697 diff changeset	543 = QPointer<files_dock_widget> (new files_dock_widget (mw));
29796 a0fce019cd1f additional reorganization of signal/slot connections in main_window class John W. Eaton <jwe@octave.org> parents: 29787 diff changeset	544
a0fce019cd1f additional reorganization of signal/slot connections in main_window class John W. Eaton <jwe@octave.org> parents: 29787 diff changeset	545 connect (qt_link (), &qt_interpreter_events::directory_changed_signal,
a0fce019cd1f additional reorganization of signal/slot connections in main_window class John W. Eaton <jwe@octave.org> parents: 29787 diff changeset	546 m_file_browser_widget, &files_dock_widget::update_octave_directory);
a0fce019cd1f additional reorganization of signal/slot connections in main_window class John W. Eaton <jwe@octave.org> parents: 29787 diff changeset	547
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	548 return m_file_browser_widget;
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	549 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	550
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	551 QPointer<history_dock_widget>
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	552 base_qobject::history_widget (main_window *mw)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	553 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	554 if (m_history_widget)
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	555 {
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	556 m_history_widget->set_main_window (mw);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	557 m_history_widget->set_adopted (true);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	558 }
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	559 else if (! m_history_widget)
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	560 {
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	561 m_history_widget
31701 286306a9a393 eliminate base_qobject from octave_dock_widget and other classes John W. Eaton <jwe@octave.org> parents: 31697 diff changeset	562 = QPointer<history_dock_widget> (new history_dock_widget (mw));
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	563
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	564 connect (qt_link (), &qt_interpreter_events::set_history_signal,
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	565 m_history_widget, &history_dock_widget::set_history);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	566
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	567 connect (qt_link (), &qt_interpreter_events::append_history_signal,
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	568 m_history_widget, &history_dock_widget::append_history);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	569
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	570 connect (qt_link (), &qt_interpreter_events::clear_history_signal,
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	571 m_history_widget, &history_dock_widget::clear_history);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	572
29775 a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	573 emit interpreter_event
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	574 ([=] (interpreter& interp) {
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	575 // INTERPRETER THREAD
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	576
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	577 event_manager& xevmgr = interp.get_event_manager ();
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	578
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	579 xevmgr.set_history ();
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	580 });
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	581 }
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	582
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	583 return m_history_widget;
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	584 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	585
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	586 QPointer<workspace_view>
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	587 base_qobject::workspace_widget (main_window *mw)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	588 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	589 if (m_workspace_widget)
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	590 {
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	591 m_workspace_widget->set_main_window (mw);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	592 m_workspace_widget->set_adopted (true);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	593 }
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	594 else if (! m_workspace_widget)
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	595 {
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	596 m_workspace_widget
31701 286306a9a393 eliminate base_qobject from octave_dock_widget and other classes John W. Eaton <jwe@octave.org> parents: 31697 diff changeset	597 = QPointer<workspace_view> (new workspace_view (mw));
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	598
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	599 m_workspace_widget->setModel (m_workspace_model);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	600
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	601 connect (m_workspace_model, &workspace_model::model_changed,
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	602 m_workspace_widget, &workspace_view::handle_model_changed);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	603
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	604 connect (qt_link (), &qt_interpreter_events::set_workspace_signal,
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	605 m_workspace_model, &workspace_model::set_workspace);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	606
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	607 connect (qt_link (), &qt_interpreter_events::clear_workspace_signal,
3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	608 m_workspace_model, &workspace_model::clear_workspace);
29768 38bbe1a2828f allow variable editor to open from workspace view without main window John W. Eaton <jwe@octave.org> parents: 29762 diff changeset	609
29774 aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	610 connect (m_workspace_widget,
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	611 &workspace_view::copy_variable_value_to_clipboard,
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	612 [=] (const QString& var_name) {
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	613 emit interpreter_event
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	614 ([=] (interpreter& interp)
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	615 {
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	616 // INTERPRETER THREAD
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	617
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	618 octave_value val = interp.varval (var_name.toStdString ());
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	619
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	620 if (val.is_undefined ())
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	621 val = 0;
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	622
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	623 std::ostringstream buf;
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	624 val.print_raw (buf, true);
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	625
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	626 // FIXME: is the following operation thread safe or should
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	627 // it be done with a signal/slot connection?
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	628
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	629 QClipboard *clipboard = QApplication::clipboard ();
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	630 clipboard->setText (QString::fromStdString (buf.str ()));
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	631 });
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	632 });
29773 5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	633
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	634 connect (m_workspace_widget, &workspace_view::rename_variable_signal,
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	635 [=] (const QString& old_name, const QString& new_name) {
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	636 emit interpreter_event
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	637 ([=] (interpreter& interp) {
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	638 // INTERPRETER THREAD
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	639
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	640 symbol_scope scope = interp.get_current_scope ();
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	641
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	642 if (scope)
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	643 {
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	644 scope.rename (old_name.toStdString (),
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	645 new_name.toStdString ());
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	646
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	647 tree_evaluator& tw = interp.get_evaluator ();
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	648
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	649 event_manager& xevmgr = interp.get_event_manager ();
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	650
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	651 xevmgr.set_workspace (true, tw.get_symbol_info ());
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	652 }
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	653
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	654 // FIXME: if this action fails, do we need a way to
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	655 // display that info in the GUI?
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	656 });
5f404ae822ee allow variable renaming in workspace_view to work without main_window John W. Eaton <jwe@octave.org> parents: 29768 diff changeset	657 });
29774 aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	658
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	659 connect (m_workspace_widget, &workspace_view::edit_variable_signal,
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	660 [=] (const QString& var_name) {
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	661 emit interpreter_event
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	662 ([=] (interpreter& interp) {
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	663 // INTERPRETER THREAD
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	664
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	665 std::string name = var_name.toStdString ();
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	666 octave_value val = interp.varval (name);
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	667
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	668 event_manager& xevmgr = interp.get_event_manager ();
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	669
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	670 xevmgr.edit_variable (name, val);
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	671 });
aa46787ed8b7 eliminate direct dependence on octave intepreter from workspace_view John W. Eaton <jwe@octave.org> parents: 29773 diff changeset	672 });
29775 a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	673
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	674 emit interpreter_event
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	675 ([=] (interpreter& interp) {
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	676 // INTERPRETER THREAD
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	677
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	678 event_manager& xevmgr = interp.get_event_manager ();
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	679
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	680 xevmgr.set_workspace ();
a64352cadda8 use interpreter events to set initial data for workspace and history widgets John W. Eaton <jwe@octave.org> parents: 29774 diff changeset	681 });
29702 3a684b0e7406 only connect dock widget signals in base_qobject when creating dock widgets John W. Eaton <jwe@octave.org> parents: 29700 diff changeset	682 }
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	683
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	684 return m_workspace_widget;
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	685 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	686
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	687 QPointer<file_editor_interface>
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	688 base_qobject::editor_widget (main_window /mw*/)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	689 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	690 #if 0
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	691 if (m_editor_widget && mw)
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	692 {
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	693 m_editor_widget->set_main_window (mw);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	694 m_editor_widget->set_adopted (true);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	695 }
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	696 else if (! m_editor_widget)
31701 286306a9a393 eliminate base_qobject from octave_dock_widget and other classes John W. Eaton <jwe@octave.org> parents: 31697 diff changeset	697 m_editor_widget = new file_editor (mw);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	698 #endif
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	699
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	700 return m_editor_widget;
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	701 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	702
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	703 QPointer<variable_editor>
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	704 base_qobject::variable_editor_widget (main_window *mw)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	705 {
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	706 if (m_variable_editor_widget && mw)
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	707 {
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	708 m_variable_editor_widget->set_main_window (mw);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	709 m_variable_editor_widget->set_adopted (true);
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	710 }
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	711 else if (! m_variable_editor_widget)
29762 84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	712 {
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	713 m_variable_editor_widget
31701 286306a9a393 eliminate base_qobject from octave_dock_widget and other classes John W. Eaton <jwe@octave.org> parents: 31697 diff changeset	714 = QPointer<variable_editor> (new variable_editor (mw));
29762 84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	715
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	716 connect (m_variable_editor_widget, &variable_editor::updated,
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	717 this, &base_qobject::handle_variable_editor_update);
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	718
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	719 connect (m_variable_editor_widget, &variable_editor::command_signal,
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	720 this, &base_qobject::execute_command);
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	721
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	722 connect (qt_link (),
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	723 &qt_interpreter_events::refresh_variable_editor_signal,
29822 0923ae48a4f7 avoid possible crash on return to command line after closing main window John W. Eaton <jwe@octave.org> parents: 29796 diff changeset	724 m_variable_editor_widget, &variable_editor::refresh);
29783 5154c91e0d98 eliminate some connections to parent objects in octave_dock_widget classes John W. Eaton <jwe@octave.org> parents: 29780 diff changeset	725
5154c91e0d98 eliminate some connections to parent objects in octave_dock_widget classes John W. Eaton <jwe@octave.org> parents: 29780 diff changeset	726 connect_interpreter_events<variable_editor> (m_variable_editor_widget);
29762 84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	727 }
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	728
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	729 return m_variable_editor_widget;
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	730 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	731
29835 a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	732 QPointer<community_news> base_qobject::community_news_widget (int serial)
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	733 {
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	734 if (! m_community_news)
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	735 m_community_news
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31638 diff changeset	736 = QPointer<community_news> (new community_news (serial));
29835 a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	737
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	738 return m_community_news;
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	739 }
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	740
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	741 QPointer<release_notes> base_qobject::release_notes_widget ()
29836 56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	742 {
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	743 if (! m_release_notes)
31625 b26b768f23a4 eliminate base_qobject argument from release_notes constructor John W. Eaton <jwe@octave.org> parents: 31621 diff changeset	744 m_release_notes = QPointer<release_notes> (new release_notes ());
29836 56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	745
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	746 return m_release_notes;
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	747 }
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	748
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	749 bool base_qobject::confirm_shutdown ()
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27582 diff changeset	750 {
29153 02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	751 // Currently, we forward to main_window::confirm_shutdown instead of
02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	752 // just displaying a dialog box here because the main_window also
02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	753 // knows about and is responsible for notifying the editor.
02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	754
02ee34a30351 eliminate separate cli_qobject and gui_qobject classes John W. Eaton <jwe@octave.org> parents: 28851 diff changeset	755 return m_main_window ? m_main_window->confirm_shutdown () : true;
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27582 diff changeset	756 }
f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27582 diff changeset	757
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	758 void base_qobject::start_gui (bool gui_app)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	759 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	760 if (m_app_context.experimental_terminal_widget ())
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	761 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	762 if (m_main_window)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	763 return;
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	764
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	765 m_gui_app = gui_app;
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	766
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	767 m_main_window = new main_window (*this);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	768
29575 c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	769 connect (qt_link (), &qt_interpreter_events::focus_window_signal,
c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	770 m_main_window, &main_window::focus_window);
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	771
29575 c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	772 connect (qt_link (), &qt_interpreter_events::close_gui_signal,
c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	773 this, &base_qobject::close_gui);
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	774
29575 c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	775 connect (m_main_window, &main_window::close_gui_signal,
c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	776 this, &base_qobject::close_gui);
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	777
29835 a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	778 connect (m_main_window, &main_window::show_community_news_signal,
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	779 this, &base_qobject::show_community_news);
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	780
29836 56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	781 connect (m_main_window, &main_window::show_release_notes_signal,
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	782 this, &base_qobject::show_release_notes);
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	783
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	784 if (m_interpreter_ready)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	785 m_main_window->handle_octave_ready ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	786 else
29575 c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	787 connect (m_interpreter_qobj, &interpreter_qobject::ready,
c7206af46897 Avoid use of SIGNAL/SLOT where possible (bug #60420) Rik <rik@octave.org> parents: 29549 diff changeset	788 m_main_window, &main_window::handle_octave_ready);
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	789
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	790 if (m_gui_app)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	791 m_qapplication->setQuitOnLastWindowClosed (true);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	792 else
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	793 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	794 // FIXME: Save current values of PS1 and PS2 so they can be
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	795 // restored when we return to the command line?
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	796 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	797
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	798 m_app_context.gui_running (true);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	799 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	800 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	801
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	802 void base_qobject::show_terminal_window ()
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	803 {
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	804 terminal_dock_widget *widget
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	805 = (m_terminal_widget
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	806 ? m_terminal_widget : terminal_widget ());
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	807
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	808 if (! widget->isVisible ())
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	809 {
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	810 widget->show ();
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	811 widget->raise ();
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	812 }
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	813 }
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29786 diff changeset	814
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	815 void base_qobject::show_documentation_window (const QString& file)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	816 {
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	817 documentation_dock_widget *widget
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	818 = (m_documentation_widget
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	819 ? m_documentation_widget : documentation_widget ());
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	820
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	821 widget->showDoc (file);
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	822
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	823 if (! widget->isVisible ())
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	824 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	825 widget->show ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	826 widget->raise ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	827 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	828 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	829
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	830 void base_qobject::show_file_browser_window ()
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	831 {
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	832 files_dock_widget *widget
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	833 = m_file_browser_widget ? m_file_browser_widget : file_browser_widget ();
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	834
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	835 if (! widget->isVisible ())
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	836 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	837 widget->show ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	838 widget->raise ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	839 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	840 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	841
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	842 void base_qobject::show_command_history_window ()
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	843 {
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	844 history_dock_widget *widget
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	845 = m_history_widget ? m_history_widget : history_widget ();
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	846
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	847 if (! widget->isVisible ())
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	848 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	849 widget->show ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	850 widget->raise ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	851 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	852 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	853
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	854 void base_qobject::show_workspace_window ()
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	855 {
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	856 workspace_view *widget
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	857 = m_workspace_widget ? m_workspace_widget : workspace_widget ();
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	858
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	859 if (! widget->isVisible ())
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	860 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	861 widget->show ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	862 widget->raise ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	863 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	864 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	865
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	866 void base_qobject::show_variable_editor_window (const QString& name,
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	867 const octave_value& value)
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	868 {
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	869 variable_editor *widget
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	870 = (m_variable_editor_widget
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	871 ? m_variable_editor_widget : variable_editor_widget ());
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	872
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	873 if (! widget->isVisible ())
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	874 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	875 widget->show ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	876 widget->raise ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	877 }
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	878
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	879 // FIXME: Should this be done with a signal/slot connection?
4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29702 diff changeset	880 widget->edit_variable (name, value);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	881 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	882
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	883 void base_qobject::handle_variable_editor_update ()
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	884 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	885 // Called when the variable editor emits the updated signal. The size
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	886 // of a variable may have changed, so we refresh the workspace in the
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	887 // interpreter. That will eventually cause the workspace view in the
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	888 // GUI to be updated.
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	889
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	890 interpreter_event
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	891 ([] (interpreter& interp)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	892 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	893 // INTERPRETER THREAD
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	894
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	895 tree_evaluator& tw = interp.get_evaluator ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	896
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	897 event_manager& xevmgr = interp.get_event_manager ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	898
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	899 xevmgr.set_workspace (true, tw.get_symbol_info (), false);
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	900 });
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	901 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29575 diff changeset	902
29835 a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	903 void base_qobject::show_community_news (int serial)
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	904 {
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	905 // Ensure widget exists.
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	906 community_news_widget (serial);
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	907
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	908 m_community_news->display ();
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	909 }
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29822 diff changeset	910
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	911 void base_qobject::show_release_notes ()
29836 56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	912 {
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	913 // Ensure widget exists.
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	914 release_notes_widget ();
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	915
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	916 m_release_notes->display ();
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	917 }
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	918
29762 84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	919 void base_qobject::execute_command (const QString& command)
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	920 {
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	921 emit interpreter_event
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	922 ([=] (interpreter& interp)
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	923 {
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	924 // INTERPRETER THREAD
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	925
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	926 // FIXME: Do we need to do anything special about errors here?
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	927 // Currently the eval function will just call error() in the
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	928 // interpreter event loop and throw an execution error. It will
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	929 // be caught, so shouldn't crash the interpreter, but the
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	930 // message may not go anywhere useful depending on how the GUI
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	931 // is being used or if Octave running server mode.
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	932
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	933 interp.eval (command.toStdString (), 0);
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	934 });
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	935 }
84d7e1ace446 improve variable editor functionality when used without GUI main window John W. Eaton <jwe@octave.org> parents: 29758 diff changeset	936
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	937 void base_qobject::close_gui ()
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	938 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	939 if (m_app_context.experimental_terminal_widget ())
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	940 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	941 if (! m_main_window)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	942 return;
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	943
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	944 // FIXME: Restore previous values of PS1 and PS2 if we are
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	945 // returning to the command line?
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	946
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	947 interpreter_event
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	948 ([=] (interpreter& interp)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	949 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	950 // INTERPRETER THREAD
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	951
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	952 application *app = interp.get_app_context ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	953
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	954 cmdline_options opts = app->options ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	955
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	956 if (opts.gui ())
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	957 interp.quit (0, false, false);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	958 });
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	959
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	960 m_app_context.gui_running (false);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	961
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	962 if (m_main_window)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	963 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	964 m_main_window->deleteLater ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	965
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	966 m_main_window = nullptr;
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	967 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	968 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	969 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	970
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	971 void base_qobject::interpreter_ready ()
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	972 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	973 m_interpreter_ready = true;
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28063 diff changeset	974 }
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28063 diff changeset	975
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	976 void base_qobject::interpreter_event (const fcn_callback& fcn)
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	977 {
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	978 // The following is a direct function call across threads. It works
29783 5154c91e0d98 eliminate some connections to parent objects in octave_dock_widget classes John W. Eaton <jwe@octave.org> parents: 29780 diff changeset	979 // because it is accessing a thread-safe queue of events that
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	980 // are later executed by the Octave interpreter in the other thread.
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	981
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	982 // See also the comments in interpreter-qobject.h about
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	983 // interpreter_qobject slots.
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	984
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	985 m_interpreter_qobj->interpreter_event (fcn);
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	986 }
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	987
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	988 void base_qobject::interpreter_event (const meth_callback& meth)
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	989 {
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	990 // The following is a direct function call across threads. It works
29783 5154c91e0d98 eliminate some connections to parent objects in octave_dock_widget classes John W. Eaton <jwe@octave.org> parents: 29780 diff changeset	991 // because it is accessing a thread-safe queue of events that
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	992 // are later executed by the Octave interpreter in the other thread.
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	993
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	994 // See also the comments in interpreter-qobject.h about
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	995 // interpreter_qobject slots.
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	996
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	997 m_interpreter_qobj->interpreter_event (meth);
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	998 }
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	999
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	1000 void base_qobject::interpreter_interrupt ()
29292 eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	1001 {
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1002 m_interpreter_qobj->interrupt ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1003 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1004
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1005 // FIXME: Should we try to make the pause, stop, and resume actions
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1006 // work for both the old and new terminal widget?
29292 eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	1007
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	1008 void base_qobject::interpreter_pause ()
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1009 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1010 if (m_app_context.experimental_terminal_widget ())
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1011 m_interpreter_qobj->pause ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1012 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1013
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	1014 void base_qobject::interpreter_stop ()
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1015 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1016 if (m_app_context.experimental_terminal_widget ())
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1017 m_interpreter_qobj->stop ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1018 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1019
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31726 diff changeset	1020 void base_qobject::interpreter_resume ()
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1021 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1022 if (m_app_context.experimental_terminal_widget ())
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1023 m_interpreter_qobj->resume ();
29292 eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	1024 }
eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	1025
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1026 void base_qobject::copy_image_to_clipboard (const QString& file,
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1027 bool remove_file)
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1028 {
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1029 QClipboard *clipboard = QApplication::clipboard ();
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1030
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1031 QImage img (file);
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1032
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1033 if (img.isNull ())
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1034 {
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1035 // Report error?
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1036 return;
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1037 }
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1038
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1039 clipboard->setImage (img);
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1040
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1041 if (remove_file)
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1042 QFile::remove (file);
b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: diff changeset	1043 }
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31222 diff changeset	1044
c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31222 diff changeset	1045 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libgui/src/octave-qobject.cc @ 31771:21f9b34eb893