octave: libgui/src/qt-interpreter-events.cc annotate

annotate libgui/src/qt-interpreter-events.cc @ 31619:ad014fc78bd6

use individual local gui_settings objects Previously, we created a single gui_settings object (derived from QSettings) and accessed it from the resource_manager object. That design is not necessary and is not the way QSettings was designed to be used. Instead of managing a single object, we should be using individual QSettings objects where needed. Each individual QSettings object manages thread-safe access to a single global collection of settings. The Qt docs say that operations on QSettings are not thread safe, but that means that you can't create a QSettings object in one thread and use it in another without some locking. I'm not sure whether we were doing that correctly, but with this change it no longer matters. Each QSettings object does perform locking when reading or writing the underlying global data. * resource-manager.h, resource-manager.cc (resource_manager::m_settings): Delete data member. (resource_manager::get_settings): Delete. * annotation-dialog.cc, QTerminal.cc, QTerminal.h, command-widget.cc, command-widget.h, community-news.cc, dialog.cc, 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, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, history-dock-widget.cc, history-dock-widget.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, octave-qscintilla.cc, main-window.cc, main-window.h, news-reader.cc, octave-dock-widget.cc, octave-dock-widget.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, resource-manager.cc, resource-manager.h, set-path-dialog.cc, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, workspace-model.cc, workspace-model.h, workspace-view.cc: Use local gui_settings objects instead of accessing a pointer to a single gui_settings object owned by the resource_manager object.

author	John W. Eaton <jwe@octave.org>
date	Fri, 02 Dec 2022 14:23:53 -0500
parents	9c0099048264
children	0645ea65ca6b

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 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 30398 diff changeset	3 // Copyright (C) 2011-2022 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 ////////////////////////////////////////////////////////////////////////
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21717 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	27 # include "config.h"
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	29
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	30 #include <iostream>
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	31 #include <sstream>
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	32
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	33 #include <QDialog>
766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	34 #include <QDir>
27600 bb9aecedc167 use single QVariant object for return values in qt_interpreter_events class John W. Eaton <jwe@octave.org> parents: 27599 diff changeset	35 #include <QIcon>
24641 7d177be54c37 pass variable value to variable editor in addition to variable name John W. Eaton <jwe@octave.org> parents: 24632 diff changeset	36 #include <QMetaType>
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	37 #include <QPushButton>
24641 7d177be54c37 pass variable value to variable editor in addition to variable name John W. Eaton <jwe@octave.org> parents: 24632 diff changeset	38 #include <QStringList>
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	39
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	40 #include "dialog.h"
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	41 #include "gui-preferences-ed.h"
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31087 diff changeset	42 #include "gui-settings.h"
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	43 #include "octave-qobject.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	44 #include "qt-interpreter-events.h"
28566 20ee8aa92897 avoid QList deprecated function warnings John W. Eaton <jwe@octave.org> parents: 28118 diff changeset	45 #include "qt-utils.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	46
28118 f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27929 diff changeset	47 #include "localcharset-wrapper.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	48 #include "oct-env.h"
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	49 #include "str-vec.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	50
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	51 #include "builtin-defun-decls.h"
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	52 #include "error.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	53 #include "interpreter-private.h"
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	54 #include "load-path.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	55 #include "oct-map.h"
25557 bb779fc2d0db do not attempt to open a file when debugging a command line fct (bug #54231) Torsten <mttl@mailbox.org> parents: 25407 diff changeset	56 #include "octave.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	57 #include "ov.h"
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 25948 diff changeset	58 #include "syminfo.h"
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16581 diff changeset	59 #include "utils.h"
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	60
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24641 diff changeset	61 Q_DECLARE_METATYPE (octave_value)
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 25948 diff changeset	62 Q_DECLARE_METATYPE (octave::symbol_info_list)
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27284 diff changeset	63 Q_DECLARE_METATYPE (octave::fcn_callback)
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27284 diff changeset	64 Q_DECLARE_METATYPE (octave::meth_callback)
17884 766ad9be2966 Prompt for non-existent new file when using edit.m from GUI (bug #40450) Torsten <ttl@justmail.de> parents: 17824 diff changeset	65
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	66 namespace octave
24641 7d177be54c37 pass variable value to variable editor in addition to variable name John W. Eaton <jwe@octave.org> parents: 24632 diff changeset	67 {
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	68 static QStringList
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	69 make_qstring_list (const std::list<std::string>& lst)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	70 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	71 QStringList retval;
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	72
27550 b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	73 for (const auto& s : lst)
b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	74 retval.append (QString::fromStdString (s));
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	75
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	76 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	77 }
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	78
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	79 static QStringList
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	80 make_filter_list (const event_manager::filter_list& lst)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	81 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	82 QStringList retval;
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	83
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	84 // We have pairs of data, first being the list of extensions
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	85 // exta;exb;extc etc second the name to use as filter name
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	86 // (optional). Qt wants a list of filters in the format of
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	87 // 'FilterName (space separated exts)'.
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	88
27550 b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	89 for (const auto& ext_name : lst)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	90 {
27550 b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	91 QString ext = QString::fromStdString (ext_name.first);
b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	92 QString name = QString::fromStdString (ext_name.second);
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	93
27914 a044e50c8dcb Streamline QRegExp instances in libgu. Rik <rik@octave.org> parents: 27849 diff changeset	94 // Strip out extensions from name and replace ';' with spaces in list.
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	95
27914 a044e50c8dcb Streamline QRegExp instances in libgu. Rik <rik@octave.org> parents: 27849 diff changeset	96 name.replace (QRegExp (R"($.*$)"), "");
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	97 ext.replace (";", " ");
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	98
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	99 if (name.isEmpty ())
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	100 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	101 // No name field. Build one from the extensions.
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	102 name = ext.toUpper () + " Files";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	103 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	104
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	105 retval.append (name + " (" + ext + ')');
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	106 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	107
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	108 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	109 }
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	110
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	111 qt_interpreter_events::qt_interpreter_events (base_qobject& oct_qobj)
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	112 : interpreter_events (), m_octave_qobj (oct_qobj),
27643 337132e66ec2 eliminate need for global access to resource manager in uiwidget objects John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	113 m_uiwidget_creator (oct_qobj), m_result (), m_mutex (),
337132e66ec2 eliminate need for global access to resource manager in uiwidget objects John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	114 m_waitcondition ()
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	115 {
27551 564bba235594 move some dialog slot functions from octave-qobject.cc to dialog.cc John W. Eaton <jwe@octave.org> parents: 27550 diff changeset	116 qRegisterMetaType<QIntList> ("QIntList");
564bba235594 move some dialog slot functions from octave-qobject.cc to dialog.cc John W. Eaton <jwe@octave.org> parents: 27550 diff changeset	117 qRegisterMetaType<QFloatList> ("QFloatList");
564bba235594 move some dialog slot functions from octave-qobject.cc to dialog.cc John W. Eaton <jwe@octave.org> parents: 27550 diff changeset	118
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	119 qRegisterMetaType<octave_value> ("octave_value");
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	120 qRegisterMetaType<symbol_info_list> ("symbol_info_list");
20091 89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	121
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	122 qRegisterMetaType<fcn_callback> ("fcn_callback");
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	123 qRegisterMetaType<meth_callback> ("meth_callback");
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	124
29542 3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29503 diff changeset	125 connect (this, &qt_interpreter_events::confirm_shutdown_signal,
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29503 diff changeset	126 this, &qt_interpreter_events::confirm_shutdown_octave);
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	127
29542 3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29503 diff changeset	128 connect (this, &qt_interpreter_events::get_named_icon_signal,
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29503 diff changeset	129 this, &qt_interpreter_events::get_named_icon_slot);
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	130
29542 3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29503 diff changeset	131 connect (this, &qt_interpreter_events::gui_preference_signal,
3d34b70b5a49 connect many Qt signals and slots without SIGNAL and SLOT macros John W. Eaton <jwe@octave.org> parents: 29503 diff changeset	132 this, &qt_interpreter_events::gui_preference_slot);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	133 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	134
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	135 void qt_interpreter_events::start_gui (bool gui_app)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	136 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	137 if (m_octave_qobj.experimental_terminal_widget ())
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	138 emit start_gui_signal (gui_app);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	139 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	140
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	141 void qt_interpreter_events::close_gui (void)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	142 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	143 if (m_octave_qobj.experimental_terminal_widget ())
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	144 emit close_gui_signal ();
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	145 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	146
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	147 std::list<std::string>
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	148 qt_interpreter_events::file_dialog (const filter_list& filter,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	149 const std::string& title,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	150 const std::string& filename,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	151 const std::string& dirname,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	152 const std::string& multimode)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	153 {
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	154 QStringList lst
27553 9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	155 = m_uiwidget_creator.file_dialog (make_filter_list (filter),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	156 QString::fromStdString (title),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	157 QString::fromStdString (filename),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	158 QString::fromStdString (dirname),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	159 QString::fromStdString (multimode));
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	160
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	161 std::list<std::string> retval;
20091 89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 19970 diff changeset	162
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	163 for (const auto& s : lst)
27550 b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	164 retval.push_back (s.toStdString ());
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	165
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	166 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	167 }
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16570 diff changeset	168
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	169 std::list<std::string>
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	170 qt_interpreter_events::input_dialog (const std::list<std::string>& prompt,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	171 const std::string& title,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	172 const std::list<float>& nr,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	173 const std::list<float>& nc,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	174 const std::list<std::string>& defaults)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	175 {
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	176 QStringList lst
27553 9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	177 = m_uiwidget_creator.input_dialog (make_qstring_list (prompt),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	178 QString::fromStdString (title),
28566 20ee8aa92897 avoid QList deprecated function warnings John W. Eaton <jwe@octave.org> parents: 28118 diff changeset	179 std_list_to_qt_list<float> (nr),
20ee8aa92897 avoid QList deprecated function warnings John W. Eaton <jwe@octave.org> parents: 28118 diff changeset	180 std_list_to_qt_list<float> (nc),
27553 9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	181 make_qstring_list (defaults));
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	182 std::list<std::string> retval;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	183
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	184 for (const auto& s : lst)
27550 b8f51d2dba6d * qt-interpreter-events.cc: Use range-based for loop where possible. John W. Eaton <jwe@octave.org> parents: 27549 diff changeset	185 retval.push_back (s.toStdString ());
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	186
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	187 return retval;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	188 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	189
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	190 std::pair<std::list<int>, int>
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	191 qt_interpreter_events::list_dialog (const std::list<std::string>& list,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	192 const std::string& mode,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	193 int width, int height,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	194 const std::list<int>& initial,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	195 const std::string& name,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	196 const std::list<std::string>& prompt,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	197 const std::string& ok_string,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	198 const std::string& cancel_string)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	199 {
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	200 QPair<QIntList, int> result
27553 9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	201 = m_uiwidget_creator.list_dialog (make_qstring_list (list),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	202 QString::fromStdString (mode),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	203 width, height,
28566 20ee8aa92897 avoid QList deprecated function warnings John W. Eaton <jwe@octave.org> parents: 28118 diff changeset	204 std_list_to_qt_list<int> (initial),
27553 9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	205 QString::fromStdString (name),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	206 make_qstring_list (prompt),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	207 QString::fromStdString (ok_string),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	208 QString::fromStdString (cancel_string));
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	209
28566 20ee8aa92897 avoid QList deprecated function warnings John W. Eaton <jwe@octave.org> parents: 28118 diff changeset	210 QIntList& lst = result.first;
20ee8aa92897 avoid QList deprecated function warnings John W. Eaton <jwe@octave.org> parents: 28118 diff changeset	211 return std::pair<std::list<int>, int> (std::list<int> (lst.begin (),
20ee8aa92897 avoid QList deprecated function warnings John W. Eaton <jwe@octave.org> parents: 28118 diff changeset	212 lst.end ()),
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	213 result.second);
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	214 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	215
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	216 std::string
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	217 qt_interpreter_events::question_dialog (const std::string& msg,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	218 const std::string& title,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	219 const std::string& btn1,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	220 const std::string& btn2,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	221 const std::string& btn3,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	222 const std::string& btndef)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	223 {
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	224 QString icon = "quest";
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	225 QStringList buttons;
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	226 QStringList role;
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	227
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	228 // Must use ResetRole which is left-aligned for all OS and WM.
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	229 role << "ResetRole" << "ResetRole" << "ResetRole";
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	230
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	231 buttons << QString::fromStdString (btn1);
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	232 if (btn2 == "")
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	233 role.removeAt (0);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	234 else
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	235 buttons << QString::fromStdString (btn2);
de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	236 buttons << QString::fromStdString (btn3);
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	237
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	238 QString answer
27553 9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	239 = m_uiwidget_creator.message_dialog (QString::fromStdString (msg),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	240 QString::fromStdString (title),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	241 icon, buttons,
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	242 QString::fromStdString (btndef),
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	243 role);
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	244
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	245 return answer.toStdString ();
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	246 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	247
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	248 void qt_interpreter_events::update_path_dialog (void)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	249 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	250 emit update_path_dialog_signal ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	251 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	252
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	253 void qt_interpreter_events::show_preferences (void)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	254 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	255 emit show_preferences_signal ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	256 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	257
27602 ba317c535adb define new __event_manager_apply_preferences__ function John W. Eaton <jwe@octave.org> parents: 27601 diff changeset	258 void qt_interpreter_events::apply_preferences (void)
ba317c535adb define new __event_manager_apply_preferences__ function John W. Eaton <jwe@octave.org> parents: 27601 diff changeset	259 {
ba317c535adb define new __event_manager_apply_preferences__ function John W. Eaton <jwe@octave.org> parents: 27601 diff changeset	260 emit apply_new_settings ();
ba317c535adb define new __event_manager_apply_preferences__ function John W. Eaton <jwe@octave.org> parents: 27601 diff changeset	261 }
ba317c535adb define new __event_manager_apply_preferences__ function John W. Eaton <jwe@octave.org> parents: 27601 diff changeset	262
29787 b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29613 diff changeset	263 void qt_interpreter_events::show_terminal_window (void)
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29613 diff changeset	264 {
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29613 diff changeset	265 emit show_terminal_window_signal ();
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29613 diff changeset	266 }
b4d2fa28d1d4 allow terminal window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29613 diff changeset	267
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	268 bool qt_interpreter_events::show_documentation (const std::string& file)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	269 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	270 emit show_documentation_signal (QString::fromStdString (file));
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	271
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	272 return true;
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	273 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	274
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	275 void qt_interpreter_events::show_file_browser (void)
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	276 {
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	277 emit show_file_browser_signal ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	278 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	279
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	280 void qt_interpreter_events::show_command_history (void)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	281 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	282 emit show_command_history_signal ();
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	283 }
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	284
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	285 void qt_interpreter_events::show_workspace (void)
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	286 {
9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	287 emit show_workspace_signal ();
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	288 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	289
29835 a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29796 diff changeset	290 void qt_interpreter_events::show_community_news (int serial)
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29796 diff changeset	291 {
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29796 diff changeset	292 emit show_community_news_signal (serial);
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29796 diff changeset	293 }
a946d742fb97 allow community news window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29796 diff changeset	294
29836 56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	295 void qt_interpreter_events::show_release_notes (void)
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	296 {
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	297 emit 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	298 }
56465c0739fa allow release notes window to be opened from command line John W. Eaton <jwe@octave.org> parents: 29835 diff changeset	299
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	300 bool qt_interpreter_events::edit_file (const std::string& file)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	301 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	302 emit edit_file_signal (QString::fromStdString (file));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	303
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	304 return true;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	305 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	306
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	307 void qt_interpreter_events::edit_variable (const std::string& expr,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	308 const octave_value& val)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	309 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	310 emit edit_variable_signal (QString::fromStdString (expr), val);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	311 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	312
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	313 bool qt_interpreter_events::confirm_shutdown (void)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	314 {
27589 12cfa32dc29e use QMutexLocker to manage locks in qt_interpreter_events methods John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	315 QMutexLocker autolock (&m_mutex);
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	316
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	317 emit confirm_shutdown_signal ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	318
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	319 // Wait for result.
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	320 wait ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	321
27600 bb9aecedc167 use single QVariant object for return values in qt_interpreter_events class John W. Eaton <jwe@octave.org> parents: 27599 diff changeset	322 return m_result.toBool ();
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	323 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	324
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	325 bool qt_interpreter_events::prompt_new_edit_file (const std::string& file)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	326 {
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31087 diff changeset	327 gui_settings settings;
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	328
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31087 diff changeset	329 if (settings.value (ed_create_new_file).toBool ())
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	330 return true;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	331
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	332 std::string abs_fname = sys::env::make_absolute (file);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	333
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	334 QStringList btn;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	335 QStringList role;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	336 role << "YesRole" << "RejectRole";
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	337 btn << tr ("Create") << tr ("Cancel");
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	338
27553 9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	339 QString answer = m_uiwidget_creator.message_dialog
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	340 (tr ("File\n%1\ndoes not exist. Do you want to create it?").
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	341 arg (QString::fromStdString (abs_fname)),
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	342 tr ("Octave Editor"), "quest", btn, tr ("Create"), role);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	343
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	344 return (answer == tr ("Create"));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	345 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	346
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	347 // Prompt to allow file to be run by setting cwd (or if
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	348 // addpath_option==true, alternatively setting the path).
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	349
378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	350 int
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	351 qt_interpreter_events::debug_cd_or_addpath_error (const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	352 const std::string& dir,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	353 bool addpath_option)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	354 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	355 int retval = -1;
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	356
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	357 QString qdir = QString::fromStdString (dir);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	358 QString qfile = QString::fromStdString (file);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	359 QString msg
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	360 = (addpath_option
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	361 ? tr ("The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg (qfile).arg (qdir)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	362 : tr ("The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.").arg (qfile).arg (qdir));
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	363
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	364 QString title = tr ("Change Directory or Add Directory to Load Path");
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	365
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	366 QString cd_txt = tr ("&Change Directory");
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	367 QString addpath_txt = tr ("&Add Directory to Load Path");
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	368 QString cancel_txt = tr ("Cancel");
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	369
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	370 QStringList btn;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	371 QStringList role;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	372 btn << cd_txt;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	373 role << "YesRole";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	374 if (addpath_option)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	375 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	376 btn << addpath_txt;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	377 role << "AcceptRole";
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	378 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	379 btn << cancel_txt;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	380 role << "RejectRole";
21311 718332a58d35 Fix left mouse button in editor margin bug from cset 65827e9cccb8 Lachlan Andrew <lachlanbis@gmail.com> parents: 21310 diff changeset	381
27552 de5129cb0796 refactor dialog functions John W. Eaton <jwe@octave.org> parents: 27551 diff changeset	382 QString result
27553 9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	383 = m_uiwidget_creator.message_dialog (msg, title, "quest", btn,
9b72eb111b7e eliminate global uiwidget_creator variable John W. Eaton <jwe@octave.org> parents: 27552 diff changeset	384 cancel_txt, role);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	385
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	386 if (result == cd_txt)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	387 retval = 1;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	388 else if (result == addpath_txt)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	389 retval = 2;
16565 e4b94abfeb96 use generic dialog for cd or addpath question John W. Eaton <jwe@octave.org> parents: 16551 diff changeset	390
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	391 return retval;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	392 }
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16528 diff changeset	393
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	394 uint8NDArray qt_interpreter_events::get_named_icon (const std::string& name)
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	395 {
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	396 QMutexLocker autolock (&m_mutex);
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	397
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	398 emit get_named_icon_signal (QString::fromStdString (name));
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	399
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	400 // Wait for result.
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	401 wait ();
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	402
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	403 uint8NDArray empty_img;
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	404
27600 bb9aecedc167 use single QVariant object for return values in qt_interpreter_events class John W. Eaton <jwe@octave.org> parents: 27599 diff changeset	405 QIcon icon = m_result.value<QIcon> ();
bb9aecedc167 use single QVariant object for return values in qt_interpreter_events class John W. Eaton <jwe@octave.org> parents: 27599 diff changeset	406
bb9aecedc167 use single QVariant object for return values in qt_interpreter_events class John W. Eaton <jwe@octave.org> parents: 27599 diff changeset	407 if (icon.isNull ())
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	408 return empty_img;
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	409
27600 bb9aecedc167 use single QVariant object for return values in qt_interpreter_events class John W. Eaton <jwe@octave.org> parents: 27599 diff changeset	410 QImage img = icon.pixmap (QSize (32, 32)).toImage ();
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	411
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	412 if (img.format () != QImage::Format_ARGB32_Premultiplied)
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	413 return empty_img;
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	414
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	415 dim_vector dims (img.height (), img.width (), 4);
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	416
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	417 uint8NDArray retval (dims, 0);
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	418
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	419 uint8_t *bits = img.bits ();
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	420
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	421 for (int i = 0; i < img.height (); i++)
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	422 {
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	423 for (int j = 0; j < img.width (); j++)
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	424 {
30398 d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29836 diff changeset	425 retval(i, j, 2) = bits[0];
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29836 diff changeset	426 retval(i, j, 1) = bits[1];
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29836 diff changeset	427 retval(i, j, 0) = bits[2];
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29836 diff changeset	428 retval(i, j, 3) = bits[3];
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	429
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	430 bits += 4;
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	431 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	432 }
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	433
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	434 return retval;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	435 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	436
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	437 void qt_interpreter_events::get_named_icon_slot (const QString& name)
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	438 {
27603 bf6b192428a0 * qt-interpreter-events.cc: Use QMutexLocker objects where possible. John W. Eaton <jwe@octave.org> parents: 27602 diff changeset	439 QMutexLocker autolock (&m_mutex);
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	440
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	441 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	442 m_result = QVariant::fromValue (rmgr.icon (name));
27599 ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	443
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	444 wake_all ();
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	445 }
ada24a1979c0 improve thread safety of qt_interpreter_events::get_named_icon John W. Eaton <jwe@octave.org> parents: 27589 diff changeset	446
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	447 std::string
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	448 qt_interpreter_events::gui_preference (const std::string& key,
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	449 const std::string& value)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	450 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	451 QString pref_value;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	452
27589 12cfa32dc29e use QMutexLocker to manage locks in qt_interpreter_events methods John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	453 QMutexLocker autolock (&m_mutex);
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	454
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	455 // Emit the signal for changing or getting a preference
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	456 emit gui_preference_signal (QString::fromStdString (key),
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	457 QString::fromStdString (value));
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	458
27589 12cfa32dc29e use QMutexLocker to manage locks in qt_interpreter_events methods John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	459 // Wait for response (pref_value).
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	460 wait ();
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	461
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	462 QString pref = m_result.toString ();
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	463
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	464 return pref.toStdString ();
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	465 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	466
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	467 bool qt_interpreter_events::copy_image_to_clipboard (const std::string& file)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	468 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	469 emit copy_image_to_clipboard_signal (QString::fromStdString (file), true);
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	470
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	471 return true;
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	472 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	473
27669 271b5cd640d7 Add functions to show GUI windows (bug #57213) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27643 diff changeset	474 void qt_interpreter_events::focus_window (const std::string win_name)
271b5cd640d7 Add functions to show GUI windows (bug #57213) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27643 diff changeset	475 {
271b5cd640d7 Add functions to show GUI windows (bug #57213) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27643 diff changeset	476 emit focus_window_signal (QString::fromStdString (win_name));
271b5cd640d7 Add functions to show GUI windows (bug #57213) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27643 diff changeset	477 }
271b5cd640d7 Add functions to show GUI windows (bug #57213) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27643 diff changeset	478
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	479 void qt_interpreter_events::execute_command_in_terminal
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	480 (const std::string& command)
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	481 {
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	482 emit execute_command_in_terminal_signal (QString::fromStdString (command));
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	483 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	484
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	485 void qt_interpreter_events::register_documentation (const std::string& file)
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	486 {
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	487 emit register_documentation_signal (QString::fromStdString (file));
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	488 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	489
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	490 void qt_interpreter_events::unregister_documentation (const std::string& file)
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	491 {
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29542 diff changeset	492 emit unregister_documentation_signal (QString::fromStdString (file));
27442 6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	493 }
6e4519df0be2 group functions by category in interpreter_events and event_manager classes John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	494
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	495 void qt_interpreter_events::interpreter_output (const std::string& msg)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	496 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	497 if (m_octave_qobj.experimental_terminal_widget ()
29796 a0fce019cd1f additional reorganization of signal/slot connections in main_window class John W. Eaton <jwe@octave.org> parents: 29787 diff changeset	498 && m_octave_qobj.have_terminal_window ())
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	499 emit interpreter_output_signal (QString::fromStdString (msg));
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	500 else
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	501 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	502 // FIXME: is this the correct thing to do?
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	503 std::cout << msg;
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	504 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	505 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	506
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	507 void qt_interpreter_events::display_exception (const execution_exception& ee,
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	508 bool beep)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	509 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	510 if (m_octave_qobj.experimental_terminal_widget ()
29796 a0fce019cd1f additional reorganization of signal/slot connections in main_window class John W. Eaton <jwe@octave.org> parents: 29787 diff changeset	511 && m_octave_qobj.have_terminal_window ())
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	512 {
31087 9c0099048264 exp cmd widget: fix missing promt after error Torsten Lilge <ttl-octave@mailbox.org> parents: 30564 diff changeset	513 // Output the exception message
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	514 std::ostringstream buf;
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	515 ee.display (buf);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	516 emit interpreter_output_signal (QString::fromStdString (buf.str ()));
31087 9c0099048264 exp cmd widget: fix missing promt after error Torsten Lilge <ttl-octave@mailbox.org> parents: 30564 diff changeset	517 // Create w new command line
9c0099048264 exp cmd widget: fix missing promt after error Torsten Lilge <ttl-octave@mailbox.org> parents: 30564 diff changeset	518 emit new_command_line_signal ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	519 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	520 else
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	521 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	522 if (beep)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	523 std::cerr << "\a";
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	524
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	525 ee.display (std::cerr);
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	526 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	527 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	528
29057 450920c987b8 update profiler status in gui from interpreter Torsten Lilge <ttl-octave@mailbox.org> parents: 29001 diff changeset	529 void qt_interpreter_events::gui_status_update (const std::string& feature,
450920c987b8 update profiler status in gui from interpreter Torsten Lilge <ttl-octave@mailbox.org> parents: 29001 diff changeset	530 const std::string& status)
450920c987b8 update profiler status in gui from interpreter Torsten Lilge <ttl-octave@mailbox.org> parents: 29001 diff changeset	531 {
450920c987b8 update profiler status in gui from interpreter Torsten Lilge <ttl-octave@mailbox.org> parents: 29001 diff changeset	532 emit gui_status_update_signal (QString::fromStdString (feature),
450920c987b8 update profiler status in gui from interpreter Torsten Lilge <ttl-octave@mailbox.org> parents: 29001 diff changeset	533 QString::fromStdString (status));
450920c987b8 update profiler status in gui from interpreter Torsten Lilge <ttl-octave@mailbox.org> parents: 29001 diff changeset	534 }
450920c987b8 update profiler status in gui from interpreter Torsten Lilge <ttl-octave@mailbox.org> parents: 29001 diff changeset	535
28788 aba2c4eadb83 add functions of loaded packages to auto-completion list (bug #56207) Torsten Lilge <ttl-octave@mailbox.org> parents: 28566 diff changeset	536 void qt_interpreter_events::update_gui_lexer (void)
aba2c4eadb83 add functions of loaded packages to auto-completion list (bug #56207) Torsten Lilge <ttl-octave@mailbox.org> parents: 28566 diff changeset	537 {
aba2c4eadb83 add functions of loaded packages to auto-completion list (bug #56207) Torsten Lilge <ttl-octave@mailbox.org> parents: 28566 diff changeset	538 emit update_gui_lexer_signal (true);
aba2c4eadb83 add functions of loaded packages to auto-completion list (bug #56207) Torsten Lilge <ttl-octave@mailbox.org> parents: 28566 diff changeset	539 }
aba2c4eadb83 add functions of loaded packages to auto-completion list (bug #56207) Torsten Lilge <ttl-octave@mailbox.org> parents: 28566 diff changeset	540
27409 a0d49e55acae rename change_directory to directory_changed in event manager John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	541 void qt_interpreter_events::directory_changed (const std::string& dir)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	542 {
27409 a0d49e55acae rename change_directory to directory_changed in event manager John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	543 emit directory_changed_signal (QString::fromStdString (dir));
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	544 }
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	545
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	546 void qt_interpreter_events::file_remove (const std::string& old_name,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	547 const std::string& new_name)
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	548 {
27589 12cfa32dc29e use QMutexLocker to manage locks in qt_interpreter_events methods John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	549 QMutexLocker autolock (&m_mutex);
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	550
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	551 // Emit the signal for the editor for closing the file if it is open
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	552 emit file_remove_signal (QString::fromStdString (old_name),
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	553 QString::fromStdString (new_name));
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	554
27589 12cfa32dc29e use QMutexLocker to manage locks in qt_interpreter_events methods John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	555 // Wait for file removal to complete before continuing.
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	556 wait ();
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	557 }
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	558
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	559 void qt_interpreter_events::file_renamed (bool load_new)
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	560 {
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	561 emit file_renamed_signal (load_new);
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	562 }
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	563
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	564 void qt_interpreter_events::set_workspace (bool top_level, bool debug,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	565 const symbol_info_list& syminfo,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	566 bool update_variable_editor)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	567 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	568 if (! top_level && ! debug)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	569 return;
19904 793230bb81d4 don't update workspace viewer unless at top level (bug #44156) John W. Eaton <jwe@octave.org> parents: 19714 diff changeset	570
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 25948 diff changeset	571 emit set_workspace_signal (top_level, debug, syminfo);
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23807 diff changeset	572
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	573 if (update_variable_editor)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	574 emit refresh_variable_editor_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	575 }
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	576
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	577 void qt_interpreter_events::clear_workspace (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	578 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	579 emit clear_workspace_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	580 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	581
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	582 void qt_interpreter_events::update_prompt (const std::string& prompt)
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	583 {
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	584 emit update_prompt_signal (QString::fromStdString (prompt));
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	585 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	586
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	587 void qt_interpreter_events::set_history (const string_vector& hist)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	588 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	589 QStringList qt_hist;
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	590
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	591 for (octave_idx_type i = 0; i < hist.numel (); i++)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	592 qt_hist.append (QString::fromStdString (hist[i]));
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	593
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	594 emit set_history_signal (qt_hist);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	595 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	596
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	597 void qt_interpreter_events::append_history (const std::string& hist_entry)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	598 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	599 emit append_history_signal (QString::fromStdString (hist_entry));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	600 }
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	601
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	602 void qt_interpreter_events::clear_history (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	603 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	604 emit clear_history_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	605 }
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	606
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	607 void qt_interpreter_events::pre_input_event (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	608 { }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	609
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	610 void qt_interpreter_events::post_input_event (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	611 { }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	612
27392 820a87b87c01 clean up use of interpreter in qt_interpreter_events::enter_debugger_event John W. Eaton <jwe@octave.org> parents: 27311 diff changeset	613 void qt_interpreter_events::enter_debugger_event (const std::string& /fcn_name/,
820a87b87c01 clean up use of interpreter in qt_interpreter_events::enter_debugger_event John W. Eaton <jwe@octave.org> parents: 27311 diff changeset	614 const std::string& fcn_file_name,
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	615 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	616 {
27392 820a87b87c01 clean up use of interpreter in qt_interpreter_events::enter_debugger_event John W. Eaton <jwe@octave.org> parents: 27311 diff changeset	617 if (fcn_file_name.empty ())
25557 bb779fc2d0db do not attempt to open a file when debugging a command line fct (bug #54231) Torsten <mttl@mailbox.org> parents: 25407 diff changeset	618 return;
bb779fc2d0db do not attempt to open a file when debugging a command line fct (bug #54231) Torsten <mttl@mailbox.org> parents: 25407 diff changeset	619
27392 820a87b87c01 clean up use of interpreter in qt_interpreter_events::enter_debugger_event John W. Eaton <jwe@octave.org> parents: 27311 diff changeset	620 insert_debugger_pointer (fcn_file_name, line);
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	621
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	622 emit enter_debugger_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	623 }
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	624
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	625 void
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	626 qt_interpreter_events::execute_in_debugger_event (const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	627 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	628 {
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	629 delete_debugger_pointer (file, line);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	630 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	631
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	632 void qt_interpreter_events::exit_debugger_event (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	633 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	634 emit exit_debugger_signal ();
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	635 }
16415 70032fc70bee move octave-link and octave-event-listener classes to libinterp John W. Eaton <jwe@octave.org> parents: diff changeset	636
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	637 // Display (if @insert true) or remove the appropriate symbol for a breakpoint
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	638 // in @file at @line with condition @cond.
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	639 void qt_interpreter_events::update_breakpoint (bool insert,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	640 const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	641 int line,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	642 const std::string& cond)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	643 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	644 emit update_breakpoint_marker_signal (insert, QString::fromStdString (file),
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	645 line, QString::fromStdString (cond));
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	646 }
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	647
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	648 void
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	649 qt_interpreter_events::insert_debugger_pointer (const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	650 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	651 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	652 emit insert_debugger_pointer_signal (QString::fromStdString (file), line);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	653 }
17010 c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16658 diff changeset	654
27264 378d3c91f85b style fixes for event_manager classes John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	655 void
27284 1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	656 qt_interpreter_events::delete_debugger_pointer (const std::string& file,
1a8762e5662b remove "do_" prefix from interpreter_events class methods John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	657 int line)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	658 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	659 emit delete_debugger_pointer_signal (QString::fromStdString (file), line);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	660 }
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	661
f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	662 void
f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	663 qt_interpreter_events::confirm_shutdown_octave (void)
f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	664 {
27603 bf6b192428a0 * qt-interpreter-events.cc: Use QMutexLocker objects where possible. John W. Eaton <jwe@octave.org> parents: 27602 diff changeset	665 QMutexLocker autolock (&m_mutex);
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	666
27600 bb9aecedc167 use single QVariant object for return values in qt_interpreter_events class John W. Eaton <jwe@octave.org> parents: 27599 diff changeset	667 m_result = m_octave_qobj.confirm_shutdown ();
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	668
f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	669 wake_all ();
f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27553 diff changeset	670 }
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	671
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	672 // If VALUE is empty, return current value of preference named by KEY.
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	673 //
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	674 // If VALUE is not empty, set preference named by KEY to VALUE return
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	675 // previous value.
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	676 //
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	677 // FIXME: should we have separate get and set functions? With only
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	678 // one, we don't allow a preference value to be set to the empty
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	679 // string.
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	680
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	681 void
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	682 qt_interpreter_events::gui_preference_slot (const QString& key,
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	683 const QString& value)
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	684 {
27603 bf6b192428a0 * qt-interpreter-events.cc: Use QMutexLocker objects where possible. John W. Eaton <jwe@octave.org> parents: 27602 diff changeset	685 QMutexLocker autolock (&m_mutex);
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	686
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31087 diff changeset	687 gui_settings settings;
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	688
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31087 diff changeset	689 QString read_value = settings.value (key).toString ();
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	690
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	691 // Some preferences need extra handling
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	692 QString adjusted_value = gui_preference_adjust (key, value);
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	693
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	694 if (! adjusted_value.isEmpty () && (read_value != adjusted_value))
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	695 {
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	696 // Change settings only for new, non-empty values
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31087 diff changeset	697 settings.setValue (key, QVariant (adjusted_value));
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	698
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31087 diff changeset	699 emit settings_changed (true); // true: changed by worker
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	700 }
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	701
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	702 m_result = read_value;
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	703
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	704 wake_all ();
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	705 }
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	706
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	707 QString
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	708 qt_interpreter_events::gui_preference_adjust (const QString& key,
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	709 const QString& value)
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	710 {
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	711 // Immediately return if no new value is given.
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	712
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	713 if (value.isEmpty ())
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	714 return value;
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	715
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	716 QString adjusted_value = value;
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	717
27929 265b386f8b20 maint: Use two spaces between sentences in code comments. Rik <rik@octave.org> parents: 27923 diff changeset	718 // Not all encodings are available. Encodings are uppercase and do
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	719 // not use CPxxx but IBMxxx or WINDOWS-xxx.
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	720
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	721 if (key == ed_default_enc.key)
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	722 {
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	723 adjusted_value = adjusted_value.toUpper ();
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	724
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	725 QStringList codecs;
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	726 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	727 rmgr.get_codecs (&codecs);
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	728
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	729 QRegExp re ("^CP(\\d+)$");
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	730
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	731 if (adjusted_value == "SYSTEM")
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	732 adjusted_value =
28118 f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27929 diff changeset	733 QString ("SYSTEM (") +
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27929 diff changeset	734 QString (octave_locale_charset_wrapper ()).toUpper () +
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27929 diff changeset	735 QString (")");
27601 7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	736 else if (re.indexIn (adjusted_value) > -1)
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	737 {
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	738 if (codecs.contains ("IBM" + re.cap (1)))
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	739 adjusted_value = "IBM" + re.cap (1);
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	740 else if (codecs.contains ("WINDOWS-" + re.cap (1)))
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	741 adjusted_value = "WINDOWS-" + re.cap (1);
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	742 else
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	743 adjusted_value.clear ();
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	744 }
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	745 else if (! codecs.contains (adjusted_value))
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	746 adjusted_value.clear ();
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	747 }
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	748
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	749 return adjusted_value;
7a748f7545c9 improve thread safety of qt_interpreter_events::gui_preference John W. Eaton <jwe@octave.org> parents: 27600 diff changeset	750 }
17029 359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	751 }

Mercurial > octave

annotate libgui/src/qt-interpreter-events.cc @ 31619:ad014fc78bd6