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

annotate libgui/src/m-editor/file-editor.cc @ 27630:262cdd0f7619

don't use singleton pattern for shortcut manager in GUI Move ownership of the shorcut_manager object to the base_qobject class. Eliminate static member functions in shortcut_managar class. Provide a get_shortcut_manager method in the base_qboject class and access reference to shortcut_manager object from m_octave_qobj member variables in classes that need it.

author	John W. Eaton <jwe@octave.org>
date	Mon, 04 Nov 2019 14:03:00 -0500
parents	8b6e928e0705
children	fd009322dd9f

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"
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	47 #include "octave-qobject.h"
27412 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
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	87 file_editor::file_editor (QWidget *p, base_qobject& oct_qobj)
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	88 : file_editor_interface (p, oct_qobj)
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 {
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	160 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	161 gui_settings *settings = rmgr.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	162 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	163 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	164
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 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	166 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	167
ce972086bfd6 save & run action in editor now also continues in debug mode (bug #44730) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	168 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	169 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	170
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	171 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	172 {
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	173 shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager ();
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	174 scmgr.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	175 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	176 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	177
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	178 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	179 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	180 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	181
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	182 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	183 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	184 m_edit_nav_menu->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	185
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	186 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	187 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	188 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	189 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	190 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	191 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	192
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	193 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	194 m_context_doc_action->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	195
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	196 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	197 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	198 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	199 m_zoom_normal_action->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	200
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	201 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	202 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	203 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	204 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	205 m_run_action->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	206
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	207 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	208 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	209 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	210 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	211 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	212 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	213 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	214
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26561 diff changeset	215 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	216 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	217
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	218 // 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	219 // 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	220 // (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	221 // 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	222 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	223 {
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	224 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	225 gui_settings *settings = rmgr.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	226 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	227 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	228
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	229 bool real_visible;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	230
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	231 if (startup)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	232 real_visible = isVisible ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	233 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	234 real_visible = visible;
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 (! 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	237 return;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	238
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	239 if (startup && ! isFloating ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	240 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	241 // 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	242 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	243
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	244 bool in_tab = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	245 int i = 0;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	246 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	247 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	248 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	249 i++;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	250
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	251 int j = 0;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	252 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	253 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	254 // 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	255 if (tab->tabText (j) == windowTitle ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	256 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	257 // 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	258 in_tab = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	259 int top = tab->currentIndex ();
26554 8d2e8d5d617d fixed dead assignments in libgui (bug #55440) Torsten <mttl@mailbox.org> parents: 26524 diff changeset	260 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	261 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	262 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	263 j++;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	264 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	265 }
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
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	268 request_new_file ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	269 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	270
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27605 diff changeset	271 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	272 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	273 //restore previous session
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	274 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	275 return;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	276
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	277 // 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	278 QStringList sessionFileNames
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	279 = 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	280 .toStringList ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	281
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	282 QStringList session_encodings
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	283 = 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	284 .toStringList ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	285
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	286 QStringList session_index
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	287 = 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	288 .toStringList ();
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	289
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	290 QStringList session_lines
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	291 = 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	292 .toStringList ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	293
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	294 // 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	295 QList<session_data> s_data;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	296
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	297 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	298 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	299 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	300
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	301 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	302 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	303 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	304 if (! file.exists ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	305 continue;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	306
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	307 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	308 QString (), QString ()};
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	309 if (do_lines)
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	310 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	311 if (do_index)
25293 ae0518976e2b open files in correct order when restoring editor session (bug #53711) Torsten <mttl@mailbox.org> parents: 25274 diff changeset	312 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	313 if (do_encoding)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	314 item.encoding = session_encodings.at (n);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	315
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	316 s_data << item;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	317 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	318
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	319 qSort (s_data);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	320
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	321 // 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	322 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	323 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	324 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	325 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	326
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	327 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	328 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	329 if (m_no_focus)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	330 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	331
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	332 octave_dock_widget::activate ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	333
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	334 // set focus to current tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	335 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	336 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	337 emit fetab_set_focus (fileEditorTab);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	338 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	339
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	340 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	341 {
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	342 setFocus ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	343
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	344 // set focus to desired tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	345 if (fet)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	346 m_tab_widget->setCurrentWidget (fet);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	347 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	348
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	349 // 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	350 // focus of the editor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	351 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	352 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	353 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	354
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	355 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	356 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	357 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	358 ++i;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	359 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	360
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	361 // 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	362 // 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	363 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	364 {
27075 fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	365 if (enable)
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 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	368 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	369 }
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	370 else
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	371 {
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	372 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	373 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	374 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	375 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	376 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	377 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	378 }
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	379
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	380 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	381 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	382 // 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	383 // 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	384 // 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	385 // 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	386 // 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	387 // 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	388
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	389 // 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	390 m_editor_tab_map.clear ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	391 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	392
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	393 // Save all tabs with confirmation.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	394 file_editor_tab::reset_cancel ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	395 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	396
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	397 // 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	398 // 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	399 // 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	400 // 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	401 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	402 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	403 emit fetab_recover_from_exit ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	404 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	405 }
21054 221847e5f488 fix issues when restoring breakpoints and closing tabs or whole application Torsten <ttl@justmail.de> parents: 21002 diff changeset	406
27605 60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	407 // 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	408 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	409
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	410 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	411 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	412 {
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	413 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	414 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	415 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	416 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	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 return true;
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
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	422 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	423 {
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	424 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	425
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	426 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	427 return;
60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	428
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	429 // 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	430
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	431 // Save open files for restoring in next session; this only is possible
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	432 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	433 gui_settings *settings = rmgr.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	434
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	435 // 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	436 // 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	437 QStringList fetFileNames;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	438 QStringList fet_encodings;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	439 QStringList fet_index;
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	440 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	441
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	442 // 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	443 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	444 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	445 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	446 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	447 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	448 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	449 fetFileNames.append (file_name);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	450 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	451
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	452 QString index;
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	453 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	454 = 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	455 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	456 (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	457
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	458 int l, c;
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	459 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	460 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	461 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	462 }
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	463
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	464 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	465 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	466 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	467 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	468 settings->sync ();
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	469
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	470 // 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	471 // 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	472 // 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	473 // 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	474 bool vis = isVisible ();
7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	475
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	476 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	477 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	478 // 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	479 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	480 m_tab_widget->removeTab (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	481 }
17903 de8591a19bc6 check for custom editor when opening a new file from the gui (bug #40496) Torsten <ttl@justmail.de> parents: 17901 diff changeset	482
25357 7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	483 setVisible (vis);
7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	484
27605 60cecb3fed04 fix saving modified files when closing editor tabs or octave Torsten Lilge <ttl-octave@mailbox.org> parents: 27560 diff changeset	485 octave_dock_widget::close ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	486 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	487
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	488 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	489 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	490 // 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	491 // 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	492 if (call_custom_editor ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	493 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	494
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	495 // 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	496 // 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	497 // 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	498
27400 7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	499 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	500 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	501 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	502 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	503 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	504
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	505 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	506 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	507 file_editor_tab *editor_tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	508 = 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	509 editor_tab->conditional_close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	510 }
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 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	513 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	514 file_editor_tab *editor_tab;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	515
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	516 // 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	517 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	518 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	519 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	520 editor_tab->conditional_close ();
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 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	523
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	524 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	525 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	526 file_editor_tab *editor_tab;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	527 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	528
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	529 // 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	530 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	531 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	532 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	533 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	534 editor_tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	535 = 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	536 editor_tab->conditional_close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	537 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	538 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	539 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	540
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	541 // 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	542 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	543 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	544 if (action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	545 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	546 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	547 action->data ().toStringList ().at (1));
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 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	550
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	551 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	552 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	553 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	554 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	555
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	556 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	557 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	558 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	559 QsciScintillaBase::SCI_REDO);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	560 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	561
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	562 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	563 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	564 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	565 QsciScintillaBase::SCI_CUT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	566 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	567
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	568 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	569 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	570 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	571 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	572
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	573 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	574 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	575 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	576 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	577
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	578 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	579 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	580 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	581 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	582
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	583 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	584 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	585 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	586 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	587
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	588 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	589 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	590 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	591 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	592
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	593 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	594 {
27404 a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	595 emit interpreter_event
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	596 ([this] (interpreter& interp)
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 // INTERPRETER THREAD
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	599
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	600 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	601
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	602 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	603 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	604 else
a3ec8c75ece3 avoid possible threading issue when running file from GUI editor John W. Eaton <jwe@octave.org> parents: 27400 diff changeset	605 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	606 });
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	607 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	608
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	609 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	610 {
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26561 diff changeset	611 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	612 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	613
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	614 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	615 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	616 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	617 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	618
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	619 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	620 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	621 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	622 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	623
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	624 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	625 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	626 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	627 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	628
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	629 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	630 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	631 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	632 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	633
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	634 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	635 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	636 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	637 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	638
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	639 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	640 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	641 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	642 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	643
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	644 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	645 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	646 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	647 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	648
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	649 // 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	650 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	651 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	652 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	653 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	654
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	655 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	656 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	657 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	658 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	659
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	660 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	661 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	662 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	663 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	664
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	665 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	666 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	667 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	668 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	669
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	670 // slots for Edit->Commands actions
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	671 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	672 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	673 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	674 QsciScintillaBase::SCI_DELWORDLEFT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	675 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	676
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	677 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	678 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	679 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	680 QsciScintillaBase::SCI_DELWORDRIGHT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	681 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	682
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	683 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	684 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	685 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	686 QsciScintillaBase::SCI_DELLINELEFT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	687 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	688
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	689 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	690 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	691 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	692 QsciScintillaBase::SCI_DELLINERIGHT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	693 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	694
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	695 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	696 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	697 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	698 QsciScintillaBase::SCI_LINEDELETE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	699 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	700
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	701 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	702 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	703 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	704 QsciScintillaBase::SCI_LINECOPY);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	705 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	706
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	707 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	708 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	709 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	710 QsciScintillaBase::SCI_LINECUT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	711 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	712
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	713 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	714 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	715 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	716 QsciScintillaBase::SCI_SELECTIONDUPLICATE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	717 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	718
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	719 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	720 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	721 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	722 QsciScintillaBase::SCI_LINETRANSPOSE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	723 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	724
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	725 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	726 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	727 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	728 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	729
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	730 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	731 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	732 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	733 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	734
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	735 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	736 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	737 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	738 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	739
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	740 // slots for Edit->Format actions
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	741 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	742 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	743 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	744 QsciScintillaBase::SCI_UPPERCASE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	745 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	746
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	747 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	748 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	749 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	750 QsciScintillaBase::SCI_LOWERCASE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	751 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	752
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	753 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	754 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	755 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	756 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	757
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	758 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	759 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	760 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	761 }
24484 abb075ada761 Allow commenting with manually selected comment strings (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	762
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	763 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	764 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	765 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	766 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	767
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	768 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	769 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	770 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	771 QsciScintilla::EolWindows);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	772 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	773 void
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	774 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	775 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	776 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	777 QsciScintilla::EolUnix);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	778 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	779
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	780 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	781 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	782 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	783 QsciScintilla::EolMac);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	784 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	785
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	786 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	787 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	788 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	789 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	790
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	791 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	792 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	793 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	794 }
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24130 diff changeset	795
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	796 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	797 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	798 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	799 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	800
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	801 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	802 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	803 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	804 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	805
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	806 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	807 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	808 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	809 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	810
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	811 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	812 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	813 bool modified)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	814 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	815 QObject *fileEditorTab = sender ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	816 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	817 {
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	818 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	819
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	820 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	821 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	822 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	823 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	824 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	825 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	826 if (modified)
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	827 m_tab_widget->setTabIcon (i, rmgr.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	828 else
1bdfd2b523c9 use tab icon for indicating a modified editor file (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27051 diff changeset	829 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	830 }
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 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	833 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	834
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	835 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	836 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	837 file_editor_tab *editor_tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	838 = 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	839 editor_tab->conditional_close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	840 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	841
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	842 void
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	843 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	844 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	845 QObject *fileEditorTab = sender ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	846 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	847 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	848 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	849 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	850 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	851 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	852 m_tab_widget->removeTab (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	853 // 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	854 // 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	855 delete fileEditorTab;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	856 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	857 }
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 check_actions ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	861
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	862 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	863
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	864 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	865
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	866 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	867 const QString& encoding, QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	868 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	869 // 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	870 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	871 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	872 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	873
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	874 // context menu of edit area
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	875 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	876 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	877 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	878 activate ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	879 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	880
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	881 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	882 bool is_octave_file)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	883 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	884 // 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	885 // 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	886 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	887 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	888 if (m_copy_action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	889 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	890 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	891 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	892 m_run_action->setEnabled (is_octave_file);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	893
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	894 setFocusProxy (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	895 }
27075 fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	896
fb427fafd494 fix enabled copy action in editor without selected text Torsten Lilge <ttl-octave@mailbox.org> parents: 27074 diff changeset	897 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	898 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	899 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	900
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	901 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	902 const QString& encoding)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	903 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	904 int index;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	905 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	906 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	907 m_mru_files.removeAt (index);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	908 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	909 }
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 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	912 m_mru_files_encodings.prepend (encoding);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	913
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	914 mru_menu_update ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	915 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	916
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	917 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	918 bool remove_on_success)
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 // 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	921 QWidget *tab = find_tab_widget (saveFileName);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	922
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	923 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	924 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	925 // 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	926 // 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	927 // 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	928 // 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	929 // 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	930 // 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	931
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	932 // 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	933 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	934 = 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	935 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	936 "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	937 arg (saveFileName),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	938 QMessageBox::Ok, nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	939
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	940 msgBox->setWindowModality (Qt::NonModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	941 msgBox->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	942 msgBox->show ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	943
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	944 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	945 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	946
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	947 QObject *saveFileObject = sender ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	948 QWidget *saveFileWidget = nullptr;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	949
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	950 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	951 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	952 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	953 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	954 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	955 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	956 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	957 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	958 if (! saveFileWidget)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	959 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	960 // 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	961 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	962 = 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	963 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	964 QMessageBox::Ok, nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	965
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	966 msgBox->setWindowModality (Qt::NonModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	967 msgBox->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	968 msgBox->show ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	969
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	970 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	971 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	972
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	973 // 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	974 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	975 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	976
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	977 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	978 int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	979 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	980 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	981 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	982
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	983 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	984 int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	985 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	986 if (! file.isEmpty ())
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 // 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	989 QWidget *tab = find_tab_widget (file);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	990
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	991 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	992 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	993 m_tab_widget->setCurrentWidget (tab);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	994
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	995 if (line > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	996 emit fetab_delete_debugger_pointer (tab, line);
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 emit fetab_set_focus (tab);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	999 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1000 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1001 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1002
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1003 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	1004 const QString& file,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1005 int line,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1006 const QString& cond)
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, 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	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 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	1012 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1013 request_open_file (file);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1014 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1015
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1016 // 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	1017 // 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	1018 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	1019 const QString& new_name)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1020 {
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1021 // 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	1022 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	1023 session_data f_data;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1024
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1025 // 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	1026 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	1027 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	1028
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	1029 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	1030 && 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	1031 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	1032
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1033 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	1034
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1035 // 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	1036 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	1037 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	1038
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1039 // 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	1040 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	1041 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1042 // 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	1043 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	1044
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1045 if (old.isDir ())
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1046 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1047 // 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	1048 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	1049 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1050 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1051 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1052 // 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	1053 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	1054 = 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	1055
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1056 if (editor_tab)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1057 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1058 // 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	1059 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	1060 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	1061 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1062 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	1063 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1064 // 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	1065 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	1066 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	1067 int l, c;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1068 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	1069 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	1070 break;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1071 }
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25634 diff changeset	1072 }
25790 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 // Close it silently
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1075 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	1076 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	1077 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	1078
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1079 // 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	1080 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	1081 // 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	1082 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	1083 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1084 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	1085 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	1086 f_data.new_file_name
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1087 = 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	1088 }
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1089 else
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1090 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	1091
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1092 // 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	1093 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	1094 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1095 }
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 }
24082 0052d47ddc3e Backed out changeset ba164db1c4a4 Torsten <mttl@mailbox.org> parents: 24048 diff changeset	1098
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1099 // 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	1100 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	1101 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1102 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	1103
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1104 // 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	1105 // 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	1106 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	1107 {
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1108 // 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	1109 if (load_new)
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1110 {
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1111 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	1112 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	1113 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	1114 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	1115 false, false, true, "",
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).index);
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1117 }
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1118 else
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1119 {
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1120 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	1121 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	1122 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	1123 false, false, true, "",
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1124 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	1125 }
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1126
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1127 }
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1128
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1129 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	1130
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1131 // 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	1132 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	1133 }
24082 0052d47ddc3e Backed out changeset ba164db1c4a4 Torsten <mttl@mailbox.org> parents: 24048 diff changeset	1134
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27605 diff changeset	1135 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	1136 {
26058 ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1137 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	1138 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	1139 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	1140
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1141 QStyle *st = style ();
26058 ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1142 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	1143 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	1144
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1145 // Tab position
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1146 QTabWidget::TabPosition pos
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1147 = 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	1148
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1149 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	1150
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1151 // 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	1152 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	1153 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	1154 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	1155 {
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1156 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	1157 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	1158 }
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1159
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1160 // 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	1161 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	1162 .toInt ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1163 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	1164 .toInt ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1165
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1166 // 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	1167 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	1168 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	1169 if (is > height)
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1170 height = is;
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1171
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1172 // 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	1173 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	1174 .arg (height);
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1175
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1176 // 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	1177 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	1178 {
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1179 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	1180 " {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	1181 " 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	1182 " 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	1183 .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	1184 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	1185 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1186 else
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1187 {
e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1188 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	1189 }
27120 c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1190
c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1191 #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	1192 // 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	1193 // 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	1194 QString close_button_css
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1195 ("QTabBar::close-button"
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1196 " { 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	1197 "QTabBar::close-button:hover"
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1198 " { background-color: #cccccc; }");
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	1199
27120 c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1200 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	1201 #endif
c2a8365c73fc add workaround for missing editor tab close buttons on macos (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27102 diff changeset	1202
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	1203 m_tab_widget->setStyleSheet (style_sheet);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1204
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1205 bool show_it;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1206 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	1207 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	1208 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	1209 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	1210 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	1211 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	1212 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	1213 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	1214 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	1215 m_show_longline_action->setChecked (show_it);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1216
24716 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_toolbar",true).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1218 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	1219 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	1220 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	1221 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	1222 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	1223 m_show_hscrollbar_action->setChecked (show_it);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1224
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1225 set_shortcuts ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1226
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1227 // 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	1228 emit fetab_settings_changed (settings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1229 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1230
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1231 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	1232 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1233 // 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	1234 // 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	1235
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1236 shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager ();
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1237
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1238 // File menu
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1239 scmgr.set_shortcut (m_edit_function_action, "editor_file:edit_function");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1240 scmgr.set_shortcut (m_save_action, "editor_file:save");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1241 scmgr.set_shortcut (m_save_as_action, "editor_file:save_as");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1242 scmgr.set_shortcut (m_close_action, "editor_file:close");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1243 scmgr.set_shortcut (m_close_all_action, "editor_file:close_all");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1244 scmgr.set_shortcut (m_close_others_action, "editor_file:close_other");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1245 scmgr.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	1246
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1247 // Edit menu
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1248 scmgr.set_shortcut (m_redo_action, "editor_edit:redo");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1249 scmgr.set_shortcut (m_cut_action, "editor_edit:cut");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1250 scmgr.set_shortcut (m_find_action, "editor_edit:find_replace");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1251 scmgr.set_shortcut (m_find_next_action, "editor_edit:find_next");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1252 scmgr.set_shortcut (m_find_previous_action, "editor_edit:find_previous");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1253
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1254 scmgr.set_shortcut (m_delete_start_word_action, "editor_edit:delete_start_word");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1255 scmgr.set_shortcut (m_delete_end_word_action, "editor_edit:delete_end_word");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1256 scmgr.set_shortcut (m_delete_start_line_action, "editor_edit:delete_start_line");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1257 scmgr.set_shortcut (m_delete_end_line_action, "editor_edit:delete_end_line");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1258 scmgr.set_shortcut (m_delete_line_action, "editor_edit:delete_line");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1259 scmgr.set_shortcut (m_copy_line_action, "editor_edit:copy_line");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1260 scmgr.set_shortcut (m_cut_line_action, "editor_edit:cut_line");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1261 scmgr.set_shortcut (m_duplicate_selection_action, "editor_edit:duplicate_selection");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1262 scmgr.set_shortcut (m_transpose_line_action, "editor_edit:transpose_line");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1263 scmgr.set_shortcut (m_comment_selection_action, "editor_edit:comment_selection");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1264 scmgr.set_shortcut (m_uncomment_selection_action, "editor_edit:uncomment_selection");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1265 scmgr.set_shortcut (m_comment_var_selection_action, "editor_edit:comment_var_selection");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1266
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1267 scmgr.set_shortcut (m_upper_case_action, "editor_edit:upper_case");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1268 scmgr.set_shortcut (m_lower_case_action, "editor_edit:lower_case");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1269 scmgr.set_shortcut (m_indent_selection_action, "editor_edit:indent_selection");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1270 scmgr.set_shortcut (m_unindent_selection_action, "editor_edit:unindent_selection");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1271 scmgr.set_shortcut (m_smart_indent_line_or_selection_action, "editor_edit:smart_indent_line_or_selection");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1272 scmgr.set_shortcut (m_completion_action, "editor_edit:completion_list");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1273 scmgr.set_shortcut (m_goto_line_action, "editor_edit:goto_line");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1274 scmgr.set_shortcut (m_move_to_matching_brace, "editor_edit:move_to_brace");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1275 scmgr.set_shortcut (m_sel_to_matching_brace, "editor_edit:select_to_brace");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1276 scmgr.set_shortcut (m_toggle_bookmark_action, "editor_edit:toggle_bookmark");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1277 scmgr.set_shortcut (m_next_bookmark_action, "editor_edit:next_bookmark");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1278 scmgr.set_shortcut (m_previous_bookmark_action, "editor_edit:previous_bookmark");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1279 scmgr.set_shortcut (m_remove_bookmark_action, "editor_edit:remove_bookmark");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1280 scmgr.set_shortcut (m_preferences_action, "editor_edit:preferences");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1281 scmgr.set_shortcut (m_styles_preferences_action, "editor_edit:styles_preferences");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1282
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1283 scmgr.set_shortcut (m_conv_eol_windows_action, "editor_edit:conv_eol_winows");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1284 scmgr.set_shortcut (m_conv_eol_unix_action, "editor_edit:conv_eol_unix");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1285 scmgr.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	1286
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1287 // View menu
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1288 scmgr.set_shortcut (m_show_linenum_action, "editor_view:show_line_numbers");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1289 scmgr.set_shortcut (m_show_whitespace_action, "editor_view:show_white_spaces");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1290 scmgr.set_shortcut (m_show_eol_action, "editor_view:show_eol_chars");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1291 scmgr.set_shortcut (m_show_indguide_action, "editor_view:show_ind_guides");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1292 scmgr.set_shortcut (m_show_longline_action, "editor_view:show_long_line");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1293 scmgr.set_shortcut (m_show_toolbar_action, "editor_view:show_toolbar");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1294 scmgr.set_shortcut (m_show_statusbar_action, "editor_view:show_statusbar");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1295 scmgr.set_shortcut (m_show_hscrollbar_action, "editor_view:show_hscrollbar");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1296 scmgr.set_shortcut (m_zoom_in_action, "editor_view:zoom_in");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1297 scmgr.set_shortcut (m_zoom_out_action, "editor_view:zoom_out");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1298 scmgr.set_shortcut (m_zoom_normal_action, "editor_view:zoom_normal");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1299 scmgr.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	1300
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1301 // Debug menu
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1302 scmgr.set_shortcut (m_toggle_breakpoint_action, "editor_debug:toggle_breakpoint");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1303 scmgr.set_shortcut (m_next_breakpoint_action, "editor_debug:next_breakpoint");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1304 scmgr.set_shortcut (m_previous_breakpoint_action, "editor_debug:previous_breakpoint");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1305 scmgr.set_shortcut (m_remove_all_breakpoints_action, "editor_debug:remove_breakpoints");
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1306
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1307 // Run menu
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1308 scmgr.set_shortcut (m_run_action, "editor_run:run_file");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1309 scmgr.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	1310
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1311 // Help menu
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1312 scmgr.set_shortcut (m_context_help_action, "editor_help:help_keyword");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1313 scmgr.set_shortcut (m_context_doc_action, "editor_help:doc_keyword");
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1314
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1315 // Tab navigation without menu entries
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1316 scmgr.set_shortcut (m_switch_left_tab_action, "editor_tabs:switch_left_tab");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1317 scmgr.set_shortcut (m_switch_right_tab_action, "editor_tabs:switch_right_tab");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1318 scmgr.set_shortcut (m_move_tab_left_action, "editor_tabs:move_tab_left");
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1319 scmgr.set_shortcut (m_move_tab_right_action, "editor_tabs:move_tab_right");
24716 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 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1322
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1323 // 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	1324 // 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	1325 // and is made visible
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1326 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	1327 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1328 if (m_closed && 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 m_closed = false;
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1331 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1332 gui_settings *settings = rmgr.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1333 restore_session (settings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1334 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1335
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1336 empty_script (false, visible);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1337
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1338 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	1339 setFocus ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1340
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1341 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1342
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	1343 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	1344 {
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	1345 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	1346 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	1347 }
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	1348
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1349 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	1350 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1351 m_ced = dir;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1352 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	1353 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1354
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1355 void file_editor::copyClipboard (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1356 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1357 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1358 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	1359 QsciScintillaBase::SCI_COPY);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1360 }
18545 17baa684892c fix flashing while debuggung and editor is tabbed behind console (bug #41757) Torsten <ttl@justmail.de> parents: 18472 diff changeset	1361
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1362 void file_editor::pasteClipboard (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1363 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1364 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1365 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	1366 QsciScintillaBase::SCI_PASTE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1367 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1368
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1369 void file_editor::selectAll (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1370 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1371 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1372 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	1373 QsciScintillaBase::SCI_SELECTALL);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1374 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1375
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1376 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	1377 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1378 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1379 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	1380 QsciScintillaBase::SCI_UNDO);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1381 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1382
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1383 // 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	1384 // 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	1385 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	1386 const QString& encoding,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1387 int line, bool debug_pointer,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1388 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	1389 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	1390 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1391 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	1392 return; // custom editor called
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1393
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1394 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1395 gui_settings *settings = rmgr.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	1396 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	1397 = 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	1398
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1399 if (openFileName.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1400 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1401 // 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	1402 // 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	1403 request_new_file ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1404 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1405 else
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 // 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	1408 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	1409
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1410 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1411 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1412 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	1413
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1414 if (line > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1415 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1416 if (insert)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1417 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	1418
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1419 if (debug_pointer)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1420 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	1421
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1422 if (breakpoint_marker)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1423 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	1424 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1425
25622 a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1426 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	1427 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1428 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	1429 activate ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1430 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1431 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1432 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1433 {
25622 a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1434 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	1435 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	1436
a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1437 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	1438 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	1439
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1440 file_editor_tab *fileEditorTab = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1441 // 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	1442 bool reusing = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1443 tab = find_tab_widget ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1444 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1445 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1446 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	1447 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	1448 fileEditorTab = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1449 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1450 reusing = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1451 }
21565 08baf0ebc9a9 Reappropriate <unnamed> editor tab when opening a new file (bug #47529) Lachlan Andrew <lachlanbis@gmail.com> parents: 21562 diff changeset	1452
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1453 // 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	1454 if (! fileEditorTab)
27400 7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	1455 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	1456
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1457 fileEditorTab->set_encoding (encoding);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1458 QString result = fileEditorTab->load_file (openFileName);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1459 if (result == "")
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1460 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1461 // 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	1462 // with full or short name.
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1463 if (! reusing)
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1464 add_file_editor_tab (fileEditorTab, "", index);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1465 fileEditorTab->update_window_title (false);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1466 // 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	1467 QFileInfo file_info = QFileInfo (openFileName);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1468 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	1469 encoding);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1470
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1471 if (line > 0)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1472 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1473 if (insert)
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1474 emit fetab_goto_line (fileEditorTab, line);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1475
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1476 if (debug_pointer)
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1477 emit fetab_insert_debugger_pointer (fileEditorTab,
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1478 line);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1479 if (breakpoint_marker)
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1480 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	1481 line, cond);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1482 }
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1483 }
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1484 else
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1485 {
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1486 delete fileEditorTab;
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1487 fileEditorTab = nullptr;
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1488
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1489 if (QFile::exists (openFileName))
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 // File not readable:
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1492 // create a NonModal message about error.
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1493 QMessageBox *msgBox
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1494 = new QMessageBox (QMessageBox::Critical,
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1495 tr ("Octave Editor"),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1496 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	1497 arg (openFileName).arg (result),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1498 QMessageBox::Ok, this);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1499
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1500 msgBox->setWindowModality (Qt::NonModal);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1501 msgBox->setAttribute (Qt::WA_DeleteOnClose);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1502 msgBox->show ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1503 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1504 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1505 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1506 // 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	1507 bool create_file = true;
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1508 QMessageBox *msgBox;
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1509
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1510 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	1511 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1512 msgBox = new QMessageBox (QMessageBox::Question,
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1513 tr ("Octave Editor"),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1514 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	1515 "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	1516 QMessageBox::NoButton,nullptr);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1517 QPushButton *create_button =
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1518 msgBox->addButton (tr ("Create"), QMessageBox::YesRole);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1519 msgBox->addButton (tr ("Cancel"), QMessageBox::RejectRole);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1520 msgBox->setDefaultButton (create_button);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1521 msgBox->exec ();
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1522
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1523 QAbstractButton *clicked_button = msgBox->clickedButton ();
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1524 if (clicked_button != create_button)
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1525 create_file = false;
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1526
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1527 delete msgBox;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1528 }
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1529
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1530 if (create_file)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1531 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1532 // 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	1533 QFile file (openFileName);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1534 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	1535 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1536 // error opening the file
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1537 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	1538 tr ("Octave Editor"),
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1539 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	1540 arg (openFileName).arg (file.errorString ()),
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1541 QMessageBox::Ok, this);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1542
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1543 msgBox->setWindowModality (Qt::NonModal);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1544 msgBox->setAttribute (Qt::WA_DeleteOnClose);
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1545 msgBox->show ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1546 }
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1547 else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1548 {
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1549 file.close ();
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26109 diff changeset	1550 request_open_file (openFileName);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1551 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1552 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1553 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1554 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1555
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1556 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	1557 {
25923 a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	1558 // 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	1559 // 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	1560 if (fileEditorTab)
13d11afc8122 fix crash after editor dialog about creation of non-existing file Torsten <mttl@mailbox.org> parents: 26058 diff changeset	1561 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	1562 activate ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1563 emit file_loaded_signal ();
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 }
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 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	1568
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1569 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	1570 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1571 emit request_settings_dialog ("editor");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1572 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1573
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1574 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	1575 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1576 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	1577 }
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 17639 diff changeset	1578
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1579 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	1580 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1581 toggle_preference ("editor/showLineNumbers",true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1582 }
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 17639 diff changeset	1583
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1584 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	1585 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1586 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	1587 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1588
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1589 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	1590 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1591 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	1592 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1593
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1594 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	1595 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1596 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	1597 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1598
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1599 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	1600 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1601 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	1602 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1603
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1604 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	1605 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1606 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	1607 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1608
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1609 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	1610 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1611 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	1612 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1613
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1614 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	1615 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1616 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	1617 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1618
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1619 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	1620 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1621 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	1622 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1623
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1624 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	1625 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1626 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	1627 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1628
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1629 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	1630 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1631 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	1632 }
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 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	1635 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1636 // 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	1637 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	1638 QAction *a;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1639
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1640 foreach (a, all_actions)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1641 menu->removeAction (a);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1642
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1643 // 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	1644 menu->addAction (m_cut_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1645 menu->addAction (m_copy_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1646 menu->addAction (m_paste_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1647 menu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1648 menu->addAction (m_selectall_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1649 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	1650 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	1651 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	1652 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	1653 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	1654 menu->addSeparator ();
1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1655 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	1656 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	1657 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	1658 menu->addSeparator ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1659 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	1660 }
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1661
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1662 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	1663 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1664 if (m_undo_action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1665 m_undo_action->setEnabled (undo);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1666 m_redo_action->setEnabled (redo);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1667 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1668
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1669 // handler for the close event
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1670 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	1671 {
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1672 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1673 gui_settings *settings = rmgr.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1674 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	1675 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1676 if (check_closing ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1677 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1678 // 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	1679 // 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	1680 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	1681 e->ignore ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1682 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1683 else
25623 331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1684 {
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1685 e->ignore ();
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1686 return;
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1687 }
24716 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 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1690 e->accept ();
25623 331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1691
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1692 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	1693 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1694
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1695 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	1696 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1697 if (e->mimeData ()->hasUrls ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1698 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1699 e->acceptProposedAction ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1700 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1701 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1702
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1703 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	1704 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1705 if (e->mimeData ()->hasUrls ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1706 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1707 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	1708 request_open_file (url.toLocalFile ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1709 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1710 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1711
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1712 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	1713 {
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25293 diff changeset	1714 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	1715 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	1716 QDockWidget *console =
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1717 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	1718
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1719 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	1720 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1721 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	1722 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1723 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1724
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1725 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1726 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1727
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1728 void file_editor::construct (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1729 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1730 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	1731
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1732 // 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	1733 // QStyle *editor_style = QApplication::style ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1734
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1735 // 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	1736 // 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	1737 // on other platforms.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1738 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	1739 m_menu_bar->setNativeMenuBar (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1740
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1741 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	1742 m_tool_bar->setMovable (true);
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 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	1745
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1746 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1747
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1748 // the mru-list and an empty array of actions
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1749 gui_settings *settings = rmgr.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1750 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	1751 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	1752 .toStringList ();
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18767 diff changeset	1753
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1754 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	1755 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1756 // 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	1757 m_mru_files_encodings = QStringList ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1758 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	1759 m_mru_files_encodings << QString ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1760 }
24130 6fdbdb66d7cb set editor menu bar as non-native menu bar on all platforms Torsten <mttl@mailbox.org> parents: 24123 diff changeset	1761
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1762 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	1763 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1764 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	1765 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	1766 }
24130 6fdbdb66d7cb set editor menu bar as non-native menu bar on all platforms Torsten <mttl@mailbox.org> parents: 24123 diff changeset	1767
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1768 // menu bar
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1769
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1770 // file menu
13562 a89aa9e05e19 editor: menu bar, run editor file in octave ttl <ttl@justmail.de> parents: 13558 diff changeset	1771
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1772 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	1773
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1774 // 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	1775 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	1776 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	1777 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	1778 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	1779
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1780 m_fileMenu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1781
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1782 m_edit_function_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1783 = add_action (m_fileMenu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1784 tr ("&Edit Function"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1785 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	1786
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1787 m_fileMenu->addSeparator ();
20814 2da4058d65c7 store the encoding of recent editor files in the mru list Torsten <ttl@justmail.de> parents: 20796 diff changeset	1788
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1789 m_save_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1790 = add_action (m_fileMenu, rmgr.icon ("document-save"),
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1791 tr ("&Save File"), SLOT (request_save_file (bool)));
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1792
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1793 m_save_as_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1794 = add_action (m_fileMenu, rmgr.icon ("document-save-as"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1795 tr ("Save File &As..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1796 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	1797
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1798 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	1799
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1800 m_close_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1801 = add_action (m_fileMenu, rmgr.icon ("window-close",false),
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1802 tr ("&Close"), SLOT (request_close_file (bool)));
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1803
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1804 m_close_all_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1805 = add_action (m_fileMenu, rmgr.icon ("window-close",false),
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1806 tr ("Close All"), SLOT (request_close_all_files (bool)));
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1807
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1808 m_close_others_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1809 = add_action (m_fileMenu, rmgr.icon ("window-close",false),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1810 tr ("Close Other Files"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1811 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	1812
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1813 m_fileMenu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1814
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1815 m_print_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1816 = add_action (m_fileMenu, rmgr.icon ("document-print"),
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1817 tr ("Print..."), SLOT (request_print_file (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1818
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1819 // 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	1820
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1821 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	1822
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1823 m_redo_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1824 = add_action (m_edit_menu, rmgr.icon ("edit-redo"),
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1825 tr ("&Redo"), 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
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1831 = add_action (m_edit_menu, rmgr.icon ("edit-cut"),
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1832 tr ("Cu&t"), SLOT (request_cut (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1833 m_cut_action->setEnabled (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1834
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1835 m_find_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1836 = add_action (m_edit_menu, rmgr.icon ("edit-find-replace"),
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1837 tr ("&Find and Replace..."), SLOT (request_find (bool)));
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1838
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1839 m_find_next_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1840 = add_action (m_edit_menu, tr ("Find &Next..."),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1841 SLOT (request_find_next (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_previous_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1844 = add_action (m_edit_menu, tr ("Find &Previous..."),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1845 SLOT (request_find_previous (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1846
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1847 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	1848
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1849 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	1850
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1851 m_delete_line_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1852 = add_action (m_edit_cmd_menu, tr ("Delete Line"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1853 SLOT (request_delete_line (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1854
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1855 m_copy_line_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1856 = add_action (m_edit_cmd_menu, tr ("Copy Line"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1857 SLOT (request_copy_line (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1858
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1859 m_cut_line_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1860 = add_action (m_edit_cmd_menu, tr ("Cut Line"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1861 SLOT (request_cut_line (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1862
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1863 m_edit_cmd_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1864
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1865 m_delete_start_word_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1866 = add_action (m_edit_cmd_menu, tr ("Delete to Start of Word"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1867 SLOT (request_delete_start_word (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1868
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1869 m_delete_end_word_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1870 = add_action (m_edit_cmd_menu, tr ("Delete to End of Word"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1871 SLOT (request_delete_end_word (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1872
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1873 m_delete_start_line_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1874 = add_action (m_edit_cmd_menu, tr ("Delete to Start of Line"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1875 SLOT (request_delete_start_line (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1876
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1877 m_delete_end_line_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1878 = add_action (m_edit_cmd_menu, tr ("Delete to End of Line"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1879 SLOT (request_delete_end_line (bool)));
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	1880
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1881 m_edit_cmd_menu->addSeparator ();
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	1882
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1883 m_duplicate_selection_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1884 = add_action (m_edit_cmd_menu, tr ("Duplicate Selection/Line"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1885 SLOT (request_duplicate_selection (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1886
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1887 m_transpose_line_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1888 = add_action (m_edit_cmd_menu, tr ("Transpose Line"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1889 SLOT (request_transpose_line (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1890
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1891 m_edit_cmd_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1892
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1893 m_completion_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1894 = add_action (m_edit_cmd_menu, tr ("&Show Completion List"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1895 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	1896
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1897 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	1898
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1899 m_upper_case_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1900 = add_action (m_edit_fmt_menu, tr ("&Uppercase Selection"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1901 SLOT (request_upper_case (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1902
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1903 m_lower_case_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1904 = add_action (m_edit_fmt_menu, tr ("&Lowercase Selection"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1905 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	1906
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1907 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	1908
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1909 m_comment_selection_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1910 = add_action (m_edit_fmt_menu, tr ("&Comment"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1911 SLOT (request_comment_selected_text (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1912
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1913 m_uncomment_selection_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1914 = add_action (m_edit_fmt_menu, tr ("&Uncomment"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1915 SLOT (request_uncomment_selected_text (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1916
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1917 m_comment_var_selection_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1918 = add_action (m_edit_fmt_menu, tr ("Comment (Choosing String)"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1919 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	1920
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1921 m_edit_fmt_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1922
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1923 m_indent_selection_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1924 = add_action (m_edit_fmt_menu, tr ("&Indent Selection Rigidly"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1925 SLOT (request_indent_selected_text (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1926
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1927 m_unindent_selection_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1928 = add_action (m_edit_fmt_menu, tr ("&Unindent Selection Rigidly"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1929 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	1930
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1931 m_smart_indent_line_or_selection_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1932 = add_action (m_edit_fmt_menu, tr ("Indent Code"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1933 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	1934
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1935 m_edit_fmt_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1936
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1937 m_conv_eol_windows_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,
25064 27ade14df345 Some minor string changes (bug #53526). Markus Mützel <markus.muetzel@gmx.de> parents: 25062 diff changeset	1939 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	1940 SLOT (request_conv_eol_windows (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1941
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1942 m_conv_eol_unix_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1943 = add_action (m_edit_fmt_menu, tr ("Convert Line Endings to &Unix (LF)"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1944 SLOT (request_conv_eol_unix (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1945
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1946 m_conv_eol_mac_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1947 = 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	1948 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	1949 SLOT (request_conv_eol_mac (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1950
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1951 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	1952
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1953 m_goto_line_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1954 = add_action (m_edit_nav_menu, tr ("Go &to Line..."),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1955 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	1956
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1957 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	1958
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1959 m_move_to_matching_brace
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1960 = add_action (m_edit_nav_menu, tr ("Move to Matching Brace"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1961 SLOT (request_move_match_brace (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1962
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1963 m_sel_to_matching_brace
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1964 = add_action (m_edit_nav_menu, tr ("Select to Matching Brace"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1965 SLOT (request_sel_match_brace (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1966
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1967 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	1968
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1969 m_next_bookmark_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1970 = add_action (m_edit_nav_menu, tr ("&Next Bookmark"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1971 SLOT (request_next_bookmark (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1972
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1973 m_previous_bookmark_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1974 = add_action (m_edit_nav_menu, tr ("Pre&vious Bookmark"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1975 SLOT (request_previous_bookmark (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1976
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1977 m_toggle_bookmark_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1978 = add_action (m_edit_nav_menu, tr ("Toggle &Bookmark"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1979 SLOT (request_toggle_bookmark (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1980
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1981 m_remove_bookmark_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1982 = add_action (m_edit_nav_menu, tr ("&Remove All Bookmarks"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1983 SLOT (request_remove_bookmark (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1984
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1985 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	1986
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1987 m_preferences_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1988 = add_action (m_edit_menu, rmgr.icon ("preferences-system"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1989 tr ("&Preferences..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1990 SLOT (request_preferences (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1991
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1992 m_styles_preferences_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	1993 = add_action (m_edit_menu, rmgr.icon ("preferences-system"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1994 tr ("&Styles Preferences..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1995 SLOT (request_styles_preferences (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1996
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1997 // view menu
19629 8ef79bc61d8a add actions for moving/selecting to matching brace Torsten <ttl@justmail.de> parents: 19608 diff changeset	1998
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1999 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	2000
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2001 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	2002
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2003 m_show_linenum_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2004 = add_action (m_view_editor_menu, tr ("Show &Line Numbers"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2005 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	2006 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	2007
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2008 m_show_whitespace_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2009 = add_action (m_view_editor_menu, tr ("Show &Whitespace Characters"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2010 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	2011 m_show_whitespace_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2012
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2013 m_show_eol_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2014 = add_action (m_view_editor_menu, tr ("Show Line &Endings"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2015 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	2016 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	2017
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2018 m_show_indguide_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2019 = add_action (m_view_editor_menu, tr ("Show &Indentation Guides"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2020 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	2021 m_show_indguide_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2022
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2023 m_show_longline_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2024 = add_action (m_view_editor_menu, tr ("Show Long Line &Marker"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2025 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	2026 m_show_longline_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2027
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2028 m_view_editor_menu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2029
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2030 m_show_toolbar_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2031 = add_action (m_view_editor_menu, tr ("Show &Toolbar"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2032 SLOT (show_toolbar (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2033 m_show_toolbar_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2034
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2035 m_show_statusbar_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2036 = add_action (m_view_editor_menu, tr ("Show &Statusbar"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2037 SLOT (show_statusbar (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2038 m_show_statusbar_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2039
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2040 m_show_hscrollbar_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2041 = add_action (m_view_editor_menu, tr ("Show &Horizontal Scrollbar"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2042 SLOT (show_hscrollbar (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2043 m_show_hscrollbar_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2044
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2045 view_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2046
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2047 m_zoom_in_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2048 = add_action (view_menu, rmgr.icon ("zoom-in"), tr ("Zoom &In"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2049 SLOT (zoom_in (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2050
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2051 m_zoom_out_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2052 = add_action (view_menu, rmgr.icon ("zoom-out"), tr ("Zoom &Out"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2053 SLOT (zoom_out (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2054
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2055 m_zoom_normal_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2056 = add_action (view_menu, tr ("&Normal Size"), SLOT (zoom_normal (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2057
27330 e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2058 view_menu->addSeparator ();
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2059
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2060 m_sort_tabs_action
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2061 = 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	2062 SLOT (sort_tabs_alph (void)),
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2063 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	2064
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2065 m_menu_bar->addMenu (view_menu);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2066
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2067 // debug menu
21002 314245afff3a add a menu entry for showing/hiding the editor horizontal scrollbar Torsten <ttl@justmail.de> parents: 21001 diff changeset	2068
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2069 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	2070
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2071 m_toggle_breakpoint_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2072 = add_action (m_debug_menu, rmgr.icon ("bp-toggle"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2073 tr ("Toggle &Breakpoint"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2074 SLOT (request_toggle_breakpoint (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2075
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2076 m_next_breakpoint_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2077 = add_action (m_debug_menu, rmgr.icon ("bp-next"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2078 tr ("&Next Breakpoint"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2079 SLOT (request_next_breakpoint (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2080
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2081 m_previous_breakpoint_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2082 = add_action (m_debug_menu, rmgr.icon ("bp-prev"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2083 tr ("Pre&vious Breakpoint"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2084 SLOT (request_previous_breakpoint (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2085
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2086 m_remove_all_breakpoints_action
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2087 = add_action (m_debug_menu, rmgr.icon ("bp-rm-all"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2088 tr ("&Remove All Breakpoints"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2089 SLOT (request_remove_breakpoint (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2090
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2091 m_debug_menu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2092
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2093 // 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	2094
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2095 // run menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2096
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2097 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	2098
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2099 m_run_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2100 = add_action (_run_menu,
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2101 rmgr.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	2102 tr ("Save File and Run / Continue"),
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2103 SLOT (request_run_file (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2104
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2105 m_run_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2106 = add_action (_run_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2107 tr ("Run &Selection"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2108 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	2109 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	2110
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2111 // 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	2112
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2113 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	2114
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2115 m_context_help_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2116 = add_action (_help_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2117 tr ("&Help on Keyword"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2118 SLOT (request_context_help (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2119
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2120 m_context_doc_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2121 = add_action (_help_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2122 tr ("&Documentation on Keyword"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2123 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	2124
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2125 // 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	2126
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2127 m_switch_left_tab_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2128 = 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	2129 m_tab_widget->get_tab_bar ());
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2130
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2131 m_switch_right_tab_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2132 = 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	2133 m_tab_widget->get_tab_bar ());
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2134
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2135 m_move_tab_left_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2136 = 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	2137 m_tab_widget->get_tab_bar ());
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2138
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2139 m_move_tab_right_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2140 = 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	2141 m_tab_widget->get_tab_bar ());
20693 7751bd56d0be added actions and shortcuts for switching editor tabs Torsten <ttl@justmail.de> parents: 20630 diff changeset	2142
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2143 // toolbar
20693 7751bd56d0be added actions and shortcuts for switching editor tabs Torsten <ttl@justmail.de> parents: 20630 diff changeset	2144
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2145 // popdown menu with mru files
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2146 QToolButton *popdown_button = new QToolButton ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2147 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	2148 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	2149 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	2150 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	2151 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	2152
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2153 // 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	2154 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	2155 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	2156 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	2157 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	2158 m_tool_bar->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2159 // 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	2160 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	2161 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	2162 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	2163 // 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	2164 // 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	2165 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	2166 //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	2167 //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	2168 m_tool_bar->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2169 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	2170 m_tool_bar->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2171 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	2172 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	2173 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	2174 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	2175
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2176 // layout
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2177 QVBoxLayout *vbox_layout = new QVBoxLayout ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2178 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	2179 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	2180 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	2181 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	2182 vbox_layout->setSpacing (0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2183 editor_widget->setLayout (vbox_layout);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2184 setWidget (editor_widget);
16981 e86df0d43309 make ctrl-w available for readline in the gui terminal Torsten <ttl@justmail.de> parents: 16970 diff changeset	2185
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2186 // 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	2187 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	2188 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	2189 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	2190 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	2191 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	2192 ctx_men->addSeparator ();
e449134870fb allow to sort editor tabs alphabetically (bug #42602) Torsten Lilge <ttl-octave@mailbox.org> parents: 27302 diff changeset	2193 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	2194
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2195 // signals
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2196 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	2197 main_win (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2198 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	2199
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	2200 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	2201 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	2202
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2203 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	2204 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	2205
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2206 mru_menu_update ();
23150 d133d90b495a connect execute command signal in editor constructor (bug #50171) Torsten <mttl@mailbox.org> parents: 23146 diff changeset	2207
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2208 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	2209 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	2210
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2211 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	2212 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	2213
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2214 resize (500, 400);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2215 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	2216 set_title (tr ("Editor"));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2217
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2218 check_actions ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2219 }
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2220
27400 7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2221 file_editor_tab *
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2222 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	2223 {
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2224 file_editor_tab *f = new file_editor_tab (m_octave_qobj, directory);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	2225
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2226 // 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	2227 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	2228 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	2229
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2230 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	2231 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	2232
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2233 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	2234 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	2235
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2236 connect (f->qsci_edit_area (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2237 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	2238 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	2239
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	2240 connect (f->qsci_edit_area (),
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	2241 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	2242 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	2243
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2244 // 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	2245 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	2246 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	2247 const QString&, bool)));
19606 3156773fcc80 open a doc page from editor directly without command window Torsten <ttl@justmail.de> parents: 19605 diff changeset	2248
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2249 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	2250 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	2251
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2252 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	2253 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	2254
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2255 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	2256 const QString&, QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2257 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	2258 const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2259 QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2260
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2261 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	2262 this, SLOT (check_conflict_save (const QString&, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2263
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2264 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	2265 this, SLOT (handle_mru_add_file (const QString&, const QString&)));
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 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	2268 main_win (), SLOT (run_file_in_terminal (const QFileInfo&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2269
25895 bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25813 diff changeset	2270 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	2271 this, SLOT (request_open_file (const QString&, const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2272
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2273 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	2274 const QString&, int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2275 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	2276 const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2277 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	2278
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2279 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	2280 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	2281
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2282 // 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	2283 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	2284 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	2285
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2286 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	2287 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	2288
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2289 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	2290 f, SLOT (file_name_query (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2291
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2292 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	2293 bool)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2294 f, SLOT (save_file (const QWidget*, const QString&, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2295
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2296 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	2297 f, SLOT (check_modified_file (void)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2298
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2299 // 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	2300 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	2301 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	2302
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2303 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	2304 f, SLOT (set_current_directory (const QString&)));
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	2305
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2306 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	2307 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	2308 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	2309 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	2310 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	2311 f, SLOT (zoom_normal (const QWidget*)));
19803 415864f5b85f communicating actual working directory to the editor (#44298) Torsten <ttl@justmail.de> parents: 19739 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 (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	2314 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	2315
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2316 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	2317 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	2318
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2319 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	2320 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	2321
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2322 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	2323 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	2324
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2325 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	2326 f, SLOT (print_file (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2327
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	2328 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	2329 f, SLOT (run_file (const QWidget*, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2330
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2331 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	2332 f, SLOT (context_run (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2333
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2334 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	2335 f, SLOT (toggle_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2336
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2337 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	2338 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	2339
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2340 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	2341 f, SLOT (previous_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2342
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2343 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	2344 f, SLOT (remove_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2345
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2346 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	2347 f, SLOT (toggle_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2348
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2349 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	2350 f, SLOT (next_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 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_previous_breakpoint (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2353 f, SLOT (previous_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 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_remove_all_breakpoints (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2356 f, SLOT (remove_all_breakpoints (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2357
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2358 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	2359 unsigned int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2360 f, SLOT (scintilla_command (const QWidget *, unsigned int)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 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_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	2363 f, SLOT (comment_selected_text (const QWidget*, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 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_uncomment_selected_text (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2366 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	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_indent_selected_text (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2369 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	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_unindent_selected_text (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2372 f, SLOT (unindent_selected_text (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 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_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	2375 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	2376
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2377 connect (this,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2378 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	2379 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	2380
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2381 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	2382 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	2383
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2384 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	2385 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	2386
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2387 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	2388 f, SLOT (find_previous (const QWidget*)));
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	2389
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2390 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	2391 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	2392
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2393 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	2394 f, SLOT (move_match_brace (const QWidget*, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2395
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2396 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	2397 f, SLOT (show_auto_completion (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2398
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2399 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	2400 f, SLOT (set_focus (const QWidget*)));
19629 8ef79bc61d8a add actions for moving/selecting to matching brace Torsten <ttl@justmail.de> parents: 19608 diff changeset	2401
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27075 diff changeset	2402 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	2403 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	2404
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2405 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	2406 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	2407
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2408 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	2409 f, SLOT (delete_debugger_pointer (const QWidget*, int)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2410
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27120 diff changeset	2411 connect (f, SIGNAL (debug_quit_signal (void)),
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27120 diff changeset	2412 main_win (), SLOT (debug_quit (void)));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27120 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_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	2415 int, const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2416 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	2417 const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2418
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2419 // 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	2420 // 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	2421
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2422 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	2423 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	2424
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	2425 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	2426 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	2427
27400 7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2428 return f;
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2429 }
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2430
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2431 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	2432 int index)
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2433 {
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2434 if (index == -1)
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2435 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	2436 else
7cf857166440 connect signals when creating file_editor_tab in file editor John W. Eaton <jwe@octave.org> parents: 27330 diff changeset	2437 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	2438
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2439 m_tab_widget->setCurrentWidget (f);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2440
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2441 check_actions ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2442 }
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	2443
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2444 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	2445 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2446 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	2447
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2448 // 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	2449 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	2450 {
25062 32a7222d637a [mq]: tr Rik <rik@octave.org> parents: 25054 diff changeset	2451 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	2452 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	2453 m_mru_file_actions[i]->setText (text);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2454
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2455 QStringList action_data;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2456 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	2457 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	2458
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2459 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	2460 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2461
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2462 // hide unused mru-menu entries
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2463 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	2464 m_mru_file_actions[j]->setVisible (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2465
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2466 // 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	2467 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	2468 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2469 m_mru_files.removeLast ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2470 m_mru_files_encodings.removeLast ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2471 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2472
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2473 // save actual mru-list in settings
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2474 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2475 gui_settings *settings = rmgr.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2476
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2477 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	2478 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	2479 settings->sync ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2480 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2481
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2482 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	2483 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2484 // Check if the user wants to use a custom file editor.
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2485 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2486 gui_settings *settings = rmgr.get_settings ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2487
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2488 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	2489 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2490 // 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	2491 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	2492
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2493 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	2494 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	2495 QString ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2496
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2497 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2498 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2499
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2500 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2501 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2502
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2503 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	2504 {
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2505 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	2506 gui_settings *settings = rmgr.get_settings ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2507 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	2508 settings->setValue (preference,! old);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2509 notice_settings (settings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2510 }
19945 f7a805f02723 link undo in main window to editor if the latter has focus (bug #44402) Torsten <ttl@justmail.de> parents: 19930 diff changeset	2511
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2512 // 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	2513 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	2514 const QString& new_name)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2515 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2516 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	2517 session_data f_data;
20693 7751bd56d0be added actions and shortcuts for switching editor tabs Torsten <ttl@justmail.de> parents: 20630 diff changeset	2518
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2519 // 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	2520 m_editor_tab_map.clear ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2521 emit fetab_file_name_query (nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2522
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2523 // 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	2524 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	2525 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	2526 {
26928 3e6aa7c7bbbb prevent unnamed editor tab from being closed by rmdir (bug #55888) Torsten Lilge <ttl-octave@mailbox.org> parents: 26554 diff changeset	2527 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	2528 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	2529
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	2530 // 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	2531 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	2532 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	2533
66fa9ebb0c3e prevent editor from closing files that are not affected by rmdir (bug #55823) Torsten Lilge <ttl-octave@mailbox.org> parents: 26928 diff changeset	2534 // 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	2535 // 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	2536 // 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	2537 // 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	2538 // 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	2539 // 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	2540 // 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	2541 // 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	2542 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	2543 && (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	2544 {
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	2545 // 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	2546 // 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	2547 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	2548 file_editor_tab *editor_tab
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2549 = 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	2550 if (editor_tab)
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2551 {
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2552 // 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	2553 int l, c;
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2554 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	2555 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	2556 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	2557 // Close
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2558 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	2559 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2560 m_no_focus = false; // Back to normal
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2561
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2562 // 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	2563 f_data.file_name = p->first;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2564
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2565 // 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	2566 // if new_name is given
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2567 if (! new_name.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2568 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2569 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	2570 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	2571 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	2572 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2573 // 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	2574 // 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	2575 // 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	2576 // to new dir.
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2577 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	2578 "/" + 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	2579 }
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2580 else
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2581 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	2582
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2583 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	2584 = 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	2585 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2586 else
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2587 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	2588
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2589 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	2590
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2591 // 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	2592 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	2593 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2594 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2595 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2596
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2597 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	2598 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2599 QWidget *foc_w = focusWidget ();
24730 05c9f42512cb * file-editor.cc: fix broken copy/cut/past/undo actions Torsten <mttl@mailbox.org> parents: 24717 diff changeset	2600 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	2601 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2602 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2603 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2604
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2605 // 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	2606 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	2607 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2608 // 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	2609 m_editor_tab_map.clear ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2610 emit fetab_file_name_query (nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2611
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2612 // 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	2613 QWidget *retval = nullptr;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2614
25343 4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	2615 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	2616 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	2617 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2618 QString tab_file = p->first;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2619 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	2620 \|\| 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	2621 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2622 retval = p->second.fet_ID;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2623 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2624 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2625 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2626
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2627 return retval;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2628 }
23321 ac4d0a72927a provide a context menu for the tab bar of the editor (bug #44605) Torsten <mttl@mailbox.org> parents: 23304 diff changeset	2629
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2630 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	2631 const char *member,
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2632 QWidget *receiver)
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2633 {
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2634 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	2635 }
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2636
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2637 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	2638 const QString& text, const char *member,
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2639 QWidget *receiver)
24716 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 QAction *a;
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2642 QWidget *r = this;
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2643
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2644 if (receiver != nullptr)
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2645 r = receiver;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2646
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2647 if (menu)
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2648 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	2649 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2650 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2651 a = new QAction (this);
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2652 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	2653 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2654
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2655 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	2656 a->setShortcutContext (Qt::WidgetWithChildrenShortcut);
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 return a;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2659 }
23276 ea143f4f76a5 Allow to close an editor tab with the middle mouse button (bug #44605) Torsten <mttl@mailbox.org> parents: 23223 diff changeset	2660
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2661 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	2662 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2663 QMenu *menu = p->addMenu (name);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2664
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2665 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	2666 // 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	2667 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	2668 // remove single '&' (shortcut)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2669 base_name.remove ("&");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2670 // restore intended '&'
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2671 base_name.replace ("___octave_amp_replacement___", "&&");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2672
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2673 // 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	2674 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	2675
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2676 return menu;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2677 }
23304 fb495c47e82d allow double left click for closing tabs in the file editor (bug #44605) Torsten <mttl@mailbox.org> parents: 23300 diff changeset	2678 }
fb495c47e82d allow double left click for closing tabs in the file editor (bug #44605) Torsten <mttl@mailbox.org> parents: 23300 diff changeset	2679
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	2680 #endif

Mercurial > octave

annotate libgui/src/m-editor/file-editor.cc @ 27630:262cdd0f7619