octave: libgui/src/workspace-view.cc annotate

annotate libgui/src/workspace-view.cc @ 27610:8586eb41abf5

improve memory management in workspace_view class * workspace-view.cc (workspace_view::m_filter_checkbox, workspace_view::m_filter, workspace_view::m_filter_widget): Create in constructor initializer list. (workspace_view::m_sig_mapper): Delete data member and all uses. (workspace_view::): Delete data member and all uses. (workspace_view::header_contextmenu_requested): Create local QSignalMapper object for the local QMenu object since it only needs to exist as long as the QMenu object exists.

author	John W. Eaton <jwe@octave.org>
date	Fri, 01 Nov 2019 12:12:10 -0400
parents	3fcc650de22f
children	0495b64288f7

rev	line source
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	1 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26117 diff changeset	3 Copyright (C) 2013-2019 John W. Eaton
00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26117 diff changeset	4 Copyright (C) 2011-2019 Jacob Dawid
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24362 diff changeset	8 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	9 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24362 diff changeset	10 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	11 (at your option) any later version.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	16 GNU General Public License for more details.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	18 You should have received a copy of the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	19 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24362 diff changeset	20 <https://www.gnu.org/licenses/>.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	22 */
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21568 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	25 # include "config.h"
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	26 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	27
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	28 #include <QApplication>
dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	29 #include <QClipboard>
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27377 diff changeset	30 #include <QCompleter>
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27377 diff changeset	31 #include <QHBoxLayout>
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27377 diff changeset	32 #include <QHeaderView>
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27377 diff changeset	33 #include <QInputDialog>
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27377 diff changeset	34 #include <QLabel>
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	35 #include <QLineEdit>
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27377 diff changeset	36 #include <QMenu>
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27377 diff changeset	37 #include <QMessageBox>
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27377 diff changeset	38 #include <QPushButton>
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27377 diff changeset	39 #include <QSignalMapper>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	40 #include <QVBoxLayout>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	41
27560 3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27478 diff changeset	42 #include "gui-preferences-ws.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27377 diff changeset	43 #include "resource-manager.h"
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	44 #include "workspace-view.h"
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	45
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	46 #include "interpreter-private.h"
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	47 #include "interpreter.h"
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 25974 diff changeset	48 #include "syminfo.h"
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	49
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	50 namespace octave
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	51 {
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	52 workspace_view::workspace_view (QWidget *p)
27610 8586eb41abf5 improve memory management in workspace_view class John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	53 : octave_dock_widget ("WorkspaceView", p),
8586eb41abf5 improve memory management in workspace_view class John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	54 m_view (new QTableView (this)),
8586eb41abf5 improve memory management in workspace_view class John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	55 m_filter_checkbox (new QCheckBox ()),
8586eb41abf5 improve memory management in workspace_view class John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	56 m_filter (new QComboBox (this)),
8586eb41abf5 improve memory management in workspace_view class John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	57 m_filter_widget (new QWidget (this))
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	58 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	59 setWindowIcon (QIcon (":/actions/icons/logo.png"));
25508 3edae6ba1fcd use a custom title bar widget for the main dock widgets Torsten <mttl@mailbox.org> parents: 25355 diff changeset	60 set_title (tr ("Workspace"));
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	61 setStatusTip (tr ("View the variables in the active workspace."));
13523 103b7bebb38f Moved load/save/clear workspace into main menu. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	62
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	63 m_filter->setToolTip (tr ("Enter text to filter the workspace"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	64 m_filter->setEditable (true);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	65 m_filter->setMaxCount (MaxFilterHistory);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	66 m_filter->setInsertPolicy (QComboBox::NoInsert);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	67 m_filter->setSizeAdjustPolicy (QComboBox::AdjustToMinimumContentsLengthWithIcon);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	68 QSizePolicy sizePol (QSizePolicy::Expanding, QSizePolicy::Preferred);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	69 m_filter->setSizePolicy (sizePol);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	70 m_filter->completer ()->setCaseSensitivity (Qt::CaseSensitive);
19538 e4b25475ef3d provide a filter for the workspace view (bug #41222) Torsten <ttl@justmail.de> parents: 19433 diff changeset	71
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	72 QLabel *filter_label = new QLabel (tr ("Filter"));
19538 e4b25475ef3d provide a filter for the workspace view (bug #41222) Torsten <ttl@justmail.de> parents: 19433 diff changeset	73
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	74 m_view->setWordWrap (false);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	75 m_view->setContextMenuPolicy (Qt::CustomContextMenu);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	76 m_view->setShowGrid (false);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	77 (m_view->verticalHeader) ()->hide ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	78 m_view->setAlternatingRowColors (true);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	79 m_view_previous_row_count = 0;
13523 103b7bebb38f Moved load/save/clear workspace into main menu. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13506 diff changeset	80
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	81 // Set an empty widget, so we can assign a layout to it.
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	82 setWidget (new QWidget (this));
14874 5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14783 diff changeset	83
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	84 // Create the layouts
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	85 QHBoxLayout *filter_layout = new QHBoxLayout ();
20570 734d446560a8 possibility to hide filters in history and workspace view (bug#45428) Torsten <ttl@justmail.de> parents: 20388 diff changeset	86
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	87 filter_layout->addWidget (filter_label);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	88 filter_layout->addWidget (m_filter_checkbox);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	89 filter_layout->addWidget (m_filter);
27478 9e526393d80a reduced vertical space in gui with responsive toolbar buttons (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	90 filter_layout->setMargin (0);
9e526393d80a reduced vertical space in gui with responsive toolbar buttons (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	91
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	92 m_filter_widget->setLayout (filter_layout);
20570 734d446560a8 possibility to hide filters in history and workspace view (bug#45428) Torsten <ttl@justmail.de> parents: 20388 diff changeset	93
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	94 QVBoxLayout *ws_layout = new QVBoxLayout ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	95 ws_layout->addWidget (m_filter_widget);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	96 ws_layout->addWidget (m_view);
27478 9e526393d80a reduced vertical space in gui with responsive toolbar buttons (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	97 ws_layout->setSpacing (0);
20570 734d446560a8 possibility to hide filters in history and workspace view (bug#45428) Torsten <ttl@justmail.de> parents: 20388 diff changeset	98
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	99 QSettings *settings = resource_manager::get_settings ();
20570 734d446560a8 possibility to hide filters in history and workspace view (bug#45428) Torsten <ttl@justmail.de> parents: 20388 diff changeset	100
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	101 if (settings)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	102 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	103 m_filter_shown = settings->value ("workspaceview/filter_shown",true).toBool ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	104 m_filter_widget->setVisible (m_filter_shown);
14874 5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14783 diff changeset	105
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	106 ws_layout->setMargin (2);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	107
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	108 // Set the empty widget to have our layout.
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	109 widget ()->setLayout (ws_layout);
22177 6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 21724 diff changeset	110
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	111 // Initialize collapse/expand state of the workspace subcategories.
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 14997 diff changeset	112
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	113 //enable sorting (setting column and order after model was set)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	114 m_view->setSortingEnabled (true);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	115 // Initialize column order and width of the workspace
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	116 m_view->horizontalHeader ()->restoreState
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	117 (settings->value ("workspaceview/column_state").toByteArray ());
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22177 diff changeset	118
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	119 // Set header properties for sorting
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24775 diff changeset	120 #if defined (HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24775 diff changeset	121 m_view->horizontalHeader ()->setSectionsClickable (true);
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24775 diff changeset	122 #else
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	123 m_view->horizontalHeader ()->setClickable (true);
24827 1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24775 diff changeset	124 #endif
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24775 diff changeset	125 #if defined (HAVE_QHEADERVIEW_SETSECTIONSMOVABLE)
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24775 diff changeset	126 m_view->horizontalHeader ()->setSectionsMovable (true);
1e0718c1867c eliminate most Qt version checks John W. Eaton <jwe@octave.org> parents: 24775 diff changeset	127 #else
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	128 m_view->horizontalHeader ()->setMovable (true);
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22177 diff changeset	129 #endif
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	130 m_view->horizontalHeader ()->setSortIndicator (settings->value ("workspaceview/sort_by_column",0).toInt (),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	131 static_cast<Qt::SortOrder>
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	132 (settings->value ("workspaceview/sort_order", Qt::AscendingOrder).toUInt ()));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	133 m_view->horizontalHeader ()->setSortIndicatorShown (true);
19982 9a8be23d2c05 extend sorting of workspave view widget Torsten <ttl@justmail.de> parents: 19981 diff changeset	134
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	135 m_view->horizontalHeader ()->setContextMenuPolicy (Qt::CustomContextMenu);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	136 connect (m_view->horizontalHeader (),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	137 SIGNAL (customContextMenuRequested (const QPoint &)),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	138 this, SLOT (header_contextmenu_requested (const QPoint &)));
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	139
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	140 // Init state of the filter
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	141 m_filter->addItems (settings->value ("workspaceview/mru_list").toStringList ());
19538 e4b25475ef3d provide a filter for the workspace view (bug #41222) Torsten <ttl@justmail.de> parents: 19433 diff changeset	142
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	143 bool filter_state =
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	144 settings->value ("workspaceview/filter_active", false).toBool ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	145 m_filter_checkbox->setChecked (filter_state);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	146 filter_activate (filter_state);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	147 }
19538 e4b25475ef3d provide a filter for the workspace view (bug #41222) Torsten <ttl@justmail.de> parents: 19433 diff changeset	148
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	149 // Connect signals and slots.
14874 5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14783 diff changeset	150
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	151 connect (m_filter, SIGNAL (editTextChanged (const QString&)),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	152 this, SLOT (filter_update (const QString&)));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	153 connect (m_filter_checkbox, SIGNAL (toggled (bool)),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	154 this, SLOT (filter_activate (bool)));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	155 connect (m_filter->lineEdit (), SIGNAL (editingFinished ()),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	156 this, SLOT (update_filter_history ()));
19538 e4b25475ef3d provide a filter for the workspace view (bug #41222) Torsten <ttl@justmail.de> parents: 19433 diff changeset	157
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	158 connect (m_view, SIGNAL (customContextMenuRequested (const QPoint&)),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	159 this, SLOT (contextmenu_requested (const QPoint&)));
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	160
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	161 connect (m_view, SIGNAL (activated (QModelIndex)),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	162 this, SLOT (handle_contextmenu_edit (void)));
23945 cf16f6521180 double clicking a variable in workspace view opens variable editor (bug #51843) Torsten <mttl@mailbox.org> parents: 23927 diff changeset	163
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	164 connect (this, SIGNAL (command_requested (const QString&)),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	165 p, SLOT (execute_command_in_terminal (const QString&)));
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23807 diff changeset	166
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	167 connect (this,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	168 SIGNAL (edit_variable_signal (const QString&, const octave_value&)),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	169 p, SLOT (edit_variable (const QString&, const octave_value&)));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	170 }
13577 e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13541 diff changeset	171
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	172 void workspace_view::setModel (workspace_model *model)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	173 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	174 m_filter_model.setSourceModel (model);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	175 m_filter_model.setFilterKeyColumn(0);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	176
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	177 m_view->setModel (&m_filter_model);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	178
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	179 // set the sorting after a model was set, it would be ignored otherwise
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	180 QSettings *settings = resource_manager::get_settings ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	181 m_view->sortByColumn (settings->value ("workspaceview/sort_by_column",0).toInt (),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	182 static_cast<Qt::SortOrder> (settings->value ("workspaceview/sort_order", Qt::AscendingOrder).toUInt ()));
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	183
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	184 m_model = model;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	185 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	186
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	187 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	188 workspace_view::notice_settings (const QSettings *settings)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	189 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	190 int i;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	191
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	192 m_model->notice_settings (settings); // update colors of model first
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	193
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	194 for (i = 0; i < m_columns_shown_keys.size (); i++)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	195 m_view->setColumnHidden (i + 1, ! settings->value (m_columns_shown_keys.at (i),true).toBool ());
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	196
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	197 QString tool_tip;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	198
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25623 diff changeset	199 if (settings->value (ws_enable_colors.key, ws_enable_colors.def).toBool ()
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25623 diff changeset	200 && ! settings->value (ws_hide_tool_tips.key, ws_hide_tool_tips.def).toBool ())
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	201 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	202 tool_tip = QString (tr ("View the variables in the active workspace.<br>"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	203 tool_tip += QString (tr ("Colors for variable attributes:"));
27033 c76dd670a7a5 automatic selection of foreground color in worspace view (bug #53995) Torsten Lilge <ttl-octave@mailbox.org> parents: 26661 diff changeset	204 int colors = resource_manager::storage_class_chars ().length ();
c76dd670a7a5 automatic selection of foreground color in worspace view (bug #53995) Torsten Lilge <ttl-octave@mailbox.org> parents: 26661 diff changeset	205 for (i = 0; i < colors; i++)
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	206 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	207 tool_tip +=
27033 c76dd670a7a5 automatic selection of foreground color in worspace view (bug #53995) Torsten Lilge <ttl-octave@mailbox.org> parents: 26661 diff changeset	208 QString (R"(<div style="background-color:%1;color:%2">%3</div>)")
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	209 .arg (m_model->storage_class_color (i).name ())
27033 c76dd670a7a5 automatic selection of foreground color in worspace view (bug #53995) Torsten Lilge <ttl-octave@mailbox.org> parents: 26661 diff changeset	210 .arg (m_model->storage_class_color (i + colors).name ())
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	211 .arg (resource_manager::storage_class_names ().at (i));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	212 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	213 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	214
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	215 setToolTip (tool_tip);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	216
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	217 m_columns_shown = QStringList ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	218 m_columns_shown.append (tr ("Class"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	219 m_columns_shown.append (tr ("Dimension"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	220 m_columns_shown.append (tr ("Value"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	221 m_columns_shown.append (tr ("Attribute"));
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	222
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	223 m_columns_shown_keys = QStringList ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	224 m_columns_shown_keys.append ("workspaceview/show_class");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	225 m_columns_shown_keys.append ("workspaceview/show_dimension");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	226 m_columns_shown_keys.append ("workspaceview/show_value");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	227 m_columns_shown_keys.append ("workspaceview/show_attribute");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	228 }
13577 e440b3f32f02 Fixed bug with closing subwindows. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13541 diff changeset	229
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	230 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	231 workspace_view::save_settings (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	232 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	233 QSettings *settings = resource_manager::get_settings ();
16463 8e2a853cdd7d derive workspace_view from octave_dock_widget; style fixes John W. Eaton <jwe@octave.org> parents: 16462 diff changeset	234
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	235 if (! settings)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	236 return;
22177 6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 21724 diff changeset	237
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	238 settings->setValue ("workspaceview/column_state",
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	239 m_view->horizontalHeader ()->saveState ());
19982 9a8be23d2c05 extend sorting of workspave view widget Torsten <ttl@justmail.de> parents: 19981 diff changeset	240
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	241 int sort_column = m_view->horizontalHeader ()->sortIndicatorSection ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	242 Qt::SortOrder sort_order = m_view->horizontalHeader ()->sortIndicatorOrder ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	243 settings->setValue ("workspaceview/sort_by_column", sort_column);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	244 settings->setValue ("workspaceview/sort_order", sort_order);
19982 9a8be23d2c05 extend sorting of workspave view widget Torsten <ttl@justmail.de> parents: 19981 diff changeset	245
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	246 settings->setValue ("workspaceview/filter_active",
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	247 m_filter_checkbox->isChecked ());
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	248 settings->setValue ("workspaceview/filter_shown", m_filter_shown);
19538 e4b25475ef3d provide a filter for the workspace view (bug #41222) Torsten <ttl@justmail.de> parents: 19433 diff changeset	249
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	250 QStringList mru;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	251 for (int i = 0; i < m_filter->count (); i++)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	252 mru.append (m_filter->itemText (i));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	253 settings->setValue ("workspaceview/mru_list", mru);
16463 8e2a853cdd7d derive workspace_view from octave_dock_widget; style fixes John W. Eaton <jwe@octave.org> parents: 16462 diff changeset	254
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	255 settings->sync ();
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	256
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	257 octave_dock_widget::save_settings ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	258 }
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16575 diff changeset	259
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	260 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	261 workspace_view::filter_update (const QString& expression)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	262 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	263 m_filter_model.setFilterWildcard (expression);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	264 handle_model_changed ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	265 }
19538 e4b25475ef3d provide a filter for the workspace view (bug #41222) Torsten <ttl@justmail.de> parents: 19433 diff changeset	266
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	267 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	268 workspace_view::filter_activate (bool state)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	269 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	270 m_filter->setEnabled (state);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	271 m_filter_model.setDynamicSortFilter (state);
19538 e4b25475ef3d provide a filter for the workspace view (bug #41222) Torsten <ttl@justmail.de> parents: 19433 diff changeset	272
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	273 if (state)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	274 filter_update (m_filter->currentText ());
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	275 else
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	276 filter_update (QString ());
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	277 }
19538 e4b25475ef3d provide a filter for the workspace view (bug #41222) Torsten <ttl@justmail.de> parents: 19433 diff changeset	278
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	279 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	280 workspace_view::update_filter_history (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	281 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	282 QString text = m_filter->currentText (); // get current text
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	283 int index = m_filter->findText (text); // and its actual index
19562 010cef260698 improve filter of workspace view Torsten <ttl@justmail.de> parents: 19539 diff changeset	284
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	285 if (index > -1)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	286 m_filter->removeItem (index); // remove if already existing
19538 e4b25475ef3d provide a filter for the workspace view (bug #41222) Torsten <ttl@justmail.de> parents: 19433 diff changeset	287
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	288 m_filter->insertItem (0, text); // (re)insert at beginning
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	289 m_filter->setCurrentIndex (0);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	290 }
19433 2f0c21339e9d values of variables in workspace view copyable (bug #43674) Torsten <ttl@justmail.de> parents: 19162 diff changeset	291
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	292 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	293 workspace_view::header_contextmenu_requested (const QPoint& mpos)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	294 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	295 QMenu menu (this);
27610 8586eb41abf5 improve memory management in workspace_view class John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	296 QSignalMapper sig_mapper (this);
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	297
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	298 QSettings *settings = resource_manager::get_settings ();
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	299
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	300 for (int i = 0; i < m_columns_shown.size (); i++)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	301 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	302 QAction *action = menu.addAction (m_columns_shown.at (i),
27610 8586eb41abf5 improve memory management in workspace_view class John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	303 &sig_mapper, SLOT (map ()));
8586eb41abf5 improve memory management in workspace_view class John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	304 sig_mapper.setMapping (action, i);
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	305 action->setCheckable (true);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	306 action->setChecked (settings->value (m_columns_shown_keys.at (i),true).toBool ());
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	307 }
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	308
27610 8586eb41abf5 improve memory management in workspace_view class John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	309 connect (&sig_mapper, SIGNAL (mapped (int)),
8586eb41abf5 improve memory management in workspace_view class John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	310 this, SLOT (toggle_header (int)));
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	311
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	312 menu.exec (m_view->mapToGlobal (mpos));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	313 }
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	314
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	315 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	316 workspace_view::toggle_header (int col)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	317 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	318 QSettings *settings = resource_manager::get_settings ();
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	319
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	320 QString key = m_columns_shown_keys.at (col);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	321 bool shown = settings->value (key,true).toBool ();
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	322
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	323 m_view->setColumnHidden (col + 1, shown);
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	324
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	325 settings->setValue (key, ! shown);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	326 settings->sync ();
22177 6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 21724 diff changeset	327
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	328 octave_dock_widget::save_settings ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	329 }
20641 2b0886f2c186 add possibility to hide columns of workspace view Torsten <ttl@justmail.de> parents: 20570 diff changeset	330
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	331 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	332 workspace_view::contextmenu_requested (const QPoint& qpos)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	333 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	334 QMenu menu (this);
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	335
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	336 QModelIndex index = m_view->indexAt (qpos);
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	337
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	338 // if it isnt Local, Glocal etc, allow the ctx menu
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	339 if (index.isValid () && index.column () == 0)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	340 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	341 QString var_name = get_var_name (index);
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	342
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	343 menu.addAction (tr ("Open in Variable Editor"), this,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	344 SLOT (handle_contextmenu_edit ()));
23945 cf16f6521180 double clicking a variable in workspace view opens variable editor (bug #51843) Torsten <mttl@mailbox.org> parents: 23927 diff changeset	345
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	346 menu.addAction (tr ("Copy name"), this,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	347 SLOT (handle_contextmenu_copy ()));
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	348
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	349 menu.addAction (tr ("Copy value"), this,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	350 SLOT (handle_contextmenu_copy_value ()));
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	351
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	352 QAction *rename = menu.addAction (tr ("Rename"), this,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	353 SLOT (handle_contextmenu_rename ()));
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	354
27192 8779c631d55f fix access to top_level info flag when creating workspace view context menu John W. Eaton <jwe@octave.org> parents: 27033 diff changeset	355 // Use m_model here instead of using "m_view->model ()" because
8779c631d55f fix access to top_level info flag when creating workspace view context menu John W. Eaton <jwe@octave.org> parents: 27033 diff changeset	356 // that points to the proxy model.
8779c631d55f fix access to top_level info flag when creating workspace view context menu John W. Eaton <jwe@octave.org> parents: 27033 diff changeset	357 if (! m_model->is_top_level ())
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	358 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	359 rename->setDisabled (true);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	360 rename->setToolTip (tr ("Only top-level symbols may be renamed"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	361 }
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	362
24775 3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	363 menu.addAction ("Clear " + var_name, this,
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	364 SLOT (handle_contextmenu_clear ()));
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	365
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	366 menu.addSeparator ();
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	367
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	368 menu.addAction ("disp (" + var_name + ')', this,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	369 SLOT (handle_contextmenu_disp ()));
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	370
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	371 menu.addAction ("plot (" + var_name + ')', this,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	372 SLOT (handle_contextmenu_plot ()));
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	373
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	374 menu.addAction ("stem (" + var_name + ')', this,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	375 SLOT (handle_contextmenu_stem ()));
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	376
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	377 menu.addSeparator ();
20570 734d446560a8 possibility to hide filters in history and workspace view (bug#45428) Torsten <ttl@justmail.de> parents: 20388 diff changeset	378
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	379 }
20570 734d446560a8 possibility to hide filters in history and workspace view (bug#45428) Torsten <ttl@justmail.de> parents: 20388 diff changeset	380
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	381 if (m_filter_shown)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	382 menu.addAction (tr ("Hide filter"), this,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	383 SLOT (handle_contextmenu_filter ()));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	384 else
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	385 menu.addAction (tr ("Show filter"), this,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	386 SLOT (handle_contextmenu_filter ()));
20570 734d446560a8 possibility to hide filters in history and workspace view (bug#45428) Torsten <ttl@justmail.de> parents: 20388 diff changeset	387
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	388 menu.exec (m_view->mapToGlobal (qpos));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	389 }
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	390
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	391 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	392 workspace_view::handle_contextmenu_copy (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	393 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	394 QModelIndex index = m_view->currentIndex ();
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	395
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	396 if (index.isValid ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	397 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	398 QString var_name = get_var_name (index);
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	399
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	400 QClipboard *clipboard = QApplication::clipboard ();
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	401
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	402 clipboard->setText (var_name);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	403 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	404 }
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	405
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	406 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	407 workspace_view::handle_contextmenu_copy_value (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	408 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	409 QModelIndex index = m_view->currentIndex ();
19433 2f0c21339e9d values of variables in workspace view copyable (bug #43674) Torsten <ttl@justmail.de> parents: 19162 diff changeset	410
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	411 if (index.isValid ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	412 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	413 QString var_name = get_var_name (index);
19433 2f0c21339e9d values of variables in workspace view copyable (bug #43674) Torsten <ttl@justmail.de> parents: 19162 diff changeset	414
27377 5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	415 emit interpreter_event
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	416 ([var_name] (interpreter& interp)
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	417 {
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	418 // INTERPRETER THREAD
27375 2fb37768085d mark locations in GUI that should be checked for thread safety John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	419
27377 5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	420 octave_value val = interp.varval (var_name.toStdString ());
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	421
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	422 if (val.is_undefined ())
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	423 val = 0;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	424
27377 5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	425 std::ostringstream buf;
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	426 val.print_raw (buf, true);
19433 2f0c21339e9d values of variables in workspace view copyable (bug #43674) Torsten <ttl@justmail.de> parents: 19162 diff changeset	427
27377 5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	428 // FIXME: is the following operation thread safe or should
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	429 // it be done with a signal/slot connection?
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	430
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	431 QClipboard *clipboard = QApplication::clipboard ();
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	432 clipboard->setText (QString::fromStdString (buf.str ()));
5ca84fb30205 use event manager to handle two more interpreter actions in GUI John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	433 });
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	434 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	435 }
19433 2f0c21339e9d values of variables in workspace view copyable (bug #43674) Torsten <ttl@justmail.de> parents: 19162 diff changeset	436
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	437 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	438 workspace_view::handle_contextmenu_rename (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	439 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	440 QModelIndex index = m_view->currentIndex ();
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	441
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	442 if (index.isValid ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	443 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	444 QString var_name = get_var_name (index);
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	445
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	446 QInputDialog *inputDialog = new QInputDialog ();
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	447
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	448 inputDialog->setOptions (QInputDialog::NoButtons);
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	449
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	450 bool ok = false;
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	451
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	452 QString new_name
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	453 = inputDialog->getText (nullptr, "Rename Variable", "New name:",
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	454 QLineEdit::Normal, var_name, &ok);
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	455
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	456 if (ok && ! new_name.isEmpty ())
27220 9a4a9fcc186b connect workspace view rename variable signal to main window slot John W. Eaton <jwe@octave.org> parents: 27192 diff changeset	457 emit rename_variable_signal (var_name, new_name);
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	458 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	459 }
16521 dbc7018be4be use context menu for workspace viewer rename and copy to clipboard operations John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	460
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	461 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	462 workspace_view::handle_contextmenu_edit (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	463 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	464 QModelIndex index = m_view->currentIndex ();
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23807 diff changeset	465
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	466 if (index.isValid ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	467 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	468 QString var_name = get_var_name (index);
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23807 diff changeset	469
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 25974 diff changeset	470 symbol_info_list syminfo = m_model->get_symbol_info ();
a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 25974 diff changeset	471 octave_value val = syminfo.varval (var_name.toStdString ());
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	472
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	473 emit edit_variable_signal (var_name, val);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	474 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	475 }
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23807 diff changeset	476
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	477 void
24775 3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	478 workspace_view::handle_contextmenu_clear (void)
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	479 {
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	480 relay_contextmenu_command ("clear", true);
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	481 }
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	482
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	483 void
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	484 workspace_view::handle_contextmenu_disp (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	485 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	486 relay_contextmenu_command ("disp");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	487 }
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	488
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	489 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	490 workspace_view::handle_contextmenu_plot (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	491 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	492 relay_contextmenu_command ("figure (); plot");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	493 }
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	494
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	495 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	496 workspace_view::handle_contextmenu_stem (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	497 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	498 relay_contextmenu_command ("figure (); stem");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	499 }
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	500
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	501 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	502 workspace_view::handle_contextmenu_filter (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	503 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	504 m_filter_shown = ! m_filter_shown;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	505 m_filter_widget->setVisible (m_filter_shown);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	506 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	507
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	508 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	509 workspace_view::handle_model_changed (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	510 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	511 // m_view->resizeRowsToContents ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	512 // Just modify those rows that have been added rather than go through
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	513 // the whole list. For-loop test will handle when number of rows reduced.
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	514 QFontMetrics fm = m_view->fontMetrics ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	515 int row_height = fm.height ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	516 int new_row_count = m_filter_model.rowCount ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	517 for (int i = m_view_previous_row_count; i < new_row_count; i++)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	518 m_view->setRowHeight (i, row_height);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	519 m_view_previous_row_count = new_row_count;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	520 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	521
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	522 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	523 workspace_view::copyClipboard ()
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	524 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	525 if (m_view->hasFocus ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	526 handle_contextmenu_copy ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	527 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	528
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	529 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	530 workspace_view::selectAll ()
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	531 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	532 if (m_view->hasFocus ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	533 m_view->selectAll ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	534 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23945 diff changeset	535
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	536 void
24775 3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	537 workspace_view::relay_contextmenu_command (const QString& cmdname, bool str)
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	538 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	539 QModelIndex index = m_view->currentIndex ();
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	540
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	541 if (index.isValid ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	542 {
24775 3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	543 QString var_name;
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	544
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	545 if (str)
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	546 var_name = "\'" + get_var_name (index) + "\'";
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	547 else
3da6c628873a clear variable via context menu of workspace view (bug #53149) Torsten <mttl@mailbox.org> parents: 24766 diff changeset	548 var_name = get_var_name (index);
16462 8c666c7b0e5d Added context menu to workspace variable display John Donoghue <john.donoghue@ieee.org> parents: 16459 diff changeset	549
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	550 emit command_requested (cmdname + " (" + var_name + ");");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	551 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	552 }
16572 17941fedd4ce Change workspace row height to font height. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16570 diff changeset	553
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	554 QString
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	555 workspace_view::get_var_name (const QModelIndex& index)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	556 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	557 // We are using a sort model proxy so m_model won't provide the
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	558 // correct ordering.
24648 1f1ac73910ab respect sorting in variable editor (bug #51843) John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	559
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	560 QAbstractItemModel *m = m_view->model ();
24648 1f1ac73910ab respect sorting in variable editor (bug #51843) John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	561
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	562 QMap<int, QVariant> item_data
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	563 = m->itemData (index.sibling (index.row (), 0));
19042 110702c507e3 user setting for hiding the tool tip in the workspace view (part of bug #42306) Torsten <ttl@justmail.de> parents: 18555 diff changeset	564
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	565 return item_data[0].toString ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24695 diff changeset	566 }
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16575 diff changeset	567 }

Mercurial > octave

annotate libgui/src/workspace-view.cc @ 27610:8586eb41abf5