octave: libgui/src/m-editor/file-editor.cc annotate

annotate libgui/src/m-editor/file-editor.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	0495b64288f7
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: 26109 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: 24484 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: 22737 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: 24484 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: 22737 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: 22737 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: 22737 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22737 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: 24484 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 */
13501 86d6c3b90ad7 Added new gui 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: 21650 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"
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	25 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	26
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21650 diff changeset	27 #if defined (HAVE_QSCINTILLA)
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	28
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	29 #include <QApplication>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	30 #include <QFile>
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22179 diff changeset	31 #include <QFileDialog>
13584 e76a22bfe406 editor: added bookmark feature ttl <ttl@justmail.de> parents: 13566 diff changeset	32 #include <QFont>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	33 #include <QMessageBox>
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22179 diff changeset	34 #include <QMimeData>
2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22179 diff changeset	35 #include <QProcess>
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 24731 diff changeset	36 #include <QPushButton>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	37 #include <QStyle>
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22179 diff changeset	38 #include <QTabBar>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	39 #include <QTextStream>
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22179 diff changeset	40 #include <QVBoxLayout>
18656 1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18651 diff changeset	41 #include <Qsci/qscicommandset.h>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	42
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27404 diff changeset	43 #include "file-editor.h"
27560 3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27556 diff changeset	44 #include "gui-preferences-ed.h"
3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27556 diff changeset	45 #include "gui-preferences-global.h"
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	46 #include "main-window.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27404 diff changeset	47 #include "resource-manager.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27404 diff changeset	48 #include "shortcut-manager.h"
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	49
27404 a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	50 #include "oct-env.h"
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	51
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	52 #include "event-manager.h"
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	53 #include "interpreter.h"
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	54 #include "oct-map.h"
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	55 #include "pt-eval.h"
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	56 #include "utils.h"
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	57
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	58 namespace octave
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	59 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	60 // Functions of the the reimplemented tab widget
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	61
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	62 file_editor_tab_widget::file_editor_tab_widget (QWidget *p)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	63 : QTabWidget (p)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	64 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	65 tab_bar *bar = new tab_bar (this);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	66
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	67 connect (bar, SIGNAL (close_current_tab_signal (bool)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	68 p->parent (), SLOT (request_close_file (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	69
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	70 this->setTabBar (bar);
24713 36cd70fc2d63 style fixes for file editor Torsten <mttl@mailbox.org> parents: 24679 diff changeset	71
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	72 setTabsClosable (true);
27054 1e70f1fe7c0e always use scroll buttons in case of too many tabs (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	73 setUsesScrollButtons (true);
24713 36cd70fc2d63 style fixes for file editor Torsten <mttl@mailbox.org> parents: 24679 diff changeset	74 #if defined (HAVE_QTABWIDGET_SETMOVABLE)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	75 setMovable (true);
24713 36cd70fc2d63 style fixes for file editor Torsten <mttl@mailbox.org> parents: 24679 diff changeset	76 #endif
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	77 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	78
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	79 tab_bar * file_editor_tab_widget::get_tab_bar (void) const
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	80 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	81 return qobject_cast<tab_bar *> (tabBar ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	82 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	83
24713 36cd70fc2d63 style fixes for file editor Torsten <mttl@mailbox.org> parents: 24679 diff changeset	84
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	85 // File editor
24713 36cd70fc2d63 style fixes for file editor Torsten <mttl@mailbox.org> parents: 24679 diff changeset	86
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	87 file_editor::file_editor (QWidget *p, resource_manager& rmgr)
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	88 : file_editor_interface (p, rmgr)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	89 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	90 // Set current editing directory before construct because loaded
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	91 // files will change ced accordingly.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	92 m_ced = QDir::currentPath ();
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	93
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	94 // set action that are later added by the main window to null,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	95 // preventing access to them when they are still undefined
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	96 m_undo_action = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	97 m_copy_action = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	98 m_paste_action = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	99 m_selectall_action = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	100 m_closed = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	101 m_no_focus = false;
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	102
27075 fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	103 m_copy_action_enabled = false;
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	104 m_undo_action_enabled = false;
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	105
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	106 construct ();
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	107
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	108 // actions that should also be available in the find dialog
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	109 m_fetab_actions << m_find_next_action;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	110 m_fetab_actions << m_find_previous_action;
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	111
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	112 setVisible (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	113 setAcceptDrops (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	114 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	115
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	116 file_editor::~file_editor (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	117 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	118 delete m_mru_file_menu;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	119 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	120
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	121 // insert global actions, that should also be displayed in the editor window,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	122 // into the editor's menu and/or toolbar
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	123 void file_editor::insert_global_actions (QList<QAction*> shared_actions)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	124 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	125 // actions/menus that have to be added to the toolbar or the menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	126 QAction *open_action = shared_actions.at (OPEN_ACTION);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	127 QAction *new_action = shared_actions.at (NEW_SCRIPT_ACTION);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	128 QAction *new_fcn_action = shared_actions.at (NEW_FUNCTION_ACTION);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	129 m_fileMenu->insertAction (m_mru_file_menu->menuAction (), open_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	130 m_fileMenu->insertAction (open_action, new_fcn_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	131 m_fileMenu->insertAction (new_fcn_action, new_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	132 m_tool_bar->insertAction (m_popdown_mru_action, open_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	133 m_tool_bar->insertAction (open_action, new_action);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	134
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	135 // actions that are additionally enabled/disabled later by the editor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	136 // undo
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	137 m_undo_action = shared_actions.at (UNDO_ACTION);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	138 m_tool_bar->insertAction (m_redo_action,m_undo_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	139 m_edit_menu->insertAction (m_redo_action,m_undo_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	140 // select all
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	141 m_selectall_action = shared_actions.at (SELECTALL_ACTION);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	142 m_edit_menu->insertAction (m_find_action,m_selectall_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	143 m_edit_menu->insertSeparator (m_find_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	144 // paste
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	145 m_paste_action = shared_actions.at (PASTE_ACTION);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	146 m_tool_bar->insertAction (m_find_action,m_paste_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	147 m_edit_menu->insertAction (m_selectall_action,m_paste_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	148 m_edit_menu->insertSeparator (m_selectall_action);
27074 d302dfa0c572 fix order of cut, copy paste actions in editor menu and toolbar (bug #56230) Torsten Lilge <ttl-octave@mailbox.org> parents: 27055 diff changeset	149 // copy
d302dfa0c572 fix order of cut, copy paste actions in editor menu and toolbar (bug #56230) Torsten Lilge <ttl-octave@mailbox.org> parents: 27055 diff changeset	150 m_copy_action = shared_actions.at (COPY_ACTION);
d302dfa0c572 fix order of cut, copy paste actions in editor menu and toolbar (bug #56230) Torsten Lilge <ttl-octave@mailbox.org> parents: 27055 diff changeset	151 m_tool_bar->insertAction (m_paste_action,m_copy_action);
d302dfa0c572 fix order of cut, copy paste actions in editor menu and toolbar (bug #56230) Torsten Lilge <ttl-octave@mailbox.org> parents: 27055 diff changeset	152 m_edit_menu->insertAction (m_paste_action,m_copy_action);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	153 // find files
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	154 m_find_files_action = shared_actions.at (FIND_FILES_ACTION);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	155 m_edit_menu->insertAction (m_find_action, m_find_files_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	156 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	157
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	158 void file_editor::handle_enter_debug_mode (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	159 {
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	160 gui_settings *settings = m_resource_manager.get_settings ();
26875 ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	161 QString sc_run = settings->value ("shortcuts/editor_run:run_file").toString ();
ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	162 QString sc_cont = settings->value ("shortcuts/main_debug:continue").toString ();
ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	163
ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	164 if (sc_run == sc_cont)
ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	165 m_run_action->setShortcut (QKeySequence ()); // prevent ambigous shortcuts
ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	166
ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	167 m_run_action->setToolTip (tr ("Continue")); // update tool tip
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	168 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	169
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	170 void file_editor::handle_exit_debug_mode (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	171 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	172 shortcut_manager::set_shortcut (m_run_action, "editor_run:run_file");
26875 ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	173 m_run_action->setToolTip (tr ("Save File and Run")); // update tool tip
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	174 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	175
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	176 void file_editor::check_actions (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	177 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	178 bool have_tabs = m_tab_widget->count () > 0;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	179
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	180 m_edit_cmd_menu->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	181 m_edit_fmt_menu->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	182 m_edit_nav_menu->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	183
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	184 m_comment_selection_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	185 m_uncomment_selection_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	186 m_comment_var_selection_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	187 m_indent_selection_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	188 m_unindent_selection_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	189 m_smart_indent_line_or_selection_action->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	190
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	191 m_context_help_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	192 m_context_doc_action->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	193
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	194 m_view_editor_menu->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	195 m_zoom_in_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	196 m_zoom_out_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	197 m_zoom_normal_action->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	198
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	199 m_find_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	200 m_find_next_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	201 m_find_previous_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	202 m_print_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	203 m_run_action->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	204
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	205 m_edit_function_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	206 m_save_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	207 m_save_as_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	208 m_close_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	209 m_close_all_action->setEnabled (have_tabs);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	210 m_close_others_action->setEnabled (have_tabs && m_tab_widget->count () > 1);
27330 e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	211 m_sort_tabs_action->setEnabled (have_tabs && m_tab_widget->count () > 1);
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26561 diff changeset	212
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26561 diff changeset	213 emit editor_tabs_changed_signal (have_tabs);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	214 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	215
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	216 // empty_script determines whether we have to create an empty script
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	217 // 1. At startup, when the editor has to be (really) visible
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	218 // (Here we can not use the visibility changed signal)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	219 // 2. When the editor becomes visible when octave is running
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	220 void file_editor::empty_script (bool startup, bool visible)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	221 {
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	222 gui_settings *settings = m_resource_manager.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	223 if (settings->value ("useCustomFileEditor",false).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	224 return; // do not open an empty script in the external editor
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	225
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	226 bool real_visible;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	227
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	228 if (startup)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	229 real_visible = isVisible ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	230 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	231 real_visible = visible;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	232
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	233 if (! real_visible \|\| m_tab_widget->count () > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	234 return;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	235
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	236 if (startup && ! isFloating ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	237 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	238 // check is editor is really visible or hidden between tabbed widgets
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	239 QList<QTabBar > tab_list = main_win ()->findChildren<QTabBar >();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	240
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	241 bool in_tab = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	242 int i = 0;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	243 while ((i < tab_list.count ()) && (! in_tab))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	244 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	245 QTabBar *tab = tab_list.at (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	246 i++;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	247
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	248 int j = 0;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	249 while ((j < tab->count ()) && (! in_tab))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	250 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	251 // check all tabs for the editor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	252 if (tab->tabText (j) == windowTitle ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	253 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	254 // editor is in this tab widget
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	255 in_tab = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	256 int top = tab->currentIndex ();
26554 8d2e8d5d617d fixed dead assignments in libgui (bug #55440) Torsten <mttl@mailbox.org> parents: 26524 diff changeset	257 if (! (top > -1 && tab->tabText (top) == windowTitle ()))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	258 return; // not current tab -> not visible
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	259 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	260 j++;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	261 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	262 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	263 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	264
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	265 request_new_file ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	266 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	267
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27605 diff changeset	268 void file_editor::restore_session (gui_settings *settings)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	269 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	270 //restore previous session
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	271 if (! settings->value ("editor/restoreSession", true).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	272 return;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	273
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	274 // get the data from the settings file
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	275 QStringList sessionFileNames
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	276 = settings->value (ed_session_names.key, ed_session_names.def)
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	277 .toStringList ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	278
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	279 QStringList session_encodings
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	280 = settings->value (ed_session_enc.key, ed_session_enc.def)
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	281 .toStringList ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	282
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	283 QStringList session_index
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	284 = settings->value (ed_session_ind.key, ed_session_ind.def)
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	285 .toStringList ();
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	286
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	287 QStringList session_lines
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	288 = settings->value (ed_session_lines.key, ed_session_lines.def)
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	289 .toStringList ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	290
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	291 // fill a list of the struct and sort it (depending on index)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	292 QList<session_data> s_data;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	293
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	294 bool do_encoding = (session_encodings.count () == sessionFileNames.count ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	295 bool do_index = (session_index.count () == sessionFileNames.count ());
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	296 bool do_lines = (session_lines.count () == sessionFileNames.count ());
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	297
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	298 for (int n = 0; n < sessionFileNames.count (); ++n)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	299 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	300 QFileInfo file = QFileInfo (sessionFileNames.at (n));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	301 if (! file.exists ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	302 continue;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	303
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	304 session_data item = { 0, -1, sessionFileNames.at (n),
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	305 QString (), QString ()};
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	306 if (do_lines)
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	307 item.line = session_lines.at (n).toInt ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	308 if (do_index)
25293 ae0518976e2b open files in correct order when restoring editor session (bug #53711) Torsten <mttl@mailbox.org> parents: 25274 diff changeset	309 item.index = session_index.at (n).toInt ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	310 if (do_encoding)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	311 item.encoding = session_encodings.at (n);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	312
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	313 s_data << item;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	314 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	315
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	316 qSort (s_data);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	317
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	318 // finally open the file with the desired encoding in the desired order
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	319 for (int n = 0; n < s_data.count (); ++n)
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	320 request_open_file (s_data.at (n).file_name, s_data.at (n).encoding,
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	321 s_data.at (n).line);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	322 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	323
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	324 void file_editor::activate (void)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	325 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	326 if (m_no_focus)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	327 return; // No focus for the editor if external open/close request
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	328
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	329 octave_dock_widget::activate ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	330
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	331 // set focus to current tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	332 QWidget *fileEditorTab = m_tab_widget->currentWidget ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	333 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	334 emit fetab_set_focus (fileEditorTab);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	335 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	336
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	337 void file_editor::set_focus (QWidget *fet)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	338 {
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	339 setFocus ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	340
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	341 // set focus to desired tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	342 if (fet)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	343 m_tab_widget->setCurrentWidget (fet);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	344 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	345
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	346 // function enabling/disabling the menu accelerators depending on the
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	347 // focus of the editor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	348 void file_editor::enable_menu_shortcuts (bool enable)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	349 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	350 QHash<QMenu*, QStringList>::const_iterator i = m_hash_menu_text.constBegin ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	351
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	352 while (i != m_hash_menu_text.constEnd ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	353 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	354 i.key ()->setTitle (i.value ().at (! enable));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	355 ++i;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	356 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	357
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	358 // when editor loses focus, enable the actions, which are always active
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	359 // in the main window due to missing info on selected text and undo actions
27075 fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	360 if (m_copy_action && m_undo_action)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	361 {
27075 fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	362 if (enable)
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	363 {
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	364 m_copy_action->setEnabled (m_copy_action_enabled);
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	365 m_undo_action->setEnabled (m_undo_action_enabled);
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	366 }
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	367 else
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	368 {
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	369 m_copy_action_enabled = m_copy_action->isEnabled ();
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	370 m_undo_action_enabled = m_undo_action->isEnabled ();
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	371 m_copy_action->setEnabled (true);
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	372 m_undo_action->setEnabled (true);
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	373 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	374 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	375 }
19411 ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19314 diff changeset	376
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	377 bool file_editor::check_closing (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	378 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	379 // When the application or the editor is closing and the user wants to close
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	380 // all files in the latter case all editor tabs are checked whether
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	381 // they need to be saved. During these ckecked the tabs are not closed
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	382 // since the user might cancel closing octave during one of these saving
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	383 // dialogs. Therefore, saving the session for restoring at next start
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	384 // is not done before the application is definitely closing
21054 221847e5f488 fix issues when restoring breakpoints and closing tabs or whole application Torsten <ttl@justmail.de> parents: 21002 diff changeset	385
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	386 // Have all file editor tabs signal what their filenames are.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	387 m_editor_tab_map.clear ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	388 emit fetab_file_name_query (nullptr);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	389
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	390 // Save all tabs with confirmation.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	391 file_editor_tab::reset_cancel ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	392 emit fetab_check_modified_file ();
21054 221847e5f488 fix issues when restoring breakpoints and closing tabs or whole application Torsten <ttl@justmail.de> parents: 21002 diff changeset	393
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	394 // If there was a cancellation, make the already saved/discarded tabs
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	395 // recovering from the exit by removing the read-only state and by
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	396 // recovering the debugger breakpoints. Finally return false in order to
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	397 // cancel closing the application or the editor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	398 if (file_editor_tab::was_cancelled ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	399 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	400 emit fetab_recover_from_exit ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	401 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	402 }
21054 221847e5f488 fix issues when restoring breakpoints and closing tabs or whole application Torsten <ttl@justmail.de> parents: 21002 diff changeset	403
27605 60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	404 // Wait for all editor tabs to have saved their files if required
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	405 m_number_of_tabs = m_editor_tab_map.size ();
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	406
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	407 for (auto p = m_editor_tab_map.cbegin ();
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	408 p != m_editor_tab_map.cend (); p++)
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	409 {
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	410 QString file_name = p->first; // get file name of tab
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	411 connect (static_cast<file_editor_tab *> (m_editor_tab_map[file_name].fet_ID),
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	412 SIGNAL (tab_ready_to_close (void)),
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	413 this, SLOT (handle_tab_ready_to_close (void)));
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	414 }
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	415
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	416 return true;
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	417 }
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	418
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	419 void file_editor::handle_tab_ready_to_close (void)
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	420 {
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	421 m_number_of_tabs--;
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	422
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	423 if (m_number_of_tabs > 0)
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	424 return;
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	425
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	426 // Here, the application or the editor will be closed -> store the session
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	427
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	428 // Save open files for restoring in next session; this only is possible
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	429 gui_settings *settings = m_resource_manager.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	430
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	431 // save filenames (even if last session will not be restored next time)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	432 // together with encoding and the tab index
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	433 QStringList fetFileNames;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	434 QStringList fet_encodings;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	435 QStringList fet_index;
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	436 QStringList fet_lines;
20796 ed770c16a3e8 also store encoding and tab index with last editor session (bugs #46588, #45688) Torsten <ttl@justmail.de> parents: 20793 diff changeset	437
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	438 // save all open tabs before they are definitely closed
25343 4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	439 for (auto p = m_editor_tab_map.cbegin ();
27605 60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	440 p != m_editor_tab_map.cend (); p++)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	441 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	442 QString file_name = p->first; // get file name of tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	443 if (! file_name.isEmpty ()) // do not append unnamed files
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	444 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	445 fetFileNames.append (file_name);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	446 fet_encodings.append (m_editor_tab_map[file_name].encoding);
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	447
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	448 QString index;
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	449 file_editor_tab *editor_tab
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	450 = static_cast<file_editor_tab *> (m_editor_tab_map[file_name].fet_ID);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	451 fet_index.append (index.setNum
27605 60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	452 (m_tab_widget->indexOf (editor_tab)));
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	453
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	454 int l, c;
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	455 editor_tab->qsci_edit_area ()->getCursorPosition (&l, &c);
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	456 fet_lines.append (index.setNum (l + 1));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	457 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	458 }
15993 41471c02d51c gui: show menu with recently used editor files also in file menu of main window Torsten <ttl@justmail.de> parents: 15984 diff changeset	459
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	460 settings->setValue (ed_session_names.key, fetFileNames);
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	461 settings->setValue (ed_session_enc.key, fet_encodings);
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	462 settings->setValue (ed_session_ind.key, fet_index);
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	463 settings->setValue (ed_session_lines.key, fet_lines);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	464 settings->sync ();
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	465
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	466 // Finally close all the tabs and return indication that we can exit
25357 7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	467 // the application or close the editor.
7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	468 // Closing and deleting the tabs makes the editor visible. In case it was
7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	469 // hidden before, this state has to be restored afterwards
7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	470 bool vis = isVisible ();
7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	471
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	472 for (int i = m_tab_widget->count () - 1; i >= 0; i--)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	473 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	474 // backwards loop since m_tab_widget->count () changes during the loop
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	475 delete m_tab_widget->widget (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	476 m_tab_widget->removeTab (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	477 }
17903 de8591a19bc6 check for custom editor when opening a new file from the gui (bug #40496) Torsten <ttl@justmail.de> parents: 17901 diff changeset	478
25357 7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	479 setVisible (vis);
7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	480
27605 60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	481 octave_dock_widget::close ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	482 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	483
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	484 void file_editor::request_new_file (const QString& commands)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	485 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	486 // Custom editor? If yes, we can only call the editor without passing
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	487 // some initial contents and even without being sure a new file is opened
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	488 if (call_custom_editor ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	489 return;
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	490
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	491 // New file isn't a file_editor_tab function since the file
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	492 // editor tab has yet to be created and there is no object to
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	493 // pass a signal to. Hence, functionality is here.
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	494
27400 7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	495 file_editor_tab *fileEditorTab = make_file_editor_tab (m_ced);
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	496 add_file_editor_tab (fileEditorTab, ""); // new tab with empty title
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	497 fileEditorTab->new_file (commands); // title is updated here
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	498 activate (); // focus editor and new tab
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	499 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	500
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	501 void file_editor::request_close_file (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	502 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	503 file_editor_tab *editor_tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	504 = static_cast<file_editor_tab *> (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	505 editor_tab->conditional_close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	506 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	507
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	508 void file_editor::request_close_all_files (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	509 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	510 file_editor_tab *editor_tab;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	511
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	512 // loop over all tabs starting from last one otherwise deletion changes index
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	513 for (int index = m_tab_widget->count ()-1; index >= 0; index--)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	514 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	515 editor_tab = static_cast<file_editor_tab *> (m_tab_widget->widget (index));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	516 editor_tab->conditional_close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	517 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	518 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	519
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	520 void file_editor::request_close_other_files (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	521 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	522 file_editor_tab *editor_tab;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	523 QWidget *tabID = m_tab_widget->currentWidget ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	524
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	525 // loop over all tabs starting from last one otherwise deletion changes index
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	526 for (int index = m_tab_widget->count ()-1; index >= 0; index--)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	527 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	528 if (tabID != m_tab_widget->widget (index))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	529 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	530 editor_tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	531 = static_cast<file_editor_tab *> (m_tab_widget->widget (index));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	532 editor_tab->conditional_close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	533 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	534 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	535 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	536
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	537 // open a file from the mru list
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	538 void file_editor::request_mru_open_file (QAction *action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	539 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	540 if (action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	541 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	542 request_open_file (action->data ().toStringList ().at (0),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	543 action->data ().toStringList ().at (1));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	544 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	545 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	546
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	547 void file_editor::request_print_file (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	548 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	549 emit fetab_print_file (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	550 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	551
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	552 void file_editor::request_redo (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	553 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	554 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	555 QsciScintillaBase::SCI_REDO);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	556 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	557
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	558 void file_editor::request_cut (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	559 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	560 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	561 QsciScintillaBase::SCI_CUT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	562 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	563
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	564 void file_editor::request_context_help (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	565 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	566 emit fetab_context_help (m_tab_widget->currentWidget (), false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	567 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	568
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	569 void file_editor::request_context_doc (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	570 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	571 emit fetab_context_help (m_tab_widget->currentWidget (), true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	572 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	573
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	574 void file_editor::request_context_edit (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	575 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	576 emit fetab_context_edit (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	577 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	578
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	579 void file_editor::request_save_file (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	580 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	581 emit fetab_save_file (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	582 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	583
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	584 void file_editor::request_save_file_as (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	585 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	586 emit fetab_save_file_as (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	587 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	588
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	589 void file_editor::request_run_file (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	590 {
27404 a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	591 emit interpreter_event
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	592 ([this] (interpreter& interp)
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	593 {
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	594 // INTERPRETER THREAD
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	595
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	596 tree_evaluator& tw = interp.get_evaluator ();
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	597
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	598 if (tw.in_debug_repl ())
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	599 emit request_dbcont_signal ();
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	600 else
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	601 emit fetab_run_file (m_tab_widget->currentWidget ());
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	602 });
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	603 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	604
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26561 diff changeset	605 void file_editor::request_step_into_file ()
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26561 diff changeset	606 {
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26561 diff changeset	607 emit fetab_run_file (m_tab_widget->currentWidget (), true);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	608 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	609
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	610 void file_editor::request_context_run (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	611 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	612 emit fetab_context_run (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	613 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	614
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	615 void file_editor::request_toggle_bookmark (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	616 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	617 emit fetab_toggle_bookmark (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	618 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	619
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	620 void file_editor::request_next_bookmark (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	621 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	622 emit fetab_next_bookmark (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	623 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	624
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	625 void file_editor::request_previous_bookmark (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	626 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	627 emit fetab_previous_bookmark (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	628 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	629
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	630 void file_editor::request_remove_bookmark (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	631 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	632 emit fetab_remove_bookmark (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	633 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	634
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	635 void file_editor::request_move_match_brace (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	636 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	637 emit fetab_move_match_brace (m_tab_widget->currentWidget (), false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	638 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	639
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	640 void file_editor::request_sel_match_brace (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	641 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	642 emit fetab_move_match_brace (m_tab_widget->currentWidget (), true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	643 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	644
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	645 // FIXME: What should this do with conditional breakpoints?
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	646 void file_editor::request_toggle_breakpoint (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	647 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	648 emit fetab_toggle_breakpoint (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	649 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	650
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	651 void file_editor::request_next_breakpoint (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	652 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	653 emit fetab_next_breakpoint (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	654 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	655
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	656 void file_editor::request_previous_breakpoint (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	657 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	658 emit fetab_previous_breakpoint (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	659 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	660
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	661 void file_editor::request_remove_breakpoint (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	662 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	663 emit fetab_remove_all_breakpoints (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	664 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	665
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	666 // slots for Edit->Commands actions
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	667 void file_editor::request_delete_start_word (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	668 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	669 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	670 QsciScintillaBase::SCI_DELWORDLEFT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	671 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	672
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	673 void file_editor::request_delete_end_word (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	674 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	675 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	676 QsciScintillaBase::SCI_DELWORDRIGHT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	677 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	678
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	679 void file_editor::request_delete_start_line (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	680 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	681 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	682 QsciScintillaBase::SCI_DELLINELEFT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	683 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	684
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	685 void file_editor::request_delete_end_line (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	686 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	687 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	688 QsciScintillaBase::SCI_DELLINERIGHT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	689 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	690
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	691 void file_editor::request_delete_line (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	692 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	693 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	694 QsciScintillaBase::SCI_LINEDELETE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	695 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	696
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	697 void file_editor::request_copy_line (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	698 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	699 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	700 QsciScintillaBase::SCI_LINECOPY);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	701 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	702
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	703 void file_editor::request_cut_line (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	704 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	705 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	706 QsciScintillaBase::SCI_LINECUT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	707 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	708
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	709 void file_editor::request_duplicate_selection (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	710 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	711 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	712 QsciScintillaBase::SCI_SELECTIONDUPLICATE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	713 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	714
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	715 void file_editor::request_transpose_line (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	716 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	717 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	718 QsciScintillaBase::SCI_LINETRANSPOSE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	719 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	720
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	721 void file_editor::request_comment_selected_text (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	722 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	723 emit fetab_comment_selected_text (m_tab_widget->currentWidget (), false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	724 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	725
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	726 void file_editor::request_uncomment_selected_text (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	727 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	728 emit fetab_uncomment_selected_text (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	729 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	730
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	731 void file_editor::request_comment_var_selected_text (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	732 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	733 emit fetab_comment_selected_text (m_tab_widget->currentWidget (), true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	734 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	735
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	736 // slots for Edit->Format actions
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	737 void file_editor::request_upper_case (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	738 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	739 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	740 QsciScintillaBase::SCI_UPPERCASE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	741 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	742
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	743 void file_editor::request_lower_case (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	744 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	745 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	746 QsciScintillaBase::SCI_LOWERCASE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	747 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	748
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	749 void file_editor::request_indent_selected_text (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	750 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	751 emit fetab_indent_selected_text (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	752 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	753
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	754 void file_editor::request_unindent_selected_text (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	755 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	756 emit fetab_unindent_selected_text (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	757 }
24484 abb075ada761 Allow commenting with manually selected comment strings (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	758
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	759 void file_editor::request_smart_indent_line_or_selected_text ()
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	760 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	761 emit fetab_smart_indent_line_or_selected_text (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	762 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	763
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	764 void file_editor::request_conv_eol_windows (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	765 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	766 emit fetab_convert_eol (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	767 QsciScintilla::EolWindows);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	768 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	769 void
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	770 file_editor::request_conv_eol_unix (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	771 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	772 emit fetab_convert_eol (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	773 QsciScintilla::EolUnix);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	774 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	775
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	776 void file_editor::request_conv_eol_mac (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	777 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	778 emit fetab_convert_eol (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	779 QsciScintilla::EolMac);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	780 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	781
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	782 void file_editor::request_find (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	783 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	784 emit fetab_find (m_tab_widget->currentWidget (), m_fetab_actions);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	785 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	786
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	787 void file_editor::request_find_next (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	788 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	789 emit fetab_find_next (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	790 }
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24130 diff changeset	791
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	792 void file_editor::request_find_previous (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	793 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	794 emit fetab_find_previous (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	795 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	796
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	797 void file_editor::request_goto_line (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	798 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	799 emit fetab_goto_line (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	800 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	801
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	802 void file_editor::request_completion (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	803 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	804 emit fetab_completion (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	805 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	806
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	807 void file_editor::handle_file_name_changed (const QString& fname,
27053 1bdfd2b523c9 use tab icon for indicating a modified editor file (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27051 diff changeset	808 const QString& tip,
1bdfd2b523c9 use tab icon for indicating a modified editor file (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27051 diff changeset	809 bool modified)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	810 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	811 QObject *fileEditorTab = sender ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	812 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	813 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	814 for (int i = 0; i < m_tab_widget->count (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	815 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	816 if (m_tab_widget->widget (i) == fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	817 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	818 m_tab_widget->setTabText (i, fname);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	819 m_tab_widget->setTabToolTip (i, tip);
27053 1bdfd2b523c9 use tab icon for indicating a modified editor file (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27051 diff changeset	820 if (modified)
1bdfd2b523c9 use tab icon for indicating a modified editor file (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27051 diff changeset	821 m_tab_widget->setTabIcon (i,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	822 m_resource_manager.icon ("document-save"));
27053 1bdfd2b523c9 use tab icon for indicating a modified editor file (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27051 diff changeset	823 else
1bdfd2b523c9 use tab icon for indicating a modified editor file (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27051 diff changeset	824 m_tab_widget->setTabIcon (i, QIcon ());
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	825 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	826 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	827 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	828 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	829
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	830 void file_editor::handle_tab_close_request (int index)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	831 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	832 file_editor_tab *editor_tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	833 = static_cast<file_editor_tab *> (m_tab_widget->widget (index));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	834 editor_tab->conditional_close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	835 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	836
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	837 void
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	838 file_editor::handle_tab_remove_request (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	839 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	840 QObject *fileEditorTab = sender ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	841 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	842 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	843 for (int i = 0; i < m_tab_widget->count (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	844 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	845 if (m_tab_widget->widget (i) == fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	846 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	847 m_tab_widget->removeTab (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	848 // Deleting sender is dodgy, but works because the signal
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	849 // is the last item in the sender's routines.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	850 delete fileEditorTab;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	851 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	852 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	853 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	854 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	855 check_actions ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	856
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	857 activate (); // focus stays in editor when tab is closed
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	858
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	859 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	860
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	861 void file_editor::handle_add_filename_to_list (const QString& fileName,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	862 const QString& encoding, QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	863 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	864 // Should we allow multiple tabs for a single file?
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	865 m_editor_tab_map[fileName].fet_ID = ID;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	866 m_editor_tab_map[fileName].encoding = encoding;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	867 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	868
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	869 // context menu of edit area
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	870 void file_editor::active_tab_changed (int index)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	871 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	872 emit fetab_change_request (m_tab_widget->widget (index));
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	873 activate ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	874 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	875
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	876 void file_editor::handle_editor_state_changed (bool copy_available,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	877 bool is_octave_file)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	878 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	879 // In case there is some scenario where traffic could be coming from
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	880 // all the file editor tabs, just process info from the current active tab.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	881 if (sender () == m_tab_widget->currentWidget ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	882 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	883 if (m_copy_action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	884 m_copy_action->setEnabled (copy_available);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	885 m_cut_action->setEnabled (copy_available);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	886 m_run_selection_action->setEnabled (copy_available);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	887 m_run_action->setEnabled (is_octave_file);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	888
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	889 setFocusProxy (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	890 }
27075 fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	891
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	892 m_copy_action_enabled = m_copy_action->isEnabled ();
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	893 m_undo_action_enabled = m_undo_action->isEnabled ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	894 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	895
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	896 void file_editor::handle_mru_add_file (const QString& file_name,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	897 const QString& encoding)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	898 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	899 int index;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	900 while ((index = m_mru_files.indexOf (file_name)) >= 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	901 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	902 m_mru_files.removeAt (index);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	903 m_mru_files_encodings.removeAt (index);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	904 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	905
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	906 m_mru_files.prepend (file_name);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	907 m_mru_files_encodings.prepend (encoding);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	908
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	909 mru_menu_update ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	910 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	911
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	912 void file_editor::check_conflict_save (const QString& saveFileName,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	913 bool remove_on_success)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	914 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	915 // Check whether this file is already open in the editor.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	916 QWidget *tab = find_tab_widget (saveFileName);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	917
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	918 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	919 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	920 // Note: to overwrite the contents of some other file editor tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	921 // with the same name requires identifying which file editor tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	922 // that is (not too difficult) then close that tab. Of course,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	923 // that could trigger another dialog box if the file editor tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	924 // with the same name has modifications in it. This could become
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	925 // somewhat confusing to the user. For now, opt to do nothing.
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	926
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	927 // Create a NonModal message about error.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	928 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	929 = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	930 tr ("File not saved! A file with the selected name\n%1\n"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	931 "is already open in the editor").
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	932 arg (saveFileName),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	933 QMessageBox::Ok, nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	934
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	935 msgBox->setWindowModality (Qt::NonModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	936 msgBox->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	937 msgBox->show ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	938
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	939 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	940 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	941
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	942 QObject *saveFileObject = sender ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	943 QWidget *saveFileWidget = nullptr;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	944
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	945 for (int i = 0; i < m_tab_widget->count (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	946 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	947 if (m_tab_widget->widget (i) == saveFileObject)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	948 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	949 saveFileWidget = m_tab_widget->widget (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	950 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	951 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	952 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	953 if (! saveFileWidget)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	954 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	955 // Create a NonModal message about error.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	956 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	957 = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	958 tr ("The associated file editor tab has disappeared."),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	959 QMessageBox::Ok, nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	960
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	961 msgBox->setWindowModality (Qt::NonModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	962 msgBox->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	963 msgBox->show ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	964
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	965 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	966 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	967
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	968 // Can save without conflict, have the file editor tab do so.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	969 emit fetab_save_file (saveFileWidget, saveFileName, remove_on_success);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	970 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	971
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	972 void file_editor::handle_insert_debugger_pointer_request (const QString& file,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	973 int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	974 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	975 request_open_file (file, QString (), line, true); // default encoding
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	976 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	977
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	978 void file_editor::handle_delete_debugger_pointer_request (const QString& file,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	979 int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	980 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	981 if (! file.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	982 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	983 // Check whether this file is already open in the editor.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	984 QWidget *tab = find_tab_widget (file);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	985
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	986 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	987 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	988 m_tab_widget->setCurrentWidget (tab);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	989
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	990 if (line > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	991 emit fetab_delete_debugger_pointer (tab, line);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	992
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	993 emit fetab_set_focus (tab);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	994 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	995 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	996 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	997
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	998 void file_editor::handle_update_breakpoint_marker_request (bool insert,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	999 const QString& file,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1000 int line,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1001 const QString& cond)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1002 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1003 request_open_file (file, QString (), line, false, true, insert, cond);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1004 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1005
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1006 void file_editor::handle_edit_file_request (const QString& file)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1007 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1008 request_open_file (file);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1009 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1010
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1011 // Slot used for signals indicating that a file was changed/rename or
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1012 // is going to be deleted/renamed
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1013 void file_editor::handle_file_remove (const QString& old_name,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1014 const QString& new_name)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1015 {
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1016 // Clear old list of file data and declare a structure for file data
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1017 m_tmp_closed_files.clear ();
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1018 session_data f_data;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1019
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1020 // Preprocessing old name(s)
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1021 QString old_name_clean = old_name.trimmed ();
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1022 int s = old_name_clean.size ();
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1023
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	1024 if (old_name_clean.at (0) == QChar ('\"')
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	1025 && old_name_clean.at (s - 1) == QChar ('\"'))
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1026 old_name_clean = old_name_clean.mid (1, s - 2);
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1027
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1028 QStringList old_names = old_name_clean.split ("\" \"");
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1029
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1030 // Check if new name is a file or directory
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1031 QFileInfo newf (new_name);
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1032 bool new_is_dir = newf.isDir ();
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1033
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1034 // Now loop over all old files/dirs (several files by movefile ())
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1035 for (int i = 0; i < old_names.count (); i++)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1036 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1037 // Check if old name is a file or directory
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1038 QFileInfo old (old_names.at (i));
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1039
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1040 if (old.isDir ())
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1041 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1042 // Call the function which handles directories and return
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1043 handle_dir_remove (old_names.at (i), new_name);
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1044 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1045 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1046 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1047 // It is a single file. Is it open?
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1048 file_editor_tab *editor_tab
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1049 = static_cast<file_editor_tab *> (find_tab_widget (old_names.at (i)));
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1050
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1051 if (editor_tab)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1052 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1053 // YES: Get and store the related encoding
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1054 for (editor_tab_map_const_iterator p = m_editor_tab_map.begin ();
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1055 p != m_editor_tab_map.end (); p++)
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25634 diff changeset	1056 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1057 if (editor_tab == p->second.fet_ID)
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1058 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1059 // Get index and line
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1060 f_data.encoding = p->second.encoding;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1061 f_data.index = m_tab_widget->indexOf (editor_tab);
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1062 int l, c;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1063 editor_tab->qsci_edit_area ()->getCursorPosition (&l, &c);
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1064 f_data.line = l + 1;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1065 break;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1066 }
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25634 diff changeset	1067 }
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1068
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1069 // Close it silently
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1070 m_no_focus = true; // Remember for not focussing editor
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1071 editor_tab->file_has_changed (QString (), true); // Close the tab
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1072 m_no_focus = false; // Back to normal
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1073
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1074 // For reloading old file if error while removing
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1075 f_data.file_name = old_names.at (i);
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1076 // For reloading new file (if new_file is not empty)
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1077 if (new_is_dir)
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1078 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1079 std::string ndir = new_name.toStdString ();
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1080 std::string ofile = old.fileName ().toStdString ();
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1081 f_data.new_file_name
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1082 = QString::fromStdString (sys::env::make_absolute (ofile, ndir));
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1083 }
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1084 else
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1085 f_data.new_file_name = new_name;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1086
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1087 // Add file data to list
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1088 m_tmp_closed_files << f_data;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1089 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1090 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1091 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1092 }
24082 0052d47ddc3e Backed out changeset ba164db1c4a4 Torsten <mttl@mailbox.org> parents: 24048 diff changeset	1093
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1094 // Slot for signal indicating that a file was renamed
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1095 void file_editor::handle_file_renamed (bool load_new)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1096 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1097 m_no_focus = true; // Remember for not focussing editor
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1098
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1099 // Loop over all file that have to be reloaded. Start at the end of the
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1100 // list, otherwise the stored indexes are not correct
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1101 for (int i = m_tmp_closed_files.count () - 1; i >= 0; i--)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1102 {
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1103 // Load old or new file
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1104 if (load_new)
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1105 {
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1106 if (! m_tmp_closed_files.at (i).new_file_name.isEmpty ())
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1107 request_open_file (m_tmp_closed_files.at (i).new_file_name,
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1108 m_tmp_closed_files.at (i).encoding,
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1109 m_tmp_closed_files.at (i).line,
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1110 false, false, true, "",
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1111 m_tmp_closed_files.at (i).index);
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1112 }
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1113 else
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1114 {
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1115 request_open_file (m_tmp_closed_files.at (i).file_name,
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1116 m_tmp_closed_files.at (i).encoding,
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1117 m_tmp_closed_files.at (i).line,
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1118 false, false, true, "",
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1119 m_tmp_closed_files.at (i).index);
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1120 }
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1121
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1122 }
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1123
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1124 m_no_focus = false; // Back to normal focus
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1125
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1126 // Clear the list of file data
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1127 m_tmp_closed_files.clear ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1128 }
24082 0052d47ddc3e Backed out changeset ba164db1c4a4 Torsten <mttl@mailbox.org> parents: 24048 diff changeset	1129
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27605 diff changeset	1130 void file_editor::notice_settings (const gui_settings *settings)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1131 {
26058 ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1132 int size_idx = settings->value (global_icon_size.key,
ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1133 global_icon_size.def).toInt ();
ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1134 size_idx = (size_idx > 0) - (size_idx < 0) + 1; // Make valid index from 0 to 2
ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1135
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1136 QStyle *st = style ();
26058 ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1137 int icon_size = st->pixelMetric (global_icon_sizes[size_idx]);
ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1138 m_tool_bar->setIconSize (QSize (icon_size, icon_size));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1139
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1140 // Tab position
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1141 QTabWidget::TabPosition pos
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1142 = static_cast<QTabWidget::TabPosition> (settings->value (ed_tab_position.key, ed_tab_position.def).toInt ());
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1143
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1144 m_tab_widget->setTabPosition (pos);
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1145
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1146 // Update style sheet properties depending on position
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1147 QString width_str ("width");
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1148 QString height_str ("height");
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1149 if (pos == QTabWidget::West \|\| pos == QTabWidget::East)
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1150 {
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1151 width_str = QString ("height");
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1152 height_str = QString ("width");
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1153 }
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1154
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1155 // Min and max width for full path titles
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1156 int tab_width_min = settings->value ("editor/notebook_tab_width_min", 160)
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 24731 diff changeset	1157 .toInt ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1158 int tab_width_max = settings->value ("editor/notebook_tab_width_max", 300)
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 24731 diff changeset	1159 .toInt ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1160
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1161 // Get suitable height of a tab related to font and icon size
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1162 int height = 1.5*QFontMetrics (m_tab_widget->font ()).height ();
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1163 int is = 1.5*m_tab_widget->iconSize ().height ();
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1164 if (is > height)
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1165 height = is;
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1166
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1167 // Style sheet for tab height
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1168 QString style_sheet = QString ("QTabBar::tab {max-" + height_str + ": %1px;}")
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1169 .arg (height);
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1170
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1171 // Style sheet for tab height together with width
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1172 if (settings->value ("editor/longWindowTitle", false).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1173 {
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1174 style_sheet = QString ("QTabBar::tab "
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1175 " {max-" + height_str + ": %1px;"
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1176 " min-" + width_str + ": %2px;"
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1177 " max-" + width_str + ": %3px;}")
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1178 .arg (height).arg (tab_width_min).arg (tab_width_max);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1179 m_tab_widget->setElideMode (Qt::ElideLeft);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1180 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1181 else
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1182 {
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1183 m_tab_widget->setElideMode (Qt::ElideNone);
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1184 }
27120 c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1185
c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1186 #if defined (Q_OS_MAC)
c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1187 // FIXME: This is a workaround for missing tab close buttons on MacOS
c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1188 // in several Qt versions (https://bugreports.qt.io/browse/QTBUG-61092)
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1189 QString close_button_css
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1190 ("QTabBar::close-button"
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1191 " { width: 6px; image: url(:/actions/icons/widget-close.png);}\n"
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1192 "QTabBar::close-button:hover"
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1193 " { background-color: #cccccc; }");
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1194
27120 c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1195 style_sheet = style_sheet + close_button_css;
c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1196 #endif
c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1197
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1198 m_tab_widget->setStyleSheet (style_sheet);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1199
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1200 bool show_it;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1201 show_it = settings->value ("editor/showLineNumbers",true).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1202 m_show_linenum_action->setChecked (show_it);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1203 show_it = settings->value ("editor/show_white_space",false).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1204 m_show_whitespace_action->setChecked (show_it);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1205 show_it = settings->value ("editor/show_eol_chars",false).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1206 m_show_eol_action->setChecked (show_it);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1207 show_it = settings->value ("editor/show_indent_guides",false).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1208 m_show_indguide_action->setChecked (show_it);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1209 show_it = settings->value ("editor/long_line_marker",true).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1210 m_show_longline_action->setChecked (show_it);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1211
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1212 show_it = settings->value ("editor/show_toolbar",true).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1213 m_show_toolbar_action->setChecked (show_it);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1214 m_tool_bar->setVisible (show_it);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1215 show_it = settings->value ("editor/show_edit_status_bar",true).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1216 m_show_statusbar_action->setChecked (show_it);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1217 show_it = settings->value ("editor/show_hscroll_bar",true).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1218 m_show_hscrollbar_action->setChecked (show_it);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1219
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1220 set_shortcuts ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1221
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1222 // Relay signal to file editor tabs.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1223 emit fetab_settings_changed (settings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1224 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1225
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1226 void file_editor::set_shortcuts (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1227 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1228 // Shortcuts also available in the main window, as well as the realted
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1229 // ahotcuts, are defined in main_window and added to the editor
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1230
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1231 // File menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1232 shortcut_manager::set_shortcut (m_edit_function_action, "editor_file:edit_function");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1233 shortcut_manager::set_shortcut (m_save_action, "editor_file:save");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1234 shortcut_manager::set_shortcut (m_save_as_action, "editor_file:save_as");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1235 shortcut_manager::set_shortcut (m_close_action, "editor_file:close");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1236 shortcut_manager::set_shortcut (m_close_all_action, "editor_file:close_all");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1237 shortcut_manager::set_shortcut (m_close_others_action, "editor_file:close_other");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1238 shortcut_manager::set_shortcut (m_print_action, "editor_file:print");
17903 de8591a19bc6 check for custom editor when opening a new file from the gui (bug #40496) Torsten <ttl@justmail.de> parents: 17901 diff changeset	1239
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1240 // Edit menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1241 shortcut_manager::set_shortcut (m_redo_action, "editor_edit:redo");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1242 shortcut_manager::set_shortcut (m_cut_action, "editor_edit:cut");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1243 shortcut_manager::set_shortcut (m_find_action, "editor_edit:find_replace");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1244 shortcut_manager::set_shortcut (m_find_next_action, "editor_edit:find_next");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1245 shortcut_manager::set_shortcut (m_find_previous_action, "editor_edit:find_previous");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1246
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1247 shortcut_manager::set_shortcut (m_delete_start_word_action, "editor_edit:delete_start_word");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1248 shortcut_manager::set_shortcut (m_delete_end_word_action, "editor_edit:delete_end_word");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1249 shortcut_manager::set_shortcut (m_delete_start_line_action, "editor_edit:delete_start_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1250 shortcut_manager::set_shortcut (m_delete_end_line_action, "editor_edit:delete_end_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1251 shortcut_manager::set_shortcut (m_delete_line_action, "editor_edit:delete_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1252 shortcut_manager::set_shortcut (m_copy_line_action, "editor_edit:copy_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1253 shortcut_manager::set_shortcut (m_cut_line_action, "editor_edit:cut_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1254 shortcut_manager::set_shortcut (m_duplicate_selection_action, "editor_edit:duplicate_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1255 shortcut_manager::set_shortcut (m_transpose_line_action, "editor_edit:transpose_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1256 shortcut_manager::set_shortcut (m_comment_selection_action, "editor_edit:comment_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1257 shortcut_manager::set_shortcut (m_uncomment_selection_action, "editor_edit:uncomment_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1258 shortcut_manager::set_shortcut (m_comment_var_selection_action, "editor_edit:comment_var_selection");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1259
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1260 shortcut_manager::set_shortcut (m_upper_case_action, "editor_edit:upper_case");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1261 shortcut_manager::set_shortcut (m_lower_case_action, "editor_edit:lower_case");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1262 shortcut_manager::set_shortcut (m_indent_selection_action, "editor_edit:indent_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1263 shortcut_manager::set_shortcut (m_unindent_selection_action, "editor_edit:unindent_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1264 shortcut_manager::set_shortcut (m_smart_indent_line_or_selection_action, "editor_edit:smart_indent_line_or_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1265 shortcut_manager::set_shortcut (m_completion_action, "editor_edit:completion_list");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1266 shortcut_manager::set_shortcut (m_goto_line_action, "editor_edit:goto_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1267 shortcut_manager::set_shortcut (m_move_to_matching_brace, "editor_edit:move_to_brace");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1268 shortcut_manager::set_shortcut (m_sel_to_matching_brace, "editor_edit:select_to_brace");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1269 shortcut_manager::set_shortcut (m_toggle_bookmark_action, "editor_edit:toggle_bookmark");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1270 shortcut_manager::set_shortcut (m_next_bookmark_action, "editor_edit:next_bookmark");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1271 shortcut_manager::set_shortcut (m_previous_bookmark_action, "editor_edit:previous_bookmark");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1272 shortcut_manager::set_shortcut (m_remove_bookmark_action, "editor_edit:remove_bookmark");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1273 shortcut_manager::set_shortcut (m_preferences_action, "editor_edit:preferences");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1274 shortcut_manager::set_shortcut (m_styles_preferences_action, "editor_edit:styles_preferences");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1275
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1276 shortcut_manager::set_shortcut (m_conv_eol_windows_action, "editor_edit:conv_eol_winows");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1277 shortcut_manager::set_shortcut (m_conv_eol_unix_action, "editor_edit:conv_eol_unix");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1278 shortcut_manager::set_shortcut (m_conv_eol_mac_action, "editor_edit:conv_eol_mac");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1279
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1280 // View menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1281 shortcut_manager::set_shortcut (m_show_linenum_action, "editor_view:show_line_numbers");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1282 shortcut_manager::set_shortcut (m_show_whitespace_action, "editor_view:show_white_spaces");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1283 shortcut_manager::set_shortcut (m_show_eol_action, "editor_view:show_eol_chars");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1284 shortcut_manager::set_shortcut (m_show_indguide_action, "editor_view:show_ind_guides");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1285 shortcut_manager::set_shortcut (m_show_longline_action, "editor_view:show_long_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1286 shortcut_manager::set_shortcut (m_show_toolbar_action, "editor_view:show_toolbar");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1287 shortcut_manager::set_shortcut (m_show_statusbar_action, "editor_view:show_statusbar");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1288 shortcut_manager::set_shortcut (m_show_hscrollbar_action, "editor_view:show_hscrollbar");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1289 shortcut_manager::set_shortcut (m_zoom_in_action, "editor_view:zoom_in");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1290 shortcut_manager::set_shortcut (m_zoom_out_action, "editor_view:zoom_out");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1291 shortcut_manager::set_shortcut (m_zoom_normal_action, "editor_view:zoom_normal");
27330 e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	1292 shortcut_manager::set_shortcut (m_sort_tabs_action, "editor_view:sort_tabs");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1293
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1294 // Debug menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1295 shortcut_manager::set_shortcut (m_toggle_breakpoint_action, "editor_debug:toggle_breakpoint");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1296 shortcut_manager::set_shortcut (m_next_breakpoint_action, "editor_debug:next_breakpoint");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1297 shortcut_manager::set_shortcut (m_previous_breakpoint_action, "editor_debug:previous_breakpoint");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1298 shortcut_manager::set_shortcut (m_remove_all_breakpoints_action, "editor_debug:remove_breakpoints");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1299
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1300 // Run menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1301 shortcut_manager::set_shortcut (m_run_action, "editor_run:run_file");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1302 shortcut_manager::set_shortcut (m_run_selection_action, "editor_run:run_selection");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1303
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1304 // Help menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1305 shortcut_manager::set_shortcut (m_context_help_action, "editor_help:help_keyword");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1306 shortcut_manager::set_shortcut (m_context_doc_action, "editor_help:doc_keyword");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1307
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1308 // Tab navigation without menu entries
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1309 shortcut_manager::set_shortcut (m_switch_left_tab_action, "editor_tabs:switch_left_tab");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1310 shortcut_manager::set_shortcut (m_switch_right_tab_action, "editor_tabs:switch_right_tab");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1311 shortcut_manager::set_shortcut (m_move_tab_left_action, "editor_tabs:move_tab_left");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1312 shortcut_manager::set_shortcut (m_move_tab_right_action, "editor_tabs:move_tab_right");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1313
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1314 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1315
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1316 // This slot is a reimplementation of the virtual slot in octave_dock_widget.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1317 // We need this for creating an empty script when the editor has no open files
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1318 // and is made visible
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1319 void file_editor::handle_visibility (bool visible)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1320 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1321 if (m_closed && visible)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1322 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1323 m_closed = false;
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1324 gui_settings *settings = m_resource_manager.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1325 restore_session (settings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1326 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1327
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1328 empty_script (false, visible);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1329
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1330 if (visible && ! isFloating ())
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	1331 setFocus ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1332
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1333 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1334
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	1335 void file_editor::toplevel_change (bool toplevel)
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	1336 {
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	1337 emit fetab_toplevel_changed (toplevel);
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	1338 octave_dock_widget::toplevel_change (toplevel);
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	1339 }
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	1340
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1341 void file_editor::update_octave_directory (const QString& dir)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1342 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1343 m_ced = dir;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1344 emit fetab_set_directory (m_ced); // for save dialog
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1345 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1346
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1347 void file_editor::copyClipboard (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1348 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1349 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1350 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1351 QsciScintillaBase::SCI_COPY);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1352 }
18545 17baa684892c fix flashing while debuggung and editor is tabbed behind console (bug #41757) Torsten <ttl@justmail.de> parents: 18472 diff changeset	1353
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1354 void file_editor::pasteClipboard (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1355 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1356 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1357 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1358 QsciScintillaBase::SCI_PASTE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1359 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1360
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1361 void file_editor::selectAll (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1362 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1363 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1364 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1365 QsciScintillaBase::SCI_SELECTALL);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1366 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1367
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1368 void file_editor::do_undo (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1369 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1370 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1371 emit fetab_scintilla_command (m_tab_widget->currentWidget (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1372 QsciScintillaBase::SCI_UNDO);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1373 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1374
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1375 // Open a file, if not already open, and mark the current execution location
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1376 // and/or a breakpoint with condition cond.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1377 void file_editor::request_open_file (const QString& openFileName,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1378 const QString& encoding,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1379 int line, bool debug_pointer,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1380 bool breakpoint_marker, bool insert,
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1381 const QString& cond, int index)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1382 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1383 if (call_custom_editor (openFileName, line))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1384 return; // custom editor called
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1385
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1386 gui_settings *settings = m_resource_manager.get_settings ();
25622 a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1387 bool show_dbg_file
a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1388 = settings->value (ed_show_dbg_file.key, ed_show_dbg_file.def).toBool ();
a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1389
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1390 if (openFileName.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1391 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1392 // This happens if edit is calles without an argument
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1393 // Open eitor with empty edit area instead (as new file would do)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1394 request_new_file ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1395 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1396 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1397 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1398 // Check whether this file is already open in the editor.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1399 QWidget *tab = find_tab_widget (openFileName);
18545 17baa684892c fix flashing while debuggung and editor is tabbed behind console (bug #41757) Torsten <ttl@justmail.de> parents: 18472 diff changeset	1400
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1401 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1402 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1403 m_tab_widget->setCurrentWidget (tab);
16407 4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	1404
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1405 if (line > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1406 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1407 if (insert)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1408 emit fetab_goto_line (tab, line);
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	1409
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1410 if (debug_pointer)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1411 emit fetab_insert_debugger_pointer (tab, line);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1412
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1413 if (breakpoint_marker)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1414 emit fetab_do_breakpoint_marker (insert, tab, line, cond);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1415 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1416
25622 a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1417 if (show_dbg_file && ! ((breakpoint_marker \|\| debug_pointer) && is_editor_console_tabbed ()))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1418 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1419 emit fetab_set_focus (tab);
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	1420 activate ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1421 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1422 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1423 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1424 {
25622 a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1425 if (! show_dbg_file && (breakpoint_marker \|\| debug_pointer))
a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1426 return; // Do not open a file for showing dbg markers
a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1427
a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1428 if (breakpoint_marker && ! insert)
a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1429 return; // Never open a file when removing breakpoints
a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1430
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1431 file_editor_tab *fileEditorTab = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1432 // Reuse <unnamed> tab if it hasn't yet been modified.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1433 bool reusing = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1434 tab = find_tab_widget ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1435 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1436 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1437 fileEditorTab = static_cast<file_editor_tab *>(tab);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1438 if (fileEditorTab->qsci_edit_area ()->isModified ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1439 fileEditorTab = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1440 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1441 reusing = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1442 }
21565 08baf0ebc9a9 Reappropriate <unnamed> editor tab when opening a new file (bug #47529) Lachlan Andrew <lachlanbis@gmail.com> parents: 21562 diff changeset	1443
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1444 // If <unnamed> was absent or modified, create a new tab.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1445 if (! fileEditorTab)
27400 7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	1446 fileEditorTab = make_file_editor_tab ();
21565 08baf0ebc9a9 Reappropriate <unnamed> editor tab when opening a new file (bug #47529) Lachlan Andrew <lachlanbis@gmail.com> parents: 21562 diff changeset	1447
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1448 fileEditorTab->set_encoding (encoding);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1449 QString result = fileEditorTab->load_file (openFileName);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1450 if (result == "")
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1451 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1452 // Supply empty title then have the file_editor_tab update
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1453 // with full or short name.
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1454 if (! reusing)
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1455 add_file_editor_tab (fileEditorTab, "", index);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1456 fileEditorTab->update_window_title (false);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1457 // file already loaded, add file to mru list here
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1458 QFileInfo file_info = QFileInfo (openFileName);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1459 handle_mru_add_file (file_info.canonicalFilePath (),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1460 encoding);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1461
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1462 if (line > 0)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1463 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1464 if (insert)
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1465 emit fetab_goto_line (fileEditorTab, line);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1466
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1467 if (debug_pointer)
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1468 emit fetab_insert_debugger_pointer (fileEditorTab,
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1469 line);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1470 if (breakpoint_marker)
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1471 emit fetab_do_breakpoint_marker (insert, fileEditorTab,
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1472 line, cond);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1473 }
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1474 }
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1475 else
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1476 {
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1477 delete fileEditorTab;
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1478 fileEditorTab = nullptr;
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1479
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1480 if (QFile::exists (openFileName))
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1481 {
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1482 // File not readable:
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1483 // create a NonModal message about error.
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1484 QMessageBox *msgBox
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1485 = new QMessageBox (QMessageBox::Critical,
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1486 tr ("Octave Editor"),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1487 tr ("Could not open file\n%1\nfor read: %2.").
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1488 arg (openFileName).arg (result),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1489 QMessageBox::Ok, this);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1490
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1491 msgBox->setWindowModality (Qt::NonModal);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1492 msgBox->setAttribute (Qt::WA_DeleteOnClose);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1493 msgBox->show ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1494 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1495 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1496 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1497 // File does not exist, should it be created?
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1498 bool create_file = true;
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1499 QMessageBox *msgBox;
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1500
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1501 if (! settings->value ("editor/create_new_file", false).toBool ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1502 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1503 msgBox = new QMessageBox (QMessageBox::Question,
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1504 tr ("Octave Editor"),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1505 tr ("File\n%1\ndoes not exist. "
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1506 "Do you want to create it?").arg (openFileName),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1507 QMessageBox::NoButton,nullptr);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1508 QPushButton *create_button =
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1509 msgBox->addButton (tr ("Create"), QMessageBox::YesRole);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1510 msgBox->addButton (tr ("Cancel"), QMessageBox::RejectRole);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1511 msgBox->setDefaultButton (create_button);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1512 msgBox->exec ();
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1513
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1514 QAbstractButton *clicked_button = msgBox->clickedButton ();
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1515 if (clicked_button != create_button)
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1516 create_file = false;
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1517
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1518 delete msgBox;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1519 }
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1520
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1521 if (create_file)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1522 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1523 // create the file and call the editor again
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1524 QFile file (openFileName);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1525 if (! file.open (QIODevice::WriteOnly))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1526 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1527 // error opening the file
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1528 msgBox = new QMessageBox (QMessageBox::Critical,
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1529 tr ("Octave Editor"),
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1530 tr ("Could not open file\n%1\nfor write: %2.").
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1531 arg (openFileName).arg (file.errorString ()),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1532 QMessageBox::Ok, this);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1533
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1534 msgBox->setWindowModality (Qt::NonModal);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1535 msgBox->setAttribute (Qt::WA_DeleteOnClose);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1536 msgBox->show ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1537 }
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1538 else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1539 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1540 file.close ();
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1541 request_open_file (openFileName);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1542 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1543 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1544 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1545 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1546
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1547 if (! ((breakpoint_marker \|\| debug_pointer) && is_editor_console_tabbed ()))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1548 {
25923 a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	1549 // update breakpoint pointers, really show editor
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	1550 // and the current editor tab
26080 13d11afc8122 fix crash after editor dialog about creation of non-existing file Torsten <mttl@mailbox.org> parents: 26058 diff changeset	1551 if (fileEditorTab)
13d11afc8122 fix crash after editor dialog about creation of non-existing file Torsten <mttl@mailbox.org> parents: 26058 diff changeset	1552 fileEditorTab->update_breakpoints ();
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	1553 activate ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1554 emit file_loaded_signal ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1555 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1556 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1557 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1558 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	1559
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1560 void file_editor::request_preferences (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1561 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1562 emit request_settings_dialog ("editor");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1563 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1564
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1565 void file_editor::request_styles_preferences (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1566 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1567 emit request_settings_dialog ("editor_styles");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1568 }
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 17639 diff changeset	1569
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1570 void file_editor::show_line_numbers (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1571 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1572 toggle_preference ("editor/showLineNumbers",true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1573 }
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 17639 diff changeset	1574
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1575 void file_editor::show_white_space (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1576 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1577 toggle_preference ("editor/show_white_space",false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1578 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1579
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1580 void file_editor::show_eol_chars (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1581 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1582 toggle_preference ("editor/show_eol_chars",false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1583 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1584
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1585 void file_editor::show_indent_guides (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1586 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1587 toggle_preference ("editor/show_indent_guides",false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1588 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1589
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1590 void file_editor::show_long_line (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1591 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1592 toggle_preference ("editor/long_line_marker",true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1593 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1594
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1595 void file_editor::show_toolbar (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1596 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1597 toggle_preference ("editor/show_toolbar",true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1598 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1599
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1600 void file_editor::show_statusbar (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1601 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1602 toggle_preference ("editor/show_edit_status_bar",true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1603 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1604
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1605 void file_editor::show_hscrollbar (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1606 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1607 toggle_preference ("editor/show_hscroll_bar",true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1608 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1609
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1610 void file_editor::zoom_in (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1611 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1612 emit fetab_zoom_in (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1613 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1614
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1615 void file_editor::zoom_out (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1616 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1617 emit fetab_zoom_out (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1618 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1619
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1620 void file_editor::zoom_normal (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1621 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1622 emit fetab_zoom_normal (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1623 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1624
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1625 void file_editor::create_context_menu (QMenu *menu)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1626 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1627 // remove all standard actions from scintilla
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1628 QList<QAction *> all_actions = menu->actions ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1629 QAction *a;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1630
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1631 foreach (a, all_actions)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1632 menu->removeAction (a);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1633
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1634 // add editor's actions with icons and customized shortcuts
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1635 menu->addAction (m_cut_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1636 menu->addAction (m_copy_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1637 menu->addAction (m_paste_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1638 menu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1639 menu->addAction (m_selectall_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1640 menu->addSeparator ();
25274 1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1641 menu->addAction (m_find_files_action);
1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1642 menu->addAction (m_find_action);
1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1643 menu->addAction (m_find_next_action);
1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1644 menu->addAction (m_find_previous_action);
1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1645 menu->addSeparator ();
1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1646 menu->addMenu (m_edit_cmd_menu);
1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1647 menu->addMenu (m_edit_fmt_menu);
1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1648 menu->addMenu (m_edit_nav_menu);
1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1649 menu->addSeparator ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1650 menu->addAction (m_run_selection_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1651 }
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1652
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1653 void file_editor::edit_status_update (bool undo, bool redo)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1654 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1655 if (m_undo_action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1656 m_undo_action->setEnabled (undo);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1657 m_redo_action->setEnabled (redo);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1658 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1659
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1660 // handler for the close event
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1661 void file_editor::closeEvent (QCloseEvent *e)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1662 {
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1663 gui_settings *settings = m_resource_manager.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1664 if (settings->value ("editor/hiding_closes_files",false).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1665 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1666 if (check_closing ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1667 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1668 // all tabs are closed without cancelling,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1669 // store closing state for restoring session when shown again
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1670 m_closed = true;
27605 60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	1671 e->ignore ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1672 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1673 else
25623 331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1674 {
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1675 e->ignore ();
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1676 return;
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1677 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1678 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1679 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1680 e->accept ();
25623 331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1681
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1682 octave_dock_widget::closeEvent (e);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1683 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1684
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1685 void file_editor::dragEnterEvent (QDragEnterEvent *e)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1686 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1687 if (e->mimeData ()->hasUrls ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1688 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1689 e->acceptProposedAction ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1690 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1691 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1692
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1693 void file_editor::dropEvent (QDropEvent *e)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1694 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1695 if (e->mimeData ()->hasUrls ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1696 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1697 foreach (QUrl url, e->mimeData ()->urls ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1698 request_open_file (url.toLocalFile ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1699 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1700 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1701
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1702 bool file_editor::is_editor_console_tabbed (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1703 {
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25293 diff changeset	1704 main_window w = static_cast<main_window >(main_win ());
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1705 QList<QDockWidget *> w_list = w->tabifiedDockWidgets (this);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1706 QDockWidget *console =
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1707 static_cast<QDockWidget *> (w->get_dock_widget_list ().at (0));
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18767 diff changeset	1708
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1709 for (int i = 0; i < w_list.count (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1710 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1711 if (w_list.at (i) == console)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1712 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1713 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1714
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1715 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1716 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1717
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1718 void file_editor::construct (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1719 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1720 QWidget *editor_widget = new QWidget (this);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1721
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1722 // FIXME: what was the intended purpose of this unused variable?
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1723 // QStyle *editor_style = QApplication::style ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1724
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1725 // Menu bar: do not set it native, required in MacOS and Ubuntu Unity (Qt5)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1726 // for a visible menu bar in the editor widget. This property is ignored
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1727 // on other platforms.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1728 m_menu_bar = new QMenuBar (editor_widget);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1729 m_menu_bar->setNativeMenuBar (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1730
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1731 m_tool_bar = new QToolBar (editor_widget);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1732 m_tool_bar->setMovable (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1733
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1734 m_tab_widget = new file_editor_tab_widget (editor_widget);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1735
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1736 // the mru-list and an empty array of actions
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1737 gui_settings *settings = m_resource_manager.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1738 m_mru_files = settings->value ("editor/mru_file_list").toStringList ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1739 m_mru_files_encodings = settings->value ("editor/mru_file_encodings")
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 24731 diff changeset	1740 .toStringList ();
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18767 diff changeset	1741
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1742 if (m_mru_files_encodings.count () != m_mru_files.count ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1743 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1744 // encodings don't have the same count -> do not use them!
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1745 m_mru_files_encodings = QStringList ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1746 for (int i = 0; i < m_mru_files.count (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1747 m_mru_files_encodings << QString ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1748 }
24130 6fdbdb66d7cb set editor menu bar as non-native menu bar on all platforms Torsten <mttl@mailbox.org> parents: 24123 diff changeset	1749
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1750 for (int i = 0; i < MaxMRUFiles; ++i)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1751 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1752 m_mru_file_actions[i] = new QAction (this);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1753 m_mru_file_actions[i]->setVisible (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1754 }
24130 6fdbdb66d7cb set editor menu bar as non-native menu bar on all platforms Torsten <mttl@mailbox.org> parents: 24123 diff changeset	1755
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1756 // menu bar
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1757
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1758 // file menu
13562 a89aa9e05e19 editor: menu bar, run editor file in octave ttl <ttl@justmail.de> parents: 13558 diff changeset	1759
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1760 m_fileMenu = add_menu (m_menu_bar, tr ("&File"));
20814 2da4058d65c7 store the encoding of recent editor files in the mru list Torsten <ttl@justmail.de> parents: 20796 diff changeset	1761
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1762 // new and open menus are inserted later by the main window
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1763 m_mru_file_menu = new QMenu (tr ("&Recent Editor Files"), m_fileMenu);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1764 for (int i = 0; i < MaxMRUFiles; ++i)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1765 m_mru_file_menu->addAction (m_mru_file_actions[i]);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1766 m_fileMenu->addMenu (m_mru_file_menu);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1767
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1768 m_fileMenu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1769
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1770 m_edit_function_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1771 = add_action (m_fileMenu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1772 tr ("&Edit Function"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1773 SLOT (request_context_edit (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1774
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1775 m_fileMenu->addSeparator ();
20814 2da4058d65c7 store the encoding of recent editor files in the mru list Torsten <ttl@justmail.de> parents: 20796 diff changeset	1776
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1777 m_save_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1778 = add_action (m_fileMenu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1779 m_resource_manager.icon ("document-save"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1780 tr ("&Save File"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1781 SLOT (request_save_file (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1782
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1783 m_save_as_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1784 = add_action (m_fileMenu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1785 m_resource_manager.icon ("document-save-as"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1786 tr ("Save File &As..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1787 SLOT (request_save_file_as (bool)));
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	1788
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1789 m_fileMenu->addSeparator ();
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1790
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1791 m_close_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1792 = add_action (m_fileMenu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1793 m_resource_manager.icon ("window-close",false),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1794 tr ("&Close"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1795 SLOT (request_close_file (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1796
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1797 m_close_all_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1798 = add_action (m_fileMenu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1799 m_resource_manager.icon ("window-close",false),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1800 tr ("Close All"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1801 SLOT (request_close_all_files (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1802
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1803 m_close_others_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1804 = add_action (m_fileMenu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1805 m_resource_manager.icon ("window-close",false),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1806 tr ("Close Other Files"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1807 SLOT (request_close_other_files (bool)));
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1808
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1809 m_fileMenu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1810
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1811 m_print_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1812 = add_action (m_fileMenu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1813 m_resource_manager.icon ("document-print"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1814 tr ("Print..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1815 SLOT (request_print_file (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1816
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1817 // edit menu (undo, copy, paste and select all later via main window)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1818
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1819 m_edit_menu = add_menu (m_menu_bar, tr ("&Edit"));
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1820
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1821 m_redo_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1822 = add_action (m_edit_menu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1823 m_resource_manager.icon ("edit-redo"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1824 tr ("&Redo"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1825 SLOT (request_redo (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1826 m_redo_action->setEnabled (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1827
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1828 m_edit_menu->addSeparator ();
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1829
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1830 m_cut_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1831 = add_action (m_edit_menu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1832 m_resource_manager.icon ("edit-cut"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1833 tr ("Cu&t"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1834 SLOT (request_cut (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1835 m_cut_action->setEnabled (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1836
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1837 m_find_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1838 = add_action (m_edit_menu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	1839 m_resource_manager.icon ("edit-find-replace"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1840 tr ("&Find and Replace..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1841 SLOT (request_find (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1842
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1843 m_find_next_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1844 = add_action (m_edit_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1845 tr ("Find &Next..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1846 SLOT (request_find_next (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1847
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1848 m_find_previous_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1849 = add_action (m_edit_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1850 tr ("Find &Previous..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1851 SLOT (request_find_previous (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1852
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1853 m_edit_menu->addSeparator ();
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1854
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1855 m_edit_cmd_menu = m_edit_menu->addMenu (tr ("&Commands"));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1856
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1857 m_delete_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1858 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1859 tr ("Delete Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1860 SLOT (request_delete_line (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1861
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1862 m_copy_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1863 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1864 tr ("Copy Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1865 SLOT (request_copy_line (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1866
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1867 m_cut_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1868 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1869 tr ("Cut Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1870 SLOT (request_cut_line (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1871
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1872 m_edit_cmd_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1873
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1874 m_delete_start_word_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1875 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1876 tr ("Delete to Start of Word"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1877 SLOT (request_delete_start_word (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1878
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1879 m_delete_end_word_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1880 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1881 tr ("Delete to End of Word"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1882 SLOT (request_delete_end_word (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1883
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1884 m_delete_start_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1885 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1886 tr ("Delete to Start of Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1887 SLOT (request_delete_start_line (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1888
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1889 m_delete_end_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1890 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1891 tr ("Delete to End of Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1892 SLOT (request_delete_end_line (bool)));
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	1893
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1894 m_edit_cmd_menu->addSeparator ();
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	1895
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1896 m_duplicate_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1897 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1898 tr ("Duplicate Selection/Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1899 SLOT (request_duplicate_selection (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1900
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1901 m_transpose_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1902 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1903 tr ("Transpose Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1904 SLOT (request_transpose_line (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1905
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1906 m_edit_cmd_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1907
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1908 m_completion_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1909 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1910 tr ("&Show Completion List"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1911 SLOT (request_completion (bool)));
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1912
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1913 m_edit_fmt_menu = m_edit_menu->addMenu (tr ("&Format"));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1914
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1915 m_upper_case_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1916 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1917 tr ("&Uppercase Selection"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1918 SLOT (request_upper_case (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1919
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1920 m_lower_case_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1921 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1922 tr ("&Lowercase Selection"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1923 SLOT (request_lower_case (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1924
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1925 m_edit_fmt_menu->addSeparator ();
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1926
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1927 m_comment_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1928 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1929 tr ("&Comment"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1930 SLOT (request_comment_selected_text (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1931
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1932 m_uncomment_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1933 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1934 tr ("&Uncomment"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1935 SLOT (request_uncomment_selected_text (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1936
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1937 m_comment_var_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1938 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1939 tr ("Comment (Choosing String)"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1940 SLOT (request_comment_var_selected_text (bool)));
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1941
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1942 m_edit_fmt_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1943
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1944 m_indent_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1945 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1946 tr ("&Indent Selection Rigidly"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1947 SLOT (request_indent_selected_text (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1948
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1949 m_unindent_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1950 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1951 tr ("&Unindent Selection Rigidly"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1952 SLOT (request_unindent_selected_text (bool)));
19247 9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19246 diff changeset	1953
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1954 m_smart_indent_line_or_selection_action
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1955 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1956 tr ("Indent Code"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1957 SLOT (request_smart_indent_line_or_selected_text (void)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1958
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1959 m_edit_fmt_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1960
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1961 m_conv_eol_windows_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1962 = add_action (m_edit_fmt_menu,
25064 27ade14df345 Some minor string changes (bug #53526). Markus Mützel <markus.muetzel@gmx.de> parents: 25062 diff changeset	1963 tr ("Convert Line Endings to &Windows (CRLF)"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1964 SLOT (request_conv_eol_windows (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1965
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1966 m_conv_eol_unix_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1967 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1968 tr ("Convert Line Endings to &Unix (LF)"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1969 SLOT (request_conv_eol_unix (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1970
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1971 m_conv_eol_mac_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1972 = add_action (m_edit_fmt_menu,
26524 027f3c884763 Change EOL format label from "Mac (CR)" to "Legacy Mac (CR)" in GUI Andrew Janke <andrew@apjanke.net> parents: 26376 diff changeset	1973 tr ("Convert Line Endings to Legacy &Mac (CR)"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1974 SLOT (request_conv_eol_mac (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1975
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1976 m_edit_nav_menu = m_edit_menu->addMenu (tr ("Navi&gation"));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1977
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1978 m_goto_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1979 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1980 tr ("Go &to Line..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1981 SLOT (request_goto_line (bool)));
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24130 diff changeset	1982
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1983 m_edit_cmd_menu->addSeparator ();
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1984
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1985 m_move_to_matching_brace
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1986 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1987 tr ("Move to Matching Brace"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1988 SLOT (request_move_match_brace (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1989
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1990 m_sel_to_matching_brace
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1991 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1992 tr ("Select to Matching Brace"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1993 SLOT (request_sel_match_brace (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1994
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1995 m_edit_nav_menu->addSeparator ();
19247 9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19246 diff changeset	1996
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1997 m_next_bookmark_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1998 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1999 tr ("&Next Bookmark"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2000 SLOT (request_next_bookmark (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2001
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2002 m_previous_bookmark_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2003 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2004 tr ("Pre&vious Bookmark"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2005 SLOT (request_previous_bookmark (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2006
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2007 m_toggle_bookmark_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2008 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2009 tr ("Toggle &Bookmark"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2010 SLOT (request_toggle_bookmark (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2011
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2012 m_remove_bookmark_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2013 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2014 tr ("&Remove All Bookmarks"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2015 SLOT (request_remove_bookmark (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2016
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2017 m_edit_menu->addSeparator ();
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	2018
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2019 m_preferences_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2020 = add_action (m_edit_menu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2021 m_resource_manager.icon ("preferences-system"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2022 tr ("&Preferences..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2023 SLOT (request_preferences (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2024
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2025 m_styles_preferences_action
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2026 = add_action (m_edit_menu, m_resource_manager.icon ("preferences-system"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2027 tr ("&Styles Preferences..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2028 SLOT (request_styles_preferences (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2029
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2030 // view menu
19629 8ef79bc61d8a add actions for moving/selecting to matching brace Torsten <ttl@justmail.de> parents: 19608 diff changeset	2031
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2032 QMenu *view_menu = add_menu (m_menu_bar, tr ("&View"));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2033
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2034 m_view_editor_menu = view_menu->addMenu (tr ("&Editor"));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2035
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2036 m_show_linenum_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2037 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2038 tr ("Show &Line Numbers"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2039 SLOT (show_line_numbers (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2040 m_show_linenum_action->setCheckable (true);
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	2041
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2042 m_show_whitespace_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2043 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2044 tr ("Show &Whitespace Characters"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2045 SLOT (show_white_space (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2046 m_show_whitespace_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2047
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2048 m_show_eol_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2049 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2050 tr ("Show Line &Endings"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2051 SLOT (show_eol_chars (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2052 m_show_eol_action->setCheckable (true);
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	2053
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2054 m_show_indguide_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2055 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2056 tr ("Show &Indentation Guides"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2057 SLOT (show_indent_guides (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2058 m_show_indguide_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2059
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2060 m_show_longline_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2061 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2062 tr ("Show Long Line &Marker"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2063 SLOT (show_long_line (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2064 m_show_longline_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2065
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2066 m_view_editor_menu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2067
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2068 m_show_toolbar_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2069 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2070 tr ("Show &Toolbar"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2071 SLOT (show_toolbar (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2072 m_show_toolbar_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2073
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2074 m_show_statusbar_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2075 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2076 tr ("Show &Statusbar"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2077 SLOT (show_statusbar (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2078 m_show_statusbar_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2079
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2080 m_show_hscrollbar_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2081 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2082 tr ("Show &Horizontal Scrollbar"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2083 SLOT (show_hscrollbar (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2084 m_show_hscrollbar_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2085
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2086 view_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2087
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2088 m_zoom_in_action
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2089 = add_action (view_menu, m_resource_manager.icon ("zoom-in"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2090 tr ("Zoom &In"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2091 SLOT (zoom_in (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2092
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2093 m_zoom_out_action
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2094 = add_action (view_menu, m_resource_manager.icon ("zoom-out"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2095 tr ("Zoom &Out"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2096 SLOT (zoom_out (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2097
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2098 m_zoom_normal_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2099 = add_action (view_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2100 tr ("&Normal Size"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2101 SLOT (zoom_normal (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2102
27330 e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2103 view_menu->addSeparator ();
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2104
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2105 m_sort_tabs_action
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2106 = add_action (view_menu, tr ("&Sort Tabs Alphabetically"),
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2107 SLOT (sort_tabs_alph (void)),
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2108 m_tab_widget->get_tab_bar ());
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2109
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2110 m_menu_bar->addMenu (view_menu);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2111
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2112 // debug menu
21002 314245afff3a add a menu entry for showing/hiding the editor horizontal scrollbar Torsten <ttl@justmail.de> parents: 21001 diff changeset	2113
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2114 m_debug_menu = add_menu (m_menu_bar, tr ("&Debug"));
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	2115
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2116 m_toggle_breakpoint_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2117 = add_action (m_debug_menu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2118 m_resource_manager.icon ("bp-toggle"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2119 tr ("Toggle &Breakpoint"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2120 SLOT (request_toggle_breakpoint (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2121
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2122 m_next_breakpoint_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2123 = add_action (m_debug_menu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2124 m_resource_manager.icon ("bp-next"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2125 tr ("&Next Breakpoint"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2126 SLOT (request_next_breakpoint (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2127
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2128 m_previous_breakpoint_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2129 = add_action (m_debug_menu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2130 m_resource_manager.icon ("bp-prev"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2131 tr ("Pre&vious Breakpoint"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2132 SLOT (request_previous_breakpoint (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2133
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2134 m_remove_all_breakpoints_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2135 = add_action (m_debug_menu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2136 m_resource_manager.icon ("bp-rm-all"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2137 tr ("&Remove All Breakpoints"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2138 SLOT (request_remove_breakpoint (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2139
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2140 m_debug_menu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2141
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2142 // The other debug actions will be added by the main window.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2143
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2144 // run menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2145
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2146 QMenu *_run_menu = add_menu (m_menu_bar, tr ("&Run"));
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	2147
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2148 m_run_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2149 = add_action (_run_menu,
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2150 m_resource_manager.icon ("system-run"),
26875 ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	2151 tr ("Save File and Run / Continue"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2152 SLOT (request_run_file (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2153
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2154 m_run_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2155 = add_action (_run_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2156 tr ("Run &Selection"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2157 SLOT (request_context_run (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2158 m_run_selection_action->setEnabled (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2159
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2160 // help menu
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	2161
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2162 QMenu *_help_menu = add_menu (m_menu_bar, tr ("&Help"));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2163
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2164 m_context_help_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2165 = add_action (_help_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2166 tr ("&Help on Keyword"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2167 SLOT (request_context_help (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2168
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2169 m_context_doc_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2170 = add_action (_help_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2171 tr ("&Documentation on Keyword"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2172 SLOT (request_context_doc (bool)));
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	2173
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2174 // tab navigation (no menu, only actions; slots in tab_bar)
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2175
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2176 m_switch_left_tab_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2177 = add_action (nullptr, "", SLOT (switch_left_tab (void)),
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2178 m_tab_widget->get_tab_bar ());
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2179
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2180 m_switch_right_tab_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2181 = add_action (nullptr, "", SLOT (switch_right_tab (void)),
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2182 m_tab_widget->get_tab_bar ());
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2183
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2184 m_move_tab_left_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2185 = add_action (nullptr, "", SLOT (move_tab_left (void)),
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2186 m_tab_widget->get_tab_bar ());
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2187
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2188 m_move_tab_right_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2189 = add_action (nullptr, "", SLOT (move_tab_right (void)),
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2190 m_tab_widget->get_tab_bar ());
20693 7751bd56d0be added actions and shortcuts for switching editor tabs Torsten <ttl@justmail.de> parents: 20630 diff changeset	2191
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2192 // toolbar
20693 7751bd56d0be added actions and shortcuts for switching editor tabs Torsten <ttl@justmail.de> parents: 20630 diff changeset	2193
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2194 // popdown menu with mru files
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2195 QToolButton *popdown_button = new QToolButton ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2196 popdown_button->setToolTip (tr ("Recent Files"));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2197 popdown_button->setMenu (m_mru_file_menu);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2198 popdown_button->setPopupMode (QToolButton::InstantPopup);
26108 ed2339e64a57 Place down-arrow icon on most-recently-used popdown menu in editor (bug #55032). Rik <rik@octave.org> parents: 25293 diff changeset	2199 popdown_button->setArrowType (Qt::DownArrow);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2200 popdown_button->setToolButtonStyle (Qt::ToolButtonTextOnly);
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	2201
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2202 // new and open actions are inserted later from main window
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2203 m_popdown_mru_action = m_tool_bar->addWidget (popdown_button);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2204 m_tool_bar->addAction (m_save_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2205 m_tool_bar->addAction (m_save_as_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2206 m_tool_bar->addAction (m_print_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2207 m_tool_bar->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2208 // m_undo_action: later via main window
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2209 m_tool_bar->addAction (m_redo_action);
25813 d98d7df9fd15 updated context menus in editor and console window (bug #46884) Torsten <mttl@mailbox.org> parents: 25790 diff changeset	2210 m_tool_bar->addSeparator ();
27074 d302dfa0c572 fix order of cut, copy paste actions in editor menu and toolbar (bug #56230) Torsten Lilge <ttl-octave@mailbox.org> parents: 27055 diff changeset	2211 m_tool_bar->addAction (m_cut_action);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2212 // m_copy_action: later via the main window
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2213 // m_paste_action: later via the main window
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2214 m_tool_bar->addAction (m_find_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2215 //m_tool_bar->addAction (m_find_next_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2216 //m_tool_bar->addAction (m_find_previous_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2217 m_tool_bar->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2218 m_tool_bar->addAction (m_run_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2219 m_tool_bar->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2220 m_tool_bar->addAction (m_toggle_breakpoint_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2221 m_tool_bar->addAction (m_previous_breakpoint_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2222 m_tool_bar->addAction (m_next_breakpoint_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2223 m_tool_bar->addAction (m_remove_all_breakpoints_action);
20754 e6ccc8ae9e41 add list of mru files to the toolbar of the editor Torsten <ttl@justmail.de> parents: 20720 diff changeset	2224
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2225 // layout
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2226 QVBoxLayout *vbox_layout = new QVBoxLayout ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2227 vbox_layout->addWidget (m_menu_bar);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2228 vbox_layout->addWidget (m_tool_bar);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2229 vbox_layout->addWidget (m_tab_widget);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2230 vbox_layout->setMargin (0);
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	2231 vbox_layout->setSpacing (0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2232 editor_widget->setLayout (vbox_layout);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2233 setWidget (editor_widget);
16981 e86df0d43309 make ctrl-w available for readline in the gui terminal Torsten <ttl@justmail.de> parents: 16970 diff changeset	2234
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2235 // create the context menu of the tab bar
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2236 tab_bar *bar = m_tab_widget->get_tab_bar ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2237 QMenu *ctx_men = bar->get_context_menu ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2238 ctx_men->addAction (m_close_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2239 ctx_men->addAction (m_close_all_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2240 ctx_men->addAction (m_close_others_action);
27330 e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2241 ctx_men->addSeparator ();
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2242 ctx_men->addAction (m_sort_tabs_action);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2243
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2244 // signals
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2245 connect (this, SIGNAL (request_settings_dialog (const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2246 main_win (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2247 SLOT (process_settings_dialog_request (const QString&)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2248
26875 ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	2249 connect (this, SIGNAL (request_dbcont_signal (void)),
ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	2250 main_win (), SLOT (debug_continue (void)));
ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	2251
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2252 connect (m_mru_file_menu, SIGNAL (triggered (QAction *)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2253 this, SLOT (request_mru_open_file (QAction *)));
23321 ac4d0a72927a provide a context menu for the tab bar of the editor (bug #44605) Torsten <mttl@mailbox.org> parents: 23304 diff changeset	2254
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2255 mru_menu_update ();
23150 d133d90b495a connect execute command signal in editor constructor (bug #50171) Torsten <mttl@mailbox.org> parents: 23146 diff changeset	2256
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2257 connect (m_tab_widget, SIGNAL (tabCloseRequested (int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2258 this, SLOT (handle_tab_close_request (int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2259
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2260 connect (m_tab_widget, SIGNAL (currentChanged (int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2261 this, SLOT (active_tab_changed (int)));
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 17639 diff changeset	2262
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2263 resize (500, 400);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2264 setWindowIcon (QIcon (":/actions/icons/logo.png"));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2265 set_title (tr ("Editor"));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2266
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2267 check_actions ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2268 }
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2269
27400 7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2270 file_editor_tab *
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2271 file_editor::make_file_editor_tab (const QString& directory)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2272 {
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2273 file_editor_tab *f = new file_editor_tab (m_resource_manager, directory);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	2274
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2275 // signals from the qscintilla edit area
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2276 connect (f->qsci_edit_area (), SIGNAL (status_update (bool, bool)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2277 this, SLOT (edit_status_update (bool, bool)));
15356 842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15321 diff changeset	2278
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2279 connect (f->qsci_edit_area (), SIGNAL (show_doc_signal (const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2280 main_win (), SLOT (handle_show_doc (const QString&)));
20796 ed770c16a3e8 also store encoding and tab index with last editor session (bugs #46588, #45688) Torsten <ttl@justmail.de> parents: 20793 diff changeset	2281
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2282 connect (f->qsci_edit_area (), SIGNAL (create_context_menu_signal (QMenu *)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2283 this, SLOT (create_context_menu (QMenu *)));
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	2284
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2285 connect (f->qsci_edit_area (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2286 SIGNAL (execute_command_in_terminal_signal (const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2287 main_win (), SLOT (execute_command_in_terminal (const QString&)));
18689 fac35875f6eb update enabled status of undo/redo actions in the editor Torsten <ttl@justmail.de> parents: 18688 diff changeset	2288
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	2289 connect (f->qsci_edit_area (),
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	2290 SIGNAL (focus_console_after_command_signal (void)),
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	2291 main_win (), SLOT (focus_console_after_command (void)));
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	2292
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2293 // Signals from the file editor_tab
27053 1bdfd2b523c9 use tab icon for indicating a modified editor file (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27051 diff changeset	2294 connect (f, SIGNAL (file_name_changed (const QString&, const QString&, bool)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2295 this, SLOT (handle_file_name_changed (const QString&,
27053 1bdfd2b523c9 use tab icon for indicating a modified editor file (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27051 diff changeset	2296 const QString&, bool)));
19606 3156773fcc80 open a doc page from editor directly without command window Torsten <ttl@justmail.de> parents: 19605 diff changeset	2297
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2298 connect (f, SIGNAL (editor_state_changed (bool, bool)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2299 this, SLOT (handle_editor_state_changed (bool, bool)));
19608 4b980842edba clean up some signal-slot combinations in the editor Torsten <ttl@justmail.de> parents: 19606 diff changeset	2300
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2301 connect (f, SIGNAL (tab_remove_request ()),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2302 this, SLOT (handle_tab_remove_request ()));
19608 4b980842edba clean up some signal-slot combinations in the editor Torsten <ttl@justmail.de> parents: 19606 diff changeset	2303
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2304 connect (f, SIGNAL (add_filename_to_list (const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2305 const QString&, QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2306 this, SLOT (handle_add_filename_to_list (const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2307 const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2308 QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2309
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2310 connect (f, SIGNAL (editor_check_conflict_save (const QString&, bool)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2311 this, SLOT (check_conflict_save (const QString&, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2312
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2313 connect (f, SIGNAL (mru_add_file (const QString&, const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2314 this, SLOT (handle_mru_add_file (const QString&, const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2315
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2316 connect (f, SIGNAL (run_file_signal (const QFileInfo&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2317 main_win (), SLOT (run_file_in_terminal (const QFileInfo&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2318
25895 bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25813 diff changeset	2319 connect (f, SIGNAL (request_open_file (const QString&, const QString&)),
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25813 diff changeset	2320 this, SLOT (request_open_file (const QString&, const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2321
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2322 connect (f, SIGNAL (edit_mfile_request (const QString&, const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2323 const QString&, int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2324 main_win (), SLOT (handle_edit_mfile_request (const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2325 const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2326 const QString&, int)));
19605 d258070914ef open file directly without edit command when editing a function from editor Torsten <ttl@justmail.de> parents: 19599 diff changeset	2327
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2328 connect (f, SIGNAL (set_focus_editor_signal (QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2329 this, SLOT (set_focus (QWidget*)));
20995 aab7a3c7168e edit a file from an error message in the terminal (bug #35619) Torsten <ttl@justmail.de> parents: 20992 diff changeset	2330
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2331 // Signals from the file_editor non-trivial operations
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27605 diff changeset	2332 connect (this, SIGNAL (fetab_settings_changed (const gui_settings *)),
0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27605 diff changeset	2333 f, SLOT (notice_settings (const gui_settings *)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2334
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2335 connect (this, SIGNAL (fetab_change_request (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2336 f, SLOT (change_editor_state (const QWidget*)));
23177 0b59e37dd83e unhide editor when a file was changed by an external application (bug #50106) Torsten <mttl@mailbox.org> parents: 23152 diff changeset	2337
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2338 connect (this, SIGNAL (fetab_file_name_query (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2339 f, SLOT (file_name_query (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2340
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2341 connect (this, SIGNAL (fetab_save_file (const QWidget*, const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2342 bool)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2343 f, SLOT (save_file (const QWidget*, const QString&, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2344
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2345 connect (this, SIGNAL (fetab_check_modified_file (void)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2346 f, SLOT (check_modified_file (void)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2347
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2348 // Signals from the file_editor trivial operations
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2349 connect (this, SIGNAL (fetab_recover_from_exit (void)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2350 f, SLOT (recover_from_exit (void)));
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	2351
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2352 connect (this, SIGNAL (fetab_set_directory (const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2353 f, SLOT (set_current_directory (const QString&)));
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	2354
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2355 connect (this, SIGNAL (fetab_zoom_in (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2356 f, SLOT (zoom_in (const QWidget*)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2357 connect (this, SIGNAL (fetab_zoom_out (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2358 f, SLOT (zoom_out (const QWidget*)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2359 connect (this, SIGNAL (fetab_zoom_normal (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2360 f, SLOT (zoom_normal (const QWidget*)));
19803 415864f5b85f communicating actual working directory to the editor (#44298) Torsten <ttl@justmail.de> parents: 19739 diff changeset	2361
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2362 connect (this, SIGNAL (fetab_context_help (const QWidget*, bool)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2363 f, SLOT (context_help (const QWidget*, bool)));
18560 26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18555 diff changeset	2364
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2365 connect (this, SIGNAL (fetab_context_edit (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2366 f, SLOT (context_edit (const QWidget*)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2367
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2368 connect (this, SIGNAL (fetab_save_file (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2369 f, SLOT (save_file (const QWidget*)));
17627 811019b9ef57 Add help and documentation on actual keyword to the editor menu Torsten <ttl@justmail.de> parents: 17009 diff changeset	2370
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2371 connect (this, SIGNAL (fetab_save_file_as (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2372 f, SLOT (save_file_as (const QWidget*)));
17628 99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	2373
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2374 connect (this, SIGNAL (fetab_print_file (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2375 f, SLOT (print_file (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2376
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26561 diff changeset	2377 connect (this, SIGNAL (fetab_run_file (const QWidget*, bool)),
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26561 diff changeset	2378 f, SLOT (run_file (const QWidget*, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2379
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2380 connect (this, SIGNAL (fetab_context_run (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2381 f, SLOT (context_run (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2382
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2383 connect (this, SIGNAL (fetab_toggle_bookmark (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2384 f, SLOT (toggle_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2385
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2386 connect (this, SIGNAL (fetab_next_bookmark (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2387 f, SLOT (next_bookmark (const QWidget*)));
17635 7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	2388
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2389 connect (this, SIGNAL (fetab_previous_bookmark (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2390 f, SLOT (previous_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2391
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2392 connect (this, SIGNAL (fetab_remove_bookmark (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2393 f, SLOT (remove_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2394
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2395 connect (this, SIGNAL (fetab_toggle_breakpoint (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2396 f, SLOT (toggle_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2397
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2398 connect (this, SIGNAL (fetab_next_breakpoint (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2399 f, SLOT (next_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2400
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2401 connect (this, SIGNAL (fetab_previous_breakpoint (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2402 f, SLOT (previous_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2403
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2404 connect (this, SIGNAL (fetab_remove_all_breakpoints (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2405 f, SLOT (remove_all_breakpoints (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2406
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2407 connect (this, SIGNAL (fetab_scintilla_command (const QWidget *,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2408 unsigned int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2409 f, SLOT (scintilla_command (const QWidget *, unsigned int)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2410
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2411 connect (this, SIGNAL (fetab_comment_selected_text (const QWidget*, bool)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2412 f, SLOT (comment_selected_text (const QWidget*, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2413
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2414 connect (this, SIGNAL (fetab_uncomment_selected_text (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2415 f, SLOT (uncomment_selected_text (const QWidget*)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2416
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2417 connect (this, SIGNAL (fetab_indent_selected_text (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2418 f, SLOT (indent_selected_text (const QWidget*)));
18656 1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18651 diff changeset	2419
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2420 connect (this, SIGNAL (fetab_unindent_selected_text (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2421 f, SLOT (unindent_selected_text (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2422
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2423 connect (this, SIGNAL (fetab_smart_indent_line_or_selected_text (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2424 f, SLOT (smart_indent_line_or_selected_text (const QWidget*)));
18303 106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18294 diff changeset	2425
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2426 connect (this,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2427 SIGNAL (fetab_convert_eol (const QWidget*, QsciScintilla::EolMode)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2428 f, SLOT (convert_eol (const QWidget*, QsciScintilla::EolMode)));
18303 106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18294 diff changeset	2429
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2430 connect (this, SIGNAL (fetab_find (const QWidget, QList<QAction >)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2431 f, SLOT (find (const QWidget, QList<QAction >)));
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24130 diff changeset	2432
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2433 connect (this, SIGNAL (fetab_find_next (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2434 f, SLOT (find_next (const QWidget*)));
19247 9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19246 diff changeset	2435
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2436 connect (this, SIGNAL (fetab_find_previous (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2437 f, SLOT (find_previous (const QWidget*)));
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	2438
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2439 connect (this, SIGNAL (fetab_goto_line (const QWidget*, int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2440 f, SLOT (goto_line (const QWidget*, int)));
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	2441
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2442 connect (this, SIGNAL (fetab_move_match_brace (const QWidget*, bool)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2443 f, SLOT (move_match_brace (const QWidget*, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2444
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2445 connect (this, SIGNAL (fetab_completion (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2446 f, SLOT (show_auto_completion (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2447
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2448 connect (this, SIGNAL (fetab_set_focus (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2449 f, SLOT (set_focus (const QWidget*)));
19629 8ef79bc61d8a add actions for moving/selecting to matching brace Torsten <ttl@justmail.de> parents: 19608 diff changeset	2450
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	2451 connect (this, SIGNAL (fetab_toplevel_changed (bool)),
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	2452 f, SLOT (handle_toplevel_changed (bool)));
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	2453
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2454 connect (this, SIGNAL (fetab_insert_debugger_pointer (const QWidget*, int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2455 f, SLOT (insert_debugger_pointer (const QWidget*, int)));
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	2456
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2457 connect (this, SIGNAL (fetab_delete_debugger_pointer (const QWidget*, int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2458 f, SLOT (delete_debugger_pointer (const QWidget*, int)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2459
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27120 diff changeset	2460 connect (f, SIGNAL (debug_quit_signal (void)),
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27120 diff changeset	2461 main_win (), SLOT (debug_quit (void)));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27120 diff changeset	2462
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2463 connect (this, SIGNAL (fetab_do_breakpoint_marker (bool, const QWidget*,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2464 int, const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2465 f, SLOT (do_breakpoint_marker (bool, const QWidget*, int,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2466 const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2467
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2468 // Any interpreter_event signal from a file_editor_tab_widget is
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2469 // handled the same as for the parent main_window object.
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2470
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2471 connect (f, SIGNAL (interpreter_event (const fcn_callback&)),
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2472 this, SIGNAL (interpreter_event (const fcn_callback&)));
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2473
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2474 connect (f, SIGNAL (interpreter_event (const meth_callback&)),
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2475 this, SIGNAL (interpreter_event (const meth_callback&)));
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2476
27400 7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2477 return f;
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2478 }
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2479
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2480 void file_editor::add_file_editor_tab (file_editor_tab *f, const QString& fn,
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2481 int index)
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2482 {
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2483 if (index == -1)
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2484 m_tab_widget->addTab (f, fn);
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2485 else
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2486 m_tab_widget->insertTab (index, f, fn);
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2487
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2488 m_tab_widget->setCurrentWidget (f);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2489
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2490 check_actions ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2491 }
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	2492
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2493 void file_editor::mru_menu_update (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2494 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2495 int num_files = qMin (m_mru_files.size (), int (MaxMRUFiles));
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	2496
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2497 // configure and show active actions of mru-menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2498 for (int i = 0; i < num_files; ++i)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2499 {
25062 32a7222d637a [mq]: tr Rik <rik@octave.org> parents: 25054 diff changeset	2500 QString text = QString ("&%1 %2").
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2501 arg ((i+1) % int (MaxMRUFiles)).arg (m_mru_files.at (i));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2502 m_mru_file_actions[i]->setText (text);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2503
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2504 QStringList action_data;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2505 action_data << m_mru_files.at (i) << m_mru_files_encodings.at (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2506 m_mru_file_actions[i]->setData (action_data);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2507
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2508 m_mru_file_actions[i]->setVisible (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2509 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2510
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2511 // hide unused mru-menu entries
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2512 for (int j = num_files; j < MaxMRUFiles; ++j)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2513 m_mru_file_actions[j]->setVisible (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2514
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2515 // delete entries in string-list beyond MaxMRUFiles
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2516 while (m_mru_files.size () > MaxMRUFiles)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2517 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2518 m_mru_files.removeLast ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2519 m_mru_files_encodings.removeLast ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2520 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2521
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2522 // save actual mru-list in settings
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2523 gui_settings *settings = m_resource_manager.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2524
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2525 settings->setValue ("editor/mru_file_list", m_mru_files);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2526 settings->setValue ("editor/mru_file_encodings", m_mru_files_encodings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2527 settings->sync ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2528 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2529
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2530 bool file_editor::call_custom_editor (const QString& file_name, int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2531 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2532 // Check if the user wants to use a custom file editor.
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2533 gui_settings *settings = m_resource_manager.get_settings ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2534
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2535 if (settings->value ("useCustomFileEditor",false).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2536 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2537 // use the external editor interface for handling the call
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2538 emit request_open_file_external (file_name, line);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2539
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2540 if (line < 0 && ! file_name.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2541 handle_mru_add_file (QFileInfo (file_name).canonicalFilePath (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2542 QString ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2543
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2544 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2545 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2546
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2547 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2548 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2549
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2550 void file_editor::toggle_preference (const QString& preference, bool def)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2551 {
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	2552 gui_settings *settings = m_resource_manager.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2553 bool old = settings->value (preference,def).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2554 settings->setValue (preference,! old);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2555 notice_settings (settings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2556 }
19945 f7a805f02723 link undo in main window to editor if the latter has focus (bug #44402) Torsten <ttl@justmail.de> parents: 19930 diff changeset	2557
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2558 // Function for closing the files in a removed directory
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2559 void file_editor::handle_dir_remove (const QString& old_name,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2560 const QString& new_name)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2561 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2562 QDir old_dir (old_name);
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2563 session_data f_data;
20693 7751bd56d0be added actions and shortcuts for switching editor tabs Torsten <ttl@justmail.de> parents: 20630 diff changeset	2564
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2565 // Have all file editor tabs signal what their filenames are.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2566 m_editor_tab_map.clear ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2567 emit fetab_file_name_query (nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2568
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2569 // Loop over all open files and pick those within old_dir
25343 4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	2570 for (auto p = m_editor_tab_map.cbegin ();
4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	2571 p != m_editor_tab_map.cend (); p++)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2572 {
26928 3e6aa7c7bbbb prevent unnamed editor tab from being closed by rmdir (bug #55888) Torsten Lilge <ttl-octave@mailbox.org> parents: 26554 diff changeset	2573 if (p->first.isEmpty ())
3e6aa7c7bbbb prevent unnamed editor tab from being closed by rmdir (bug #55888) Torsten Lilge <ttl-octave@mailbox.org> parents: 26554 diff changeset	2574 continue; // Nothing to do, no valid file name
3e6aa7c7bbbb prevent unnamed editor tab from being closed by rmdir (bug #55888) Torsten Lilge <ttl-octave@mailbox.org> parents: 26554 diff changeset	2575
27047 66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2576 // Get abs. file path and its path relative to the removed directory
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2577 QString rel_path_to_file = old_dir.relativeFilePath (p->first);
27047 66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2578 QString abs_path_to_file = old_dir.absoluteFilePath (p->first);
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2579
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2580 // Test whether the file is located within the directory that will
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2581 // be removed. For this, two conditions must be met:
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2582 // 1. The path of the file rel. to the dir is not equal to the
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2583 // its absolute one.
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2584 // If both are equal, then there is no relative path and removed
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2585 // directoy and file are on different drives (e.g.on windows)
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2586 // 2. The (real) relative path does not start with "../", i.e.,
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2587 // the file can be reached from the directory by descending only
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2588 if ((rel_path_to_file != abs_path_to_file)
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2589 && (rel_path_to_file.left (3) != QString ("../")))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2590 {
27047 66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2591 // The currently considered file is included in the
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2592 // removed/renamed diectory: Delete it.
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2593 m_no_focus = true; // Remember for not focussing editor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2594 file_editor_tab *editor_tab
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2595 = static_cast<file_editor_tab *> (p->second.fet_ID);
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2596 if (editor_tab)
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2597 {
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2598 // Get index and line
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2599 int l, c;
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2600 editor_tab->qsci_edit_area ()->getCursorPosition (&l, &c);
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2601 f_data.line = l + 1;
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2602 f_data.index = m_tab_widget->indexOf (p->second.fet_ID);
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2603 // Close
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2604 editor_tab->file_has_changed (QString (), true);
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2605 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2606 m_no_focus = false; // Back to normal
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2607
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2608 // Store file for possible later reload
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2609 f_data.file_name = p->first;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2610
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2611 // Add the new file path and the encoding for later reloading
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2612 // if new_name is given
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2613 if (! new_name.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2614 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2615 QDir new_dir (new_name);
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2616 QString append_to_new_dir;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2617 if (new_dir.exists ())
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2618 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2619 // The new directory already exists (movefile was used).
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2620 // This means, we have to add the name (not the path)
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2621 // of the old dir and the relative path to the file
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2622 // to new dir.
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2623 append_to_new_dir = old_dir.dirName () +
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2624 "/" + rel_path_to_file;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2625 }
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2626 else
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2627 append_to_new_dir = rel_path_to_file;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2628
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2629 f_data.new_file_name
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2630 = new_dir.absoluteFilePath (append_to_new_dir);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2631 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2632 else
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2633 f_data.new_file_name = ""; // no new name, just removing this file
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2634
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2635 f_data.encoding = p->second.encoding; // store the encoding
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2636
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2637 // Store data in list for later reloading
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2638 m_tmp_closed_files << f_data;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2639 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2640 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2641 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2642
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2643 bool file_editor::editor_tab_has_focus (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2644 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2645 QWidget *foc_w = focusWidget ();
24730 05c9f42512cb * file-editor.cc: fix broken copy/cut/past/undo actions Torsten <mttl@mailbox.org> parents: 24717 diff changeset	2646 if (foc_w && foc_w->inherits ("octave::octave_qscintilla"))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2647 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2648 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2649 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2650
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2651 // Check whether this file is already open in the editor.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2652 QWidget * file_editor::find_tab_widget (const QString& file)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2653 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2654 // Have all file editor tabs signal what their filenames are.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2655 m_editor_tab_map.clear ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2656 emit fetab_file_name_query (nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2657
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2658 // Check all tabs for the given file name
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2659 QWidget *retval = nullptr;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2660
25343 4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	2661 for (auto p = m_editor_tab_map.cbegin ();
4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	2662 p != m_editor_tab_map.cend (); p++)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2663 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2664 QString tab_file = p->first;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2665 if (same_file (file.toStdString (), tab_file.toStdString ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2666 \|\| file == tab_file) // needed as same_file ("","") is false.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2667 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2668 retval = p->second.fet_ID;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2669 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2670 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2671 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2672
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2673 return retval;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2674 }
23321 ac4d0a72927a provide a context menu for the tab bar of the editor (bug #44605) Torsten <mttl@mailbox.org> parents: 23304 diff changeset	2675
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2676 QAction * file_editor::add_action (QMenu *menu, const QString& text,
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2677 const char *member,
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2678 QWidget *receiver)
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2679 {
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2680 return add_action (menu, QIcon (), text, member, receiver);
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2681 }
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2682
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2683 QAction * file_editor::add_action (QMenu *menu, const QIcon& icon,
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2684 const QString& text, const char *member,
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2685 QWidget *receiver)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2686 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2687 QAction *a;
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2688 QWidget *r = this;
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2689
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2690 if (receiver != nullptr)
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2691 r = receiver;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2692
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2693 if (menu)
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2694 a = menu->addAction (icon, text, r, member);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2695 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2696 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2697 a = new QAction (this);
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2698 connect (a, SIGNAL (triggered ()), r, member);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2699 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2700
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2701 addAction (a); // important for shortcut context
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2702 a->setShortcutContext (Qt::WidgetWithChildrenShortcut);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2703
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2704 return a;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2705 }
23276 ea143f4f76a5 Allow to close an editor tab with the middle mouse button (bug #44605) Torsten <mttl@mailbox.org> parents: 23223 diff changeset	2706
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2707 QMenu* file_editor::add_menu (QMenuBar *p, QString name)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2708 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2709 QMenu *menu = p->addMenu (name);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2710
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2711 QString base_name = name; // get a copy
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2712 // replace intended '&' ("&&") by a temp. string
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2713 base_name.replace ("&&", "___octave_amp_replacement___");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2714 // remove single '&' (shortcut)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2715 base_name.remove ("&");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2716 // restore intended '&'
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2717 base_name.replace ("___octave_amp_replacement___", "&&");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2718
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2719 // remember names with and without shortcut
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2720 m_hash_menu_text[menu] = QStringList () << name << base_name;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2721
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2722 return menu;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2723 }
23304 fb495c47e82d allow double left click for closing tabs in the file editor (bug #44605) Torsten <mttl@mailbox.org> parents: 23300 diff changeset	2724 }
fb495c47e82d allow double left click for closing tabs in the file editor (bug #44605) Torsten <mttl@mailbox.org> parents: 23300 diff changeset	2725
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	2726 #endif

Mercurial > octave

annotate libgui/src/m-editor/file-editor.cc @ 27620:45bb5bbaf291