octave: libgui/src/history-dock-widget.cc annotate

annotate libgui/src/history-dock-widget.cc @ 27620:45bb5bbaf291

don't use singleton pattern for resource manager in GUI Move ownership of the resource_manager object to the base_qobject class. Store reference to resource_manager object as a member variable in most objects that need to access it. Eliminate static member functions in resource_managar class. Provide a get_resource_manager method in the base_qboject class and a global __get_resource_manager__ function for those instances where we can't easily provide local access to the resource_manager object. There are many changes to many files, but most are straightforward.

author	John W. Eaton <jwe@octave.org>
date	Fri, 01 Nov 2019 18:16:49 -0400
parents	83c1d4f75a36
children	8b6e928e0705

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: 26116 diff changeset	3 Copyright (C) 2011-2019 Jacob Dawid
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	4
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24011 diff changeset	7 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	8 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: 24011 diff changeset	9 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	10 (at your option) any later version.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	12 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	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	15 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	16
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17 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	18 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: 24011 diff changeset	19 <https://www.gnu.org/licenses/>.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	20
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21 */
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21568 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	24 # include "config.h"
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14814 diff changeset	25 #endif
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14814 diff changeset	26
15447 352349219529 Added multiline copy and execution to command history in IDE (bug #36884) John Swensen <jpswensen@gmail.com> parents: 15402 diff changeset	27 #include <QApplication>
352349219529 Added multiline copy and execution to command history in IDE (bug #36884) John Swensen <jpswensen@gmail.com> parents: 15402 diff changeset	28 #include <QClipboard>
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	29 #include <QCompleter>
a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	30 #include <QLabel>
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	31 #include <QMenu>
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	32 #include <QScrollBar>
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	33 #include <QVBoxLayout>
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	34
27560 3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27478 diff changeset	35 #include "gui-preferences-cs.h"
3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27478 diff changeset	36 #include "gui-preferences-global.h"
27615 83c1d4f75a36 use symbolic constants for preferences key/default in history viewer Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	37 #include "gui-preferences-hw.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	38 #include "history-dock-widget.h"
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	39 #include "resource-manager.h"
15340 9d0cdd49054b keep history in gui widget at bottom when new items are added John W. Eaton <jwe@octave.org> parents: 15318 diff changeset	40
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	41 #include "cmd-hist.h"
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	42
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	43 #include "error.h"
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	44
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	45 namespace octave
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	46 {
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27615 diff changeset	47 history_dock_widget::history_dock_widget (QWidget *p, resource_manager& rmgr)
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27615 diff changeset	48 : octave_dock_widget ("HistoryDockWidget", p, rmgr)
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	49 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	50 setStatusTip (tr ("Browse and search the command history."));
16455 38ed6bdd1f7f move signal/slot connections from main window to sub window where possible John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	51
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	52 connect (this, SIGNAL (command_create_script (const QString&)),
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	53 p, SLOT (new_file (const QString&)));
16447 e3b33a7530bc improve encapsulation of history window object John W. Eaton <jwe@octave.org> parents: 16441 diff changeset	54
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	55 connect (this, SIGNAL (information (const QString&)),
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	56 p, SLOT (report_status_message (const QString&)));
16447 e3b33a7530bc improve encapsulation of history window object John W. Eaton <jwe@octave.org> parents: 16441 diff changeset	57
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	58 connect (this, SIGNAL (command_double_clicked (const QString&)),
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	59 p, SLOT (execute_command_in_terminal (const QString&)));
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	60
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	61 construct ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	62 }
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	63
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	64 void history_dock_widget::set_history (const QStringList& hist)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	65 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	66 m_history_model->setStringList (hist);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	67 m_history_list_view->scrollToBottom ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	68 }
15447 352349219529 Added multiline copy and execution to command history in IDE (bug #36884) John Swensen <jpswensen@gmail.com> parents: 15402 diff changeset	69
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	70 void history_dock_widget::append_history (const QString& hist_entry)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	71 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	72 QStringList lst = m_history_model->stringList ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	73 lst.append (hist_entry);
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	74
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	75 QScrollBar *scroll_bar = m_history_list_view->verticalScrollBar ();
13495 11e03a76d8c0 Added source files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	76
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	77 bool at_bottom = scroll_bar->maximum () - scroll_bar->value () < 1;
20570 734d446560a8 possibility to hide filters in history and workspace view (bug#45428) Torsten <ttl@justmail.de> parents: 20392 diff changeset	78
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	79 m_history_model->setStringList (lst);
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	80
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	81 // Scroll if slider position at bottom.
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	82 if (at_bottom)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	83 m_history_list_view->scrollToBottom ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	84 }
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	85
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	86 void history_dock_widget::clear_history (void)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	87 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	88 m_history_model->setStringList (QStringList ());
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	89 }
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13518 diff changeset	90
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	91 void history_dock_widget::save_settings (void)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	92 {
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27615 diff changeset	93 gui_settings *settings = m_resource_manager.get_settings ();
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	94
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	95 if (! settings)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	96 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	97
27615 83c1d4f75a36 use symbolic constants for preferences key/default in history viewer Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	98 settings->setValue (hw_filter_active.key, m_filter_checkbox->isChecked ());
83c1d4f75a36 use symbolic constants for preferences key/default in history viewer Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	99 settings->setValue (hw_filter_shown.key, m_filter_shown);
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	100
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	101 QStringList mru;
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	102 for (int i = 0; i < m_filter->count (); i++)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	103 mru.append (m_filter->itemText (i));
27615 83c1d4f75a36 use symbolic constants for preferences key/default in history viewer Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	104 settings->setValue (hw_mru_list.key, mru);
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	105
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	106 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	107
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	108 octave_dock_widget::save_settings ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	109 }
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	110
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	111 void history_dock_widget::update_filter_history (void)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	112 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	113 QString text = m_filter->currentText (); // get current text
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	114 int index = m_filter->findText (text); // and its actual index
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	115
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	116 if (index > -1)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	117 m_filter->removeItem (index); // remove if already existing
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	118
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	119 m_filter->insertItem (0, text); // (re)insert at beginning
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	120 m_filter->setCurrentIndex (0);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	121 }
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	122
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	123 void history_dock_widget::filter_activate (bool state)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	124 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	125 m_filter->setEnabled (state);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	126 m_sort_filter_proxy_model.setDynamicSortFilter (state);
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	127
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	128 if (state)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	129 m_sort_filter_proxy_model.setFilterWildcard (m_filter->currentText ());
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	130 else
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	131 m_sort_filter_proxy_model.setFilterWildcard (QString ());
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	132 }
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	133
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	134 void history_dock_widget::ctxMenu (const QPoint& xpos)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	135 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	136 QMenu menu (this);
19563 a402493c0605 provide the same filter for history view as for workspace view Torsten <ttl@justmail.de> parents: 18732 diff changeset	137
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	138 QModelIndex index = m_history_list_view->indexAt (xpos);
20392 a8cc8318da8c show history context menu only for clicks on entries Torsten <ttl@justmail.de> parents: 19908 diff changeset	139
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	140 if (index.isValid () && index.column () == 0)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	141 {
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27615 diff changeset	142 menu.addAction (m_resource_manager.icon ("edit-copy"),
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	143 tr ("Copy"), this, SLOT (handle_contextmenu_copy (bool)));
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	144 menu.addAction (tr ("Evaluate"), this,
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	145 SLOT (handle_contextmenu_evaluate (bool)));
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27615 diff changeset	146 menu.addAction (m_resource_manager.icon ("document-new"),
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	147 tr ("Create script"), this,
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	148 SLOT (handle_contextmenu_create_script (bool)));
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	149 }
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	150 if (m_filter_shown)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	151 menu.addAction (tr ("Hide filter"), this,
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	152 SLOT (handle_contextmenu_filter ()));
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	153 else
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	154 menu.addAction (tr ("Show filter"), this,
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	155 SLOT (handle_contextmenu_filter ()));
20570 734d446560a8 possibility to hide filters in history and workspace view (bug#45428) Torsten <ttl@justmail.de> parents: 20392 diff changeset	156
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	157 menu.exec (m_history_list_view->mapToGlobal (xpos));
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	158 }
15447 352349219529 Added multiline copy and execution to command history in IDE (bug #36884) John Swensen <jpswensen@gmail.com> parents: 15402 diff changeset	159
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	160 void history_dock_widget::handle_double_click (QModelIndex modelIndex)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	161 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	162 emit command_double_clicked (modelIndex.data ().toString ());
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	163 }
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	164
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	165 void history_dock_widget::handle_contextmenu_copy (bool)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	166 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	167 QString text;
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	168 QItemSelectionModel *selectionModel = m_history_list_view->selectionModel ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	169 QModelIndexList rows = selectionModel->selectedRows ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	170 bool prev_valid_row = false;
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	171 for (auto it = rows.begin (); it != rows.end (); it++)
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	172 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	173 if ((*it).isValid ())
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	174 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	175 if (prev_valid_row)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	176 text += '\n';
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	177 text += (*it).data ().toString ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	178 prev_valid_row = true;
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	179 }
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	180 }
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	181 QApplication::clipboard ()->setText (text);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	182 }
15447 352349219529 Added multiline copy and execution to command history in IDE (bug #36884) John Swensen <jpswensen@gmail.com> parents: 15402 diff changeset	183
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	184 void history_dock_widget::handle_contextmenu_evaluate (bool)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	185 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	186 QItemSelectionModel *selectionModel = m_history_list_view->selectionModel ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	187 QModelIndexList rows = selectionModel->selectedRows ();
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	188 for (auto it = rows.begin () ; it != rows.end (); it++)
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	189 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	190 if ((*it).isValid ())
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	191 emit command_double_clicked ((*it).data ().toString ());
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	192 }
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	193 }
15447 352349219529 Added multiline copy and execution to command history in IDE (bug #36884) John Swensen <jpswensen@gmail.com> parents: 15402 diff changeset	194
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	195 void history_dock_widget::handle_contextmenu_create_script (bool)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	196 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	197 QString text;
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	198 QItemSelectionModel *selectionModel = m_history_list_view->selectionModel ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	199 QModelIndexList rows = selectionModel->selectedRows ();
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16447 diff changeset	200
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	201 bool prev_valid_row = false;
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	202 for (auto it = rows.begin (); it != rows.end (); it++)
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	203 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	204 if ((*it).isValid ())
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	205 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	206 if (prev_valid_row)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	207 text += '\n';
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	208 text += (*it).data ().toString ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	209 prev_valid_row = true;
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	210 }
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	211 }
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16447 diff changeset	212
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	213 if (text.length () > 0)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	214 emit command_create_script (text);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	215 }
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16447 diff changeset	216
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	217 void history_dock_widget::handle_contextmenu_filter (void)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	218 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	219 m_filter_shown = ! m_filter_shown;
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	220 m_filter_widget->setVisible (m_filter_shown);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	221 }
14720 cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	222
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	223 void history_dock_widget::copyClipboard (void)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	224 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	225 if (m_history_list_view->hasFocus ())
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	226 handle_contextmenu_copy (true);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	227 if (m_filter->lineEdit ()->hasFocus ()
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	228 && m_filter->lineEdit ()->hasSelectedText ())
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	229 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	230 QClipboard *clipboard = QApplication::clipboard ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	231 clipboard->setText (m_filter->lineEdit ()->selectedText ());
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	232 }
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	233 }
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16798 diff changeset	234
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	235 void history_dock_widget::pasteClipboard (void)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	236 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	237 if (m_filter->lineEdit ()->hasFocus ())
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	238 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	239 QClipboard *clipboard = QApplication::clipboard ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	240 QString str = clipboard->text ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	241 if (str.length () > 0)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	242 m_filter->lineEdit ()->insert (str);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	243 }
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	244 }
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16798 diff changeset	245
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	246 void history_dock_widget::selectAll (void)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	247 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	248 if (m_filter->lineEdit ()->hasFocus ())
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	249 m_filter->lineEdit ()->selectAll ();
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	250
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	251 if (m_history_list_view->hasFocus ())
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	252 m_history_list_view->selectAll ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	253 }
20692 950c8a092db7 check whether filter is active or not when history widget becomes visible Torsten <ttl@justmail.de> parents: 20392 diff changeset	254
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	255 void history_dock_widget::handle_visibility (bool visible)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	256 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	257 octave_dock_widget::handle_visibility (visible);
20692 950c8a092db7 check whether filter is active or not when history widget becomes visible Torsten <ttl@justmail.de> parents: 20392 diff changeset	258
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	259 if (visible)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	260 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	261 int filter_state = m_filter_checkbox->isChecked ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	262 filter_activate (filter_state);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	263 }
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	264 }
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	265
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	266 void history_dock_widget::construct (void)
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	267 {
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	268 m_history_model = new QStringListModel ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	269 m_sort_filter_proxy_model.setSourceModel (m_history_model);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	270 m_history_list_view = new QListView (this);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	271 m_history_list_view->setModel (&m_sort_filter_proxy_model);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	272 m_history_list_view->setAlternatingRowColors (true);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	273 m_history_list_view->setEditTriggers (QAbstractItemView::NoEditTriggers);
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26871 diff changeset	274 m_history_list_view->setStatusTip
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26871 diff changeset	275 (tr ("Double-click a command to transfer it to the Command Window."));
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	276 m_history_list_view->setSelectionMode (QAbstractItemView::ExtendedSelection);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	277 m_history_list_view->setContextMenuPolicy (Qt::CustomContextMenu);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	278 connect (m_history_list_view,
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	279 SIGNAL (customContextMenuRequested (const QPoint &)), this,
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	280 SLOT (ctxMenu (const QPoint &)));
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	281
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	282 m_filter = new QComboBox (this);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	283 m_filter->setToolTip (tr ("Enter text to filter the command history"));
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	284 m_filter->setEditable (true);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	285 m_filter->setMaxCount (MaxFilterHistory);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	286 m_filter->setInsertPolicy (QComboBox::NoInsert);
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26871 diff changeset	287 m_filter->setSizeAdjustPolicy
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26871 diff changeset	288 (QComboBox::AdjustToMinimumContentsLengthWithIcon);
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	289 QSizePolicy sizePol (QSizePolicy::Expanding, QSizePolicy::Preferred);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	290 m_filter->setSizePolicy (sizePol);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	291 m_filter->completer ()->setCaseSensitivity (Qt::CaseSensitive);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	292
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	293 QLabel *filter_label = new QLabel (tr ("Filter"));
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	294
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	295 m_filter_checkbox = new QCheckBox ();
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	296
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	297 setWindowIcon (QIcon (":/actions/icons/logo.png"));
25508 3edae6ba1fcd use a custom title bar widget for the main dock widgets Torsten <mttl@mailbox.org> parents: 25469 diff changeset	298 set_title (tr ("Command History"));
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	299 setWidget (new QWidget ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	300
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	301 m_filter_widget = new QWidget (this);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	302 QHBoxLayout *filter_layout = new QHBoxLayout ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	303 filter_layout->addWidget (filter_label);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	304 filter_layout->addWidget (m_filter_checkbox);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	305 filter_layout->addWidget (m_filter);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	306 filter_layout->setMargin(0);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	307 m_filter_widget->setLayout (filter_layout);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	308
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	309 QVBoxLayout *hist_layout = new QVBoxLayout ();
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	310 hist_layout->addWidget (m_filter_widget);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	311 hist_layout->addWidget (m_history_list_view);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	312
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	313 hist_layout->setMargin (2);
27478 9e526393d80a reduced vertical space in gui with responsive toolbar buttons (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	314 hist_layout->setSpacing (0);
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	315 widget ()->setLayout (hist_layout);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	316
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	317 // Init state of the filter
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27615 diff changeset	318 gui_settings *settings = m_resource_manager.get_settings ();
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	319
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	320 m_filter_shown
27615 83c1d4f75a36 use symbolic constants for preferences key/default in history viewer Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	321 = settings->value (hw_filter_shown.key, hw_filter_shown.def).toBool ();
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	322 m_filter_widget->setVisible (m_filter_shown);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	323
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26871 diff changeset	324 m_filter->addItems
27615 83c1d4f75a36 use symbolic constants for preferences key/default in history viewer Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	325 (settings->value (hw_mru_list.key, hw_mru_list.def).toStringList ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	326
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	327 bool filter_state
27615 83c1d4f75a36 use symbolic constants for preferences key/default in history viewer Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	328 = settings->value (hw_filter_active.key, hw_filter_active.def).toBool ();
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	329 m_filter_checkbox->setChecked (filter_state);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	330 filter_activate (filter_state);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	331
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	332 // Connect signals and slots
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	333 connect (m_filter, SIGNAL (editTextChanged (const QString&)),
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	334 &m_sort_filter_proxy_model,
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	335 SLOT (setFilterWildcard (const QString&)));
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	336 connect (m_filter_checkbox, SIGNAL (toggled (bool)),
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	337 this, SLOT (filter_activate (bool)));
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	338 connect (m_filter->lineEdit (), SIGNAL (editingFinished (void)),
26116 e67016aee030 fix slot name for signal connection in history widget John W. Eaton <jwe@octave.org> parents: 25508 diff changeset	339 this, SLOT (update_filter_history (void)));
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	340
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	341 connect (m_history_list_view, SIGNAL (doubleClicked (QModelIndex)),
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	342 this, SLOT (handle_double_click (QModelIndex)));
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	343
24733 e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	344 m_history_list_view->setTextElideMode (Qt::ElideRight);
e15d53d2de1e move more GUI classse inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	345 }
26871 9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	346
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27583 diff changeset	347 void history_dock_widget::notice_settings (const gui_settings *settings)
26871 9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	348 {
9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	349 QFont font = QFont ();
9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	350
9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	351 font.setStyleHint (QFont::TypeWriter);
9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	352 QString default_font = settings->value (global_mono_font.key, global_mono_font.def).toString ();
9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	353
9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	354 font.setFamily (settings->value (cs_font.key, default_font).toString ());
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	355 font.setPointSize (settings->value (cs_font_size.key, cs_font_size.def).toInt ());
26871 9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	356
9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	357 m_history_list_view->setFont (font);
9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	358 }
9590067f59dd display history list in fixed-width font (bug #55872) Torsten Lilge <ttl-octave@mailbox.org> parents: 26376 diff changeset	359
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23787 diff changeset	360 }

Mercurial > octave

annotate libgui/src/history-dock-widget.cc @ 27620:45bb5bbaf291