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

annotate libgui/src/m-editor/file-editor.cc @ 25790:872111558bc0

reload editor files when their path changes by using movefile (bug #43922) * file-editor.cc (handle_file_remove): remove quotation marks from old names, split into a string list and loop over all old file/dir names, use octave::sys::env::make_absolute for creating the new file path; (handle_dir_remove): append old dir name and the relative path to the file within the old dir if new dir already exists, which my happen using movefile * octave-link.cc (__octave_link_file_remove__, __octave_link_file_renamed__): new functions making octave_link::file_renamed and octave_link::file_removed available in m-files * movefile.m: calling __octave_link_file_remove__ and __octave_link_file_renamed__ before and after moving files respectively

author	Torsten <mttl@mailbox.org>
date	Tue, 14 Aug 2018 21:50:34 +0200
parents	f3aa4a90b91f
children	d98d7df9fd15

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
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25042 diff changeset	3 Copyright (C) 2011-2018 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
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	29 #include "file-editor.h"
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	30 #include "resource-manager.h"
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	31 #include "shortcut-manager.h"
086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	32
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	33 #include <QApplication>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	34 #include <QFile>
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22179 diff changeset	35 #include <QFileDialog>
13584 e76a22bfe406 editor: added bookmark feature ttl <ttl@justmail.de> parents: 13566 diff changeset	36 #include <QFont>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	37 #include <QMessageBox>
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22179 diff changeset	38 #include <QMimeData>
2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22179 diff changeset	39 #include <QProcess>
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 24731 diff changeset	40 #include <QPushButton>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	41 #include <QStyle>
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22179 diff changeset	42 #include <QTabBar>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	43 #include <QTextStream>
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22179 diff changeset	44 #include <QVBoxLayout>
18656 1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18651 diff changeset	45 #include <Qsci/qscicommandset.h>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	46
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	47 #include "main-window.h"
25622 a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	48 #include "gui-preferences.h"
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	49 #include "oct-env.h"
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	50 #include "oct-map.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	51 #include "octave-link.h"
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	52 #include "utils.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	53
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	54 namespace octave
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	55 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	56 // Functions of the the reimplemented tab widget
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	57
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	58 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	59 : QTabWidget (p)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	60 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	61 tab_bar *bar = new tab_bar (this);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	62
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	63 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	64 p->parent (), SLOT (request_close_file (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	65
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	66 this->setTabBar (bar);
24713 36cd70fc2d63 style fixes for file editor Torsten <mttl@mailbox.org> parents: 24679 diff changeset	67
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	68 setTabsClosable (true);
24713 36cd70fc2d63 style fixes for file editor Torsten <mttl@mailbox.org> parents: 24679 diff changeset	69 #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	70 setMovable (true);
24713 36cd70fc2d63 style fixes for file editor Torsten <mttl@mailbox.org> parents: 24679 diff changeset	71 #endif
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	72 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	73
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	74 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	75 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	76 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	77 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	78
24713 36cd70fc2d63 style fixes for file editor Torsten <mttl@mailbox.org> parents: 24679 diff changeset	79
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	80 // File editor
24713 36cd70fc2d63 style fixes for file editor Torsten <mttl@mailbox.org> parents: 24679 diff changeset	81
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	82 file_editor::file_editor (QWidget *p)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	83 : file_editor_interface (p)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	84 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	85 // 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	86 // files will change ced accordingly.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	87 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	88
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	89 // 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	90 // 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	91 m_undo_action = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	92 m_copy_action = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	93 m_paste_action = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	94 m_selectall_action = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	95 m_closed = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	96 m_no_focus = false;
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	97
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	98 construct ();
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	99
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	100 // 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	101 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	102 m_fetab_actions << m_find_previous_action;
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	103
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	104 setVisible (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	105 setAcceptDrops (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	106 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	107
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	108 file_editor::~file_editor (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	109 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	110 delete m_mru_file_menu;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	111 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	112
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	113 // 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	114 // 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	115 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	116 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	117 // 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	118 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	119 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	120 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	121 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	122 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	123 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	124 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	125 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	126
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	127 // 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	128 // undo
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	129 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	130 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	131 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	132 // copy
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	133 m_copy_action = shared_actions.at (COPY_ACTION);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	134 m_tool_bar->insertAction (m_cut_action,m_copy_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	135 m_edit_menu->insertAction (m_cut_action,m_copy_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	136 // select all
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	137 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	138 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	139 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	140 // paste
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	141 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	142 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	143 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	144 m_edit_menu->insertSeparator (m_selectall_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	145 // find files
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	146 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	147 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	148 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	149
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	150 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	151 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	152 m_run_action->setEnabled (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	153 m_run_action->setShortcut (QKeySequence ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	154 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	155
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	156 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	157 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	158 m_run_action->setEnabled (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	159 shortcut_manager::set_shortcut (m_run_action, "editor_run:run_file");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	160 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	161
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	162 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	163 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	164 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	165
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	166 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	167 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	168 m_edit_nav_menu->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	169
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	170 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	171 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	172 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	173 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	174 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	175 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	176
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	177 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	178 m_context_doc_action->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	179
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	180 m_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	181 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	182 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	183 m_zoom_normal_action->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	184
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	185 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	186 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	187 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	188 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	189 m_run_action->setEnabled (have_tabs);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	190
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	191 m_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	192 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	193 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	194 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	195 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	196 m_close_others_action->setEnabled (have_tabs && m_tab_widget->count () > 1);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	197 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	198
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	199 // 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	200 // 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	201 // (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	202 // 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	203 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	204 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	205 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	206 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	207 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	208
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	209 bool real_visible;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	210
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	211 if (startup)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	212 real_visible = isVisible ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	213 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	214 real_visible = visible;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	215
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	216 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	217 return;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	218
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	219 if (startup && ! isFloating ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	220 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	221 // 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	222 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	223
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	224 bool in_tab = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	225 int i = 0;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	226 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	227 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	228 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	229 i++;
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 int j = 0;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	232 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	233 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	234 // 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	235 if (tab->tabText (j) == windowTitle ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	236 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	237 // 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	238 in_tab = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	239 int top = tab->currentIndex ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	240 if (top > -1 && tab->tabText (top) == windowTitle ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	241 real_visible = true; // and is the current tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	242 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	243 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	244 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	245 j++;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	246 }
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 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	249
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	250 request_new_file ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	251 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	252
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	253 void file_editor::restore_session (QSettings *settings)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	254 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	255 //restore previous session
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	256 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	257 return;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	258
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	259 // 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	260 QStringList sessionFileNames
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	261 = 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	262 .toStringList ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	263
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	264 QStringList session_encodings
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	265 = 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	266 .toStringList ();
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 QStringList session_index
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	269 = 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	270 .toStringList ();
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	271
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	272 QStringList session_lines
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	273 = 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	274 .toStringList ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	275
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	276 // 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	277 QList<session_data> s_data;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	278
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	279 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	280 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	281 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	282
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	283 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	284 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	285 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	286 if (! file.exists ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	287 continue;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	288
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	289 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	290 QString (), QString ()};
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	291 if (do_lines)
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	292 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	293 if (do_index)
25293 ae0518976e2b open files in correct order when restoring editor session (bug #53711) Torsten <mttl@mailbox.org> parents: 25274 diff changeset	294 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	295 if (do_encoding)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	296 item.encoding = session_encodings.at (n);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	297
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	298 s_data << item;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	299 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	300
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	301 qSort (s_data);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	302
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	303 // 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	304 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	305 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	306 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	307 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	308
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	309 void file_editor::focus (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	310 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	311 if (m_no_focus)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	312 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	313
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	314 octave_dock_widget::focus ();
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 // set focus to current tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	317 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	318 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	319 emit fetab_set_focus (fileEditorTab);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	320 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	321
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	322 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	323 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	324 octave_dock_widget::focus ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	325
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	326 // set focus to desired tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	327 if (fet)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	328 m_tab_widget->setCurrentWidget (fet);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	329 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	330
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	331 // 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	332 // focus of the editor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	333 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	334 {
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	335 QHash<QMenu*, QStringList>::const_iterator i = m_hash_menu_text.constBegin ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	336
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	337 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	338 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	339 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	340 ++i;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	341 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	342
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	343 // 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	344 // in the main window due to missing info on selected text and undo actions
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	345 if (! enable && m_copy_action && m_undo_action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	346 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	347 m_copy_action->setEnabled (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	348 m_undo_action->setEnabled (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	349 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	350 }
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	351
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	352 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	353 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	354 // 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	355 // 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	356 // 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	357 // 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	358 // 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	359 // 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	360
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	361 // 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	362 m_editor_tab_map.clear ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	363 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	364
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	365 // Save all tabs with confirmation.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	366 file_editor_tab::reset_cancel ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	367 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	368
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	369 // 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	370 // 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	371 // 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	372 // 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	373 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	374 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	375 emit fetab_recover_from_exit ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	376 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	377 }
21054 221847e5f488 fix issues when restoring breakpoints and closing tabs or whole application Torsten <ttl@justmail.de> parents: 21002 diff changeset	378
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	379 // 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	380
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	381 // Save open files for restoring in next session; this only is possible
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	382 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	383
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	384 // 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	385 // 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	386 QStringList fetFileNames;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	387 QStringList fet_encodings;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	388 QStringList fet_index;
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	389 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	390
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	391 // 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	392 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	393 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	394 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	395 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	396 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	397 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	398 fetFileNames.append (file_name);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	399 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	400
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	401 QString index;
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	402 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	403 = 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	404 fet_index.append (index.setNum
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	405 (m_tab_widget->indexOf (editor_tab)));
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	406
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	407 int l, c;
f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	408 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	409 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	410 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	411 }
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	412
25748 f3aa4a90b91f also restore cursor line numbers when restoring previous editor session_data Torsten <mttl@mailbox.org> parents: 25743 diff changeset	413 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	414 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	415 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	416 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	417 settings->sync ();
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	418
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	419 // 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	420 // 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	421 // 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	422 // 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	423 bool vis = isVisible ();
7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	424
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	425 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	426 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	427 // 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	428 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	429 m_tab_widget->removeTab (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	430 }
17903 de8591a19bc6 check for custom editor when opening a new file from the gui (bug #40496) Torsten <ttl@justmail.de> parents: 17901 diff changeset	431
25357 7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	432 setVisible (vis);
7aeafec2b102 keep editor hidden at next startup when it was hidden (bug #53830) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	433
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	434 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	435 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	436
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	437 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	438 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	439 // 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	440 // 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	441 if (call_custom_editor ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	442 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	443
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	444 // 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	445 // 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	446 // 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	447
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	448 file_editor_tab *fileEditorTab = new file_editor_tab (m_ced);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	449 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	450 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	451 add_file_editor_tab (fileEditorTab, ""); // new tab with empty title
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	452 fileEditorTab->new_file (commands); // title is updated here
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	453 focus (); // focus editor and new tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	454 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	455 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	456
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	457 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	458 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	459 file_editor_tab *editor_tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	460 = 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	461 editor_tab->conditional_close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	462 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	463
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	464 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	465 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	466 file_editor_tab *editor_tab;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	467
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	468 // 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	469 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	470 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	471 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	472 editor_tab->conditional_close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	473 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	474 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	475
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	476 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	477 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	478 file_editor_tab *editor_tab;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	479 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	480
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	481 // 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	482 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	483 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	484 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	485 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	486 editor_tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	487 = 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	488 editor_tab->conditional_close ();
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 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	491 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	492
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	493 // 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	494 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	495 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	496 if (action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	497 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	498 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	499 action->data ().toStringList ().at (1));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	500 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	501 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	502
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	503 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	504 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	505 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	506 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	507
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	508 void file_editor::request_redo (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	509 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	510 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	511 QsciScintillaBase::SCI_REDO);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	512 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	513
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	514 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	515 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	516 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	517 QsciScintillaBase::SCI_CUT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	518 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	519
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	520 void file_editor::request_context_help (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	521 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	522 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	523 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	524
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	525 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	526 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	527 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	528 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	529
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	530 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	531 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	532 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	533 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	534
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	535 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	536 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	537 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	538 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	539
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	540 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	541 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	542 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	543 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	544
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	545 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	546 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	547 emit fetab_run_file (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	548 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	549
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	550 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	551 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	552 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	553 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	554
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	555 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	556 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	557 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	558 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	559
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	560 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	561 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	562 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	563 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	564
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	565 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	566 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	567 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	568 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	569
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	570 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	571 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	572 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	573 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	574
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	575 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	576 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	577 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	578 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	579
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	580 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	581 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	582 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	583 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	584
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	585 // 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	586 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	587 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	588 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	589 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	590
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	591 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	592 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	593 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	594 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	595
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	596 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	597 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	598 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	599 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	600
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	601 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	602 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	603 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	604 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	605
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	606 // slots for Edit->Commands actions
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	607 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	608 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	609 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	610 QsciScintillaBase::SCI_DELWORDLEFT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	611 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	612
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	613 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	614 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	615 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	616 QsciScintillaBase::SCI_DELWORDRIGHT);
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_delete_start_line (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_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	622 QsciScintillaBase::SCI_DELLINELEFT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	623 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	624
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	625 void file_editor::request_delete_end_line (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	626 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	627 emit fetab_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	628 QsciScintillaBase::SCI_DELLINERIGHT);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	629 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	630
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	631 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	632 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	633 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	634 QsciScintillaBase::SCI_LINEDELETE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	635 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	636
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	637 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	638 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	639 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	640 QsciScintillaBase::SCI_LINECOPY);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	641 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	642
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	643 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	644 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	645 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	646 QsciScintillaBase::SCI_LINECUT);
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 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	650 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	651 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	652 QsciScintillaBase::SCI_SELECTIONDUPLICATE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	653 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	654
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	655 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	656 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	657 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	658 QsciScintillaBase::SCI_LINETRANSPOSE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	659 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	660
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	661 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	662 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	663 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	664 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	665
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	666 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	667 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	668 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	669 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	670
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	671 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	672 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	673 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	674 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	675
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	676 // slots for Edit->Format actions
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	677 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	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_UPPERCASE);
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_lower_case (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_LOWERCASE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	687 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	688
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	689 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	690 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	691 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	692 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	693
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	694 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	695 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	696 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	697 }
24484 abb075ada761 Allow commenting with manually selected comment strings (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	698
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	699 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	700 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	701 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	702 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	703
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	704 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	705 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	706 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	707 QsciScintilla::EolWindows);
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 void
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	710 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	711 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	712 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	713 QsciScintilla::EolUnix);
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
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	716 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	717 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	718 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	719 QsciScintilla::EolMac);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	720 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	721
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	722 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	723 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	724 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	725 }
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 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	728 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	729 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	730 }
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24130 diff changeset	731
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	732 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	733 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	734 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	735 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	736
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	737 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	738 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	739 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	740 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	741
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	742 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	743 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	744 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	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::handle_file_name_changed (const QString& fname,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	748 const QString& tip)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	749 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	750 QObject *fileEditorTab = sender ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	751 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	752 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	753 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	754 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	755 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	756 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	757 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	758 m_tab_widget->setTabToolTip (i, tip);
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 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	761 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	762 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	763
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	764 void file_editor::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	765 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	766 file_editor_tab *editor_tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	767 = 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	768 editor_tab->conditional_close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	769 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	770
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	771 void
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	772 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	773 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	774 QObject *fileEditorTab = sender ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	775 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	776 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	777 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	778 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	779 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	780 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	781 m_tab_widget->removeTab (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	782 // 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	783 // 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	784 delete fileEditorTab;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	785 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	786 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	787 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	788 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	789 check_actions ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	790
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	791 focus (); // focus stays in editor when tab is closed
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 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	794
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	795 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	796 const QString& encoding, QWidget *ID)
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 // 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	799 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	800 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	801 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	802
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	803 // context menu of edit area
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	804 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	805 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	806 emit fetab_change_request (m_tab_widget->widget (index));
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	807 focus ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	808 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	809
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	810 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	811 bool is_octave_file)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	812 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	813 // 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	814 // 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	815 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	816 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	817 if (m_copy_action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	818 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	819 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	820 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	821 m_run_action->setEnabled (is_octave_file);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	822
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	823 setFocusProxy (m_tab_widget->currentWidget ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	824 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	825 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	826
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	827 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	828 const QString& encoding)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	829 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	830 int index;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	831 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	832 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	833 m_mru_files.removeAt (index);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	834 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	835 }
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 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	838 m_mru_files_encodings.prepend (encoding);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	839
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	840 mru_menu_update ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	841 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	842
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	843 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	844 bool remove_on_success)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	845 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	846 // 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	847 QWidget *tab = find_tab_widget (saveFileName);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	848
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	849 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	850 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	851 // 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	852 // 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	853 // 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	854 // 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	855 // 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	856 // 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	857
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	858 // 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	859 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	860 = 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	861 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	862 "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	863 arg (saveFileName),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	864 QMessageBox::Ok, nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	865
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	866 msgBox->setWindowModality (Qt::NonModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	867 msgBox->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	868 msgBox->show ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	869
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	870 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	871 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	872
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	873 QObject *saveFileObject = sender ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	874 QWidget *saveFileWidget = nullptr;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	875
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	876 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	877 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	878 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	879 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	880 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	881 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	882 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	883 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	884 if (! saveFileWidget)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	885 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	886 // 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	887 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	888 = 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	889 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	890 QMessageBox::Ok, nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	891
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	892 msgBox->setWindowModality (Qt::NonModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	893 msgBox->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	894 msgBox->show ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	895
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	896 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	897 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	898
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	899 // 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	900 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	901 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	902
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	903 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	904 int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	905 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	906 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	907 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	908
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	909 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	910 int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	911 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	912 if (! file.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	913 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	914 // 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	915 QWidget *tab = find_tab_widget (file);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	916
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	917 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	918 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	919 m_tab_widget->setCurrentWidget (tab);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	920
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	921 if (line > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	922 emit fetab_delete_debugger_pointer (tab, line);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	923
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	924 emit fetab_set_focus (tab);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	925 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	926 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	927 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	928
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	929 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	930 const QString& file,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	931 int line,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	932 const QString& cond)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	933 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	934 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	935 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	936
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	937 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	938 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	939 request_open_file (file);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	940 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	941
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	942 // 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	943 // 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	944 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	945 const QString& new_name)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	946 {
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	947 // 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	948 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	949 session_data f_data;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	950
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	951 // 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	952 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	953 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	954
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	955 if (old_name_clean.at (0) == QChar ('\"') &&
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	956 old_name_clean.at (s - 1) == QChar ('\"'))
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	957 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	958
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	959 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	960
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	961 // 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	962 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	963 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	964
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	965 // 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	966 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	967 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	968 // 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	969 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	970
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	971 if (old.isDir ())
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	972 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	973 // 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	974 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	975 }
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	976 else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	977 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	978 // 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	979 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	980 = 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	981
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	982 if (editor_tab)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	983 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	984 // 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	985 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	986 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	987 {
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	988 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	989 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	990 // 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	991 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	992 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	993 int l, c;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	994 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	995 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	996 break;
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	997 }
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25634 diff changeset	998 }
25790 872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	999
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1000 // Close it silently
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1001 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	1002 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	1003 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	1004
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1005 // 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	1006 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	1007 // 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	1008 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	1009 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1010 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	1011 std::string ofile = old.fileName ().toStdString ();
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1012 f_data.new_file_name = QString::fromStdString (
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1013 octave::sys::env::make_absolute (ofile, ndir));
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1014 }
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1015 else
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1016 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	1017
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	1018 // 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	1019 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	1020 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1021 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1022 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1023 }
24082 0052d47ddc3e Backed out changeset ba164db1c4a4 Torsten <mttl@mailbox.org> parents: 24048 diff changeset	1024
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1025 // 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	1026 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	1027 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1028 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	1029
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1030 // 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	1031 // 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	1032 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	1033 {
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1034 // 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	1035 if (load_new)
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1036 {
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1037 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	1038 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	1039 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	1040 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	1041 false, false, true, "",
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1042 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	1043 }
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1044 else
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1045 {
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1046 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	1047 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	1048 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	1049 false, false, true, "",
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1050 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	1051 }
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1052
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1053 }
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1054
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1055 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	1056
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1057 // 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	1058 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	1059 }
24082 0052d47ddc3e Backed out changeset ba164db1c4a4 Torsten <mttl@mailbox.org> parents: 24048 diff changeset	1060
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1061 void file_editor::notice_settings (const QSettings *settings)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1062 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1063 int icon_size_settings = settings->value ("toolbar_icon_size",0).toInt ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1064 QStyle *st = style ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1065 int icon_size = st->pixelMetric (QStyle::PM_ToolBarIconSize);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1066
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1067 if (icon_size_settings == 1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1068 icon_size = st->pixelMetric (QStyle::PM_LargeIconSize);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1069 else if (icon_size_settings == -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1070 icon_size = st->pixelMetric (QStyle::PM_SmallIconSize);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1071
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1072 m_tool_bar->setIconSize (QSize (icon_size,icon_size));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1073
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1074 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	1075 .toInt ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1076 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	1077 .toInt ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1078
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1079 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	1080 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1081 QString style_sheet = QString ("QTabBar::tab "
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1082 "{min-width: %1px; max-width: %2px;}")
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 24731 diff changeset	1083 .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	1084 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	1085 m_tab_widget->setStyleSheet (style_sheet);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1086 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1087 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1088 m_tab_widget->setElideMode (Qt::ElideNone);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1089
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1090 m_tab_widget->setUsesScrollButtons (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1091
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1092 bool show_it;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1093 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	1094 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	1095 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	1096 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	1097 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	1098 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	1099 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	1100 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	1101 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	1102 m_show_longline_action->setChecked (show_it);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1103
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1104 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	1105 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	1106 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	1107 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	1108 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	1109 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	1110 m_show_hscrollbar_action->setChecked (show_it);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1111
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1112 set_shortcuts ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1113
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1114 // 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	1115 emit fetab_settings_changed (settings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1116 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1117
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1118 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	1119 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1120 // 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	1121 // 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	1122
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1123 // File menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1124 shortcut_manager::set_shortcut (m_edit_function_action, "editor_file:edit_function");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1125 shortcut_manager::set_shortcut (m_save_action, "editor_file:save");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1126 shortcut_manager::set_shortcut (m_save_as_action, "editor_file:save_as");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1127 shortcut_manager::set_shortcut (m_close_action, "editor_file:close");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1128 shortcut_manager::set_shortcut (m_close_all_action, "editor_file:close_all");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1129 shortcut_manager::set_shortcut (m_close_others_action, "editor_file:close_other");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1130 shortcut_manager::set_shortcut (m_print_action, "editor_file:print");
17903 de8591a19bc6 check for custom editor when opening a new file from the gui (bug #40496) Torsten <ttl@justmail.de> parents: 17901 diff changeset	1131
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1132 // Edit menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1133 shortcut_manager::set_shortcut (m_redo_action, "editor_edit:redo");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1134 shortcut_manager::set_shortcut (m_cut_action, "editor_edit:cut");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1135 shortcut_manager::set_shortcut (m_find_action, "editor_edit:find_replace");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1136 shortcut_manager::set_shortcut (m_find_next_action, "editor_edit:find_next");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1137 shortcut_manager::set_shortcut (m_find_previous_action, "editor_edit:find_previous");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1138
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1139 shortcut_manager::set_shortcut (m_delete_start_word_action, "editor_edit:delete_start_word");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1140 shortcut_manager::set_shortcut (m_delete_end_word_action, "editor_edit:delete_end_word");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1141 shortcut_manager::set_shortcut (m_delete_start_line_action, "editor_edit:delete_start_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1142 shortcut_manager::set_shortcut (m_delete_end_line_action, "editor_edit:delete_end_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1143 shortcut_manager::set_shortcut (m_delete_line_action, "editor_edit:delete_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1144 shortcut_manager::set_shortcut (m_copy_line_action, "editor_edit:copy_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1145 shortcut_manager::set_shortcut (m_cut_line_action, "editor_edit:cut_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1146 shortcut_manager::set_shortcut (m_duplicate_selection_action, "editor_edit:duplicate_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1147 shortcut_manager::set_shortcut (m_transpose_line_action, "editor_edit:transpose_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1148 shortcut_manager::set_shortcut (m_comment_selection_action, "editor_edit:comment_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1149 shortcut_manager::set_shortcut (m_uncomment_selection_action, "editor_edit:uncomment_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1150 shortcut_manager::set_shortcut (m_comment_var_selection_action, "editor_edit:comment_var_selection");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1151
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1152 shortcut_manager::set_shortcut (m_upper_case_action, "editor_edit:upper_case");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1153 shortcut_manager::set_shortcut (m_lower_case_action, "editor_edit:lower_case");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1154 shortcut_manager::set_shortcut (m_indent_selection_action, "editor_edit:indent_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1155 shortcut_manager::set_shortcut (m_unindent_selection_action, "editor_edit:unindent_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1156 shortcut_manager::set_shortcut (m_smart_indent_line_or_selection_action, "editor_edit:smart_indent_line_or_selection");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1157 shortcut_manager::set_shortcut (m_completion_action, "editor_edit:completion_list");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1158 shortcut_manager::set_shortcut (m_goto_line_action, "editor_edit:goto_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1159 shortcut_manager::set_shortcut (m_move_to_matching_brace, "editor_edit:move_to_brace");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1160 shortcut_manager::set_shortcut (m_sel_to_matching_brace, "editor_edit:select_to_brace");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1161 shortcut_manager::set_shortcut (m_toggle_bookmark_action, "editor_edit:toggle_bookmark");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1162 shortcut_manager::set_shortcut (m_next_bookmark_action, "editor_edit:next_bookmark");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1163 shortcut_manager::set_shortcut (m_previous_bookmark_action, "editor_edit:previous_bookmark");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1164 shortcut_manager::set_shortcut (m_remove_bookmark_action, "editor_edit:remove_bookmark");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1165 shortcut_manager::set_shortcut (m_preferences_action, "editor_edit:preferences");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1166 shortcut_manager::set_shortcut (m_styles_preferences_action, "editor_edit:styles_preferences");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1167
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1168 shortcut_manager::set_shortcut (m_conv_eol_windows_action, "editor_edit:conv_eol_winows");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1169 shortcut_manager::set_shortcut (m_conv_eol_unix_action, "editor_edit:conv_eol_unix");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1170 shortcut_manager::set_shortcut (m_conv_eol_mac_action, "editor_edit:conv_eol_mac");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1171
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1172 // View menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1173 shortcut_manager::set_shortcut (m_show_linenum_action, "editor_view:show_line_numbers");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1174 shortcut_manager::set_shortcut (m_show_whitespace_action, "editor_view:show_white_spaces");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1175 shortcut_manager::set_shortcut (m_show_eol_action, "editor_view:show_eol_chars");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1176 shortcut_manager::set_shortcut (m_show_indguide_action, "editor_view:show_ind_guides");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1177 shortcut_manager::set_shortcut (m_show_longline_action, "editor_view:show_long_line");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1178 shortcut_manager::set_shortcut (m_show_toolbar_action, "editor_view:show_toolbar");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1179 shortcut_manager::set_shortcut (m_show_statusbar_action, "editor_view:show_statusbar");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1180 shortcut_manager::set_shortcut (m_show_hscrollbar_action, "editor_view:show_hscrollbar");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1181 shortcut_manager::set_shortcut (m_zoom_in_action, "editor_view:zoom_in");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1182 shortcut_manager::set_shortcut (m_zoom_out_action, "editor_view:zoom_out");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1183 shortcut_manager::set_shortcut (m_zoom_normal_action, "editor_view:zoom_normal");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1184
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1185 // Debug menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1186 shortcut_manager::set_shortcut (m_toggle_breakpoint_action, "editor_debug:toggle_breakpoint");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1187 shortcut_manager::set_shortcut (m_next_breakpoint_action, "editor_debug:next_breakpoint");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1188 shortcut_manager::set_shortcut (m_previous_breakpoint_action, "editor_debug:previous_breakpoint");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1189 shortcut_manager::set_shortcut (m_remove_all_breakpoints_action, "editor_debug:remove_breakpoints");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1190
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1191 // Run menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1192 shortcut_manager::set_shortcut (m_run_action, "editor_run:run_file");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1193 shortcut_manager::set_shortcut (m_run_selection_action, "editor_run:run_selection");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1194
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1195 // Help menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1196 shortcut_manager::set_shortcut (m_context_help_action, "editor_help:help_keyword");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1197 shortcut_manager::set_shortcut (m_context_doc_action, "editor_help:doc_keyword");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1198
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1199 // Tab navigation without menu entries
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1200 shortcut_manager::set_shortcut (m_switch_left_tab_action, "editor_tabs:switch_left_tab");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1201 shortcut_manager::set_shortcut (m_switch_right_tab_action, "editor_tabs:switch_right_tab");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1202 shortcut_manager::set_shortcut (m_move_tab_left_action, "editor_tabs:move_tab_left");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1203 shortcut_manager::set_shortcut (m_move_tab_right_action, "editor_tabs:move_tab_right");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1204
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1205 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1206
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1207 // 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	1208 // 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	1209 // and is made visible
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1210 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	1211 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1212 if (m_closed && visible)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1213 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1214 m_closed = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1215 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1216 restore_session (settings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1217 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1218
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1219 empty_script (false, visible);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1220
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1221 if (visible && ! isFloating ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1222 focus ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1223
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1224 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1225
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1226 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	1227 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1228 m_ced = dir;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1229 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	1230 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1231
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1232 void file_editor::copyClipboard (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1233 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1234 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1235 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	1236 QsciScintillaBase::SCI_COPY);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1237 }
18545 17baa684892c fix flashing while debuggung and editor is tabbed behind console (bug #41757) Torsten <ttl@justmail.de> parents: 18472 diff changeset	1238
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1239 void file_editor::pasteClipboard (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1240 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1241 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1242 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	1243 QsciScintillaBase::SCI_PASTE);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1244 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1245
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1246 void file_editor::selectAll (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1247 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1248 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1249 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	1250 QsciScintillaBase::SCI_SELECTALL);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1251 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1252
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1253 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	1254 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1255 if (editor_tab_has_focus ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1256 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	1257 QsciScintillaBase::SCI_UNDO);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1258 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1259
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1260 // 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	1261 // 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	1262 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	1263 const QString& encoding,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1264 int line, bool debug_pointer,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1265 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	1266 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	1267 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1268 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	1269 return; // custom editor called
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1270
25622 a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1271 QSettings *settings = resource_manager::get_settings ();
a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1272 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	1273 = 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	1274
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1275 if (openFileName.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1276 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1277 // 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	1278 // 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	1279 request_new_file ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1280 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1281 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1282 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1283 // 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	1284 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	1285
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1286 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1287 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1288 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	1289
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1290 if (line > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1291 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1292 if (insert)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1293 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	1294
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1295 if (debug_pointer)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1296 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	1297
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1298 if (breakpoint_marker)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1299 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	1300 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1301
25622 a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1302 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	1303 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1304 emit fetab_set_focus (tab);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1305 focus ();
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 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1308 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1309 {
25622 a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1310 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	1311 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	1312
a7ee69d23f32 add a gui preference for opening files when debugging in console (bug #49119) Torsten <mttl@mailbox.org> parents: 25508 diff changeset	1313 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	1314 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	1315
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1316 file_editor_tab *fileEditorTab = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1317 // 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	1318 bool reusing = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1319 tab = find_tab_widget ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1320 if (tab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1321 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1322 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	1323 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	1324 fileEditorTab = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1325 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1326 reusing = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1327 }
21565 08baf0ebc9a9 Reappropriate <unnamed> editor tab when opening a new file (bug #47529) Lachlan Andrew <lachlanbis@gmail.com> parents: 21562 diff changeset	1328
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1329 // 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	1330 if (! fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1331 fileEditorTab = new 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	1332
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1333 if (fileEditorTab)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1334 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1335 fileEditorTab->set_encoding (encoding);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1336 QString result = fileEditorTab->load_file (openFileName);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1337 if (result == "")
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1338 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1339 // Supply empty title then have the file_editor_tab update
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1340 // with full or short name.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1341 if (! reusing)
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	1342 add_file_editor_tab (fileEditorTab, "", index);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1343 fileEditorTab->update_window_title (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1344 // file already loaded, add file to mru list here
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1345 QFileInfo file_info = QFileInfo (openFileName);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1346 handle_mru_add_file (file_info.canonicalFilePath (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1347 encoding);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1348
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1349 if (line > 0)
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 if (insert)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1352 emit fetab_goto_line (fileEditorTab, line);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1353
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1354 if (debug_pointer)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1355 emit fetab_insert_debugger_pointer (fileEditorTab,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1356 line);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1357 if (breakpoint_marker)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1358 emit fetab_do_breakpoint_marker (insert, fileEditorTab,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1359 line, cond);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1360 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1361 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1362 else
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 delete fileEditorTab;
17736 6a2e483125dd editor asks if a new file should be created when called from edit (bug #40351) Torsten <ttl@justmail.de> parents: 17706 diff changeset	1365
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1366 if (QFile::exists (openFileName))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1367 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1368 // File not readable:
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1369 // 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	1370 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1371 = new QMessageBox (QMessageBox::Critical,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1372 tr ("Octave Editor"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1373 tr ("Could not open file\n%1\nfor read: %2.").
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1374 arg (openFileName).arg (result),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1375 QMessageBox::Ok, this);
17736 6a2e483125dd editor asks if a new file should be created when called from edit (bug #40351) Torsten <ttl@justmail.de> parents: 17706 diff changeset	1376
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1377 msgBox->setWindowModality (Qt::NonModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1378 msgBox->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1379 msgBox->show ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1380 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1381 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1382 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1383 // File does not exist, should it be created?
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1384 bool create_file = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1385 QMessageBox *msgBox;
19314 2b708273548d button order in dialog for creating a non-existing file (bug #43537) Torsten <ttl@justmail.de> parents: 19247 diff changeset	1386
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1387 if (! settings->value ("editor/create_new_file", false).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1388 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1389 msgBox = new QMessageBox (QMessageBox::Question,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1390 tr ("Octave Editor"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1391 tr ("File\n%1\ndoes not exist. "
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1392 "Do you want to create it?").arg (openFileName),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1393 QMessageBox::NoButton,nullptr);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1394 QPushButton *create_button =
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1395 msgBox->addButton (tr ("Create"), QMessageBox::YesRole);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1396 msgBox->addButton (tr ("Cancel"), QMessageBox::RejectRole);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1397 msgBox->setDefaultButton (create_button);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1398 msgBox->exec ();
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1399
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1400 QAbstractButton *clicked_button = msgBox->clickedButton ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1401 if (clicked_button != create_button)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1402 create_file = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1403
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1404 delete msgBox;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1405 }
19314 2b708273548d button order in dialog for creating a non-existing file (bug #43537) Torsten <ttl@justmail.de> parents: 19247 diff changeset	1406
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1407 if (create_file)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1408 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1409 // create the file and call the editor again
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1410 QFile file (openFileName);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1411 if (! file.open (QIODevice::WriteOnly))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1412 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1413 // error opening the file
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1414 msgBox = new QMessageBox (QMessageBox::Critical,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1415 tr ("Octave Editor"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1416 tr ("Could not open file\n%1\nfor write: %2.").
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1417 arg (openFileName).arg (file.errorString ()),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1418 QMessageBox::Ok, this);
17736 6a2e483125dd editor asks if a new file should be created when called from edit (bug #40351) Torsten <ttl@justmail.de> parents: 17706 diff changeset	1419
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1420 msgBox->setWindowModality (Qt::NonModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1421 msgBox->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1422 msgBox->show ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1423 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1424 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1425 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1426 file.close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1427 request_open_file (openFileName);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1428 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1429 }
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 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1433
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1434 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	1435 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1436 // really show editor and the current editor tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1437 focus ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1438 emit file_loaded_signal ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1439 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1440 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1441 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1442 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	1443
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1444 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	1445 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1446 emit request_settings_dialog ("editor");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1447 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1448
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1449 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	1450 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1451 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	1452 }
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 17639 diff changeset	1453
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1454 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	1455 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1456 toggle_preference ("editor/showLineNumbers",true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1457 }
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 17639 diff changeset	1458
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1459 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	1460 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1461 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	1462 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1463
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1464 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	1465 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1466 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	1467 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1468
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1469 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	1470 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1471 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	1472 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1473
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1474 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	1475 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1476 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	1477 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1478
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1479 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	1480 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1481 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	1482 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1483
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1484 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	1485 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1486 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	1487 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1488
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1489 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	1490 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1491 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	1492 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1493
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1494 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	1495 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1496 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	1497 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1498
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1499 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	1500 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1501 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	1502 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1503
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1504 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	1505 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1506 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	1507 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1508
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1509 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	1510 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1511 // 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	1512 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	1513 QAction *a;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1514
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1515 foreach (a, all_actions)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1516 menu->removeAction (a);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1517
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1518 // 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	1519 menu->addAction (m_undo_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1520 menu->addAction (m_redo_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1521 menu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1522 menu->addAction (m_cut_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1523 menu->addAction (m_copy_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1524 menu->addAction (m_paste_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1525 menu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1526 menu->addAction (m_selectall_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1527 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	1528 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	1529 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	1530 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	1531 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	1532 menu->addSeparator ();
1f1e1e72e958 make file editor context menu more like menu bar edit menu John W. Eaton <jwe@octave.org> parents: 25064 diff changeset	1533 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	1534 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	1535 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	1536 menu->addSeparator ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1537 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	1538 }
18665 777281eeb3d4 add all editor actions to the shortcut manager and fix their shortcut context Torsten <ttl@justmail.de> parents: 18656 diff changeset	1539
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1540 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	1541 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1542 if (m_undo_action)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1543 m_undo_action->setEnabled (undo);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1544 m_redo_action->setEnabled (redo);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1545 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1546
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1547 // handler for the close event
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1548 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	1549 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1550 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1551 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	1552 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1553 if (check_closing ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1554 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1555 // 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	1556 // 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	1557 m_closed = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1558 e->accept ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1559 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1560 else
25623 331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1561 {
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1562 e->ignore ();
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1563 return;
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1564 }
24716 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 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1567 e->accept ();
25623 331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1568
331f46b9ee6c fix close events of some main dock widgets (bug #54185) Torsten <mttl@mailbox.org> parents: 25622 diff changeset	1569 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	1570 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1571
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1572 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	1573 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1574 if (e->mimeData ()->hasUrls ())
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 e->acceptProposedAction ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1577 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1578 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1579
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1580 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	1581 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1582 if (e->mimeData ()->hasUrls ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1583 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1584 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	1585 request_open_file (url.toLocalFile ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1586 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1587 }
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 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	1590 {
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25293 diff changeset	1591 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	1592 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	1593 QDockWidget *console =
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1594 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	1595
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1596 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	1597 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1598 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	1599 return true;
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
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1602 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1603 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1604
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1605 void file_editor::construct (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1606 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1607 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	1608
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1609 // 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	1610 // QStyle *editor_style = QApplication::style ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1611
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1612 // 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	1613 // 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	1614 // on other platforms.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1615 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	1616 m_menu_bar->setNativeMenuBar (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1617
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1618 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	1619 m_tool_bar->setMovable (true);
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 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	1622
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1623 // the mru-list and an empty array of actions
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1624 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1625 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	1626 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	1627 .toStringList ();
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18767 diff changeset	1628
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1629 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	1630 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1631 // 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	1632 m_mru_files_encodings = QStringList ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1633 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	1634 m_mru_files_encodings << QString ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1635 }
24130 6fdbdb66d7cb set editor menu bar as non-native menu bar on all platforms Torsten <mttl@mailbox.org> parents: 24123 diff changeset	1636
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1637 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	1638 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1639 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	1640 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	1641 }
24130 6fdbdb66d7cb set editor menu bar as non-native menu bar on all platforms Torsten <mttl@mailbox.org> parents: 24123 diff changeset	1642
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1643 // menu bar
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1644
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1645 // file menu
13562 a89aa9e05e19 editor: menu bar, run editor file in octave ttl <ttl@justmail.de> parents: 13558 diff changeset	1646
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1647 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	1648
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1649 // 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	1650 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	1651 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	1652 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	1653 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	1654
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1655 m_fileMenu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1656
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1657 m_edit_function_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1658 = add_action (m_fileMenu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1659 tr ("&Edit Function"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1660 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	1661
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1662 m_fileMenu->addSeparator ();
20814 2da4058d65c7 store the encoding of recent editor files in the mru list Torsten <ttl@justmail.de> parents: 20796 diff changeset	1663
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1664 m_save_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1665 = add_action (m_fileMenu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1666 resource_manager::icon ("document-save"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1667 tr ("&Save File"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1668 SLOT (request_save_file (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1669
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1670 m_save_as_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1671 = add_action (m_fileMenu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1672 resource_manager::icon ("document-save-as"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1673 tr ("Save File &As..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1674 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	1675
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1676 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	1677
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1678 m_close_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1679 = add_action (m_fileMenu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1680 resource_manager::icon ("window-close",false),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1681 tr ("&Close"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1682 SLOT (request_close_file (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1683
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1684 m_close_all_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1685 = add_action (m_fileMenu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1686 resource_manager::icon ("window-close",false),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1687 tr ("Close All"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1688 SLOT (request_close_all_files (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1689
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1690 m_close_others_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1691 = add_action (m_fileMenu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1692 resource_manager::icon ("window-close",false),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1693 tr ("Close Other Files"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1694 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	1695
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1696 m_fileMenu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1697
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1698 m_print_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1699 = add_action (m_fileMenu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1700 resource_manager::icon ("document-print"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1701 tr ("Print..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1702 SLOT (request_print_file (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1703
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1704 // 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	1705
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1706 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	1707
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1708 m_redo_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1709 = add_action (m_edit_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1710 resource_manager::icon ("edit-redo"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1711 tr ("&Redo"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1712 SLOT (request_redo (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1713 m_redo_action->setEnabled (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1714
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1715 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	1716
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1717 m_cut_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1718 = add_action (m_edit_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1719 resource_manager::icon ("edit-cut"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1720 tr ("Cu&t"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1721 SLOT (request_cut (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1722 m_cut_action->setEnabled (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1723
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1724 m_find_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1725 = add_action (m_edit_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1726 resource_manager::icon ("edit-find-replace"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1727 tr ("&Find and Replace..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1728 SLOT (request_find (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1729
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1730 m_find_next_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1731 = add_action (m_edit_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1732 tr ("Find &Next..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1733 SLOT (request_find_next (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1734
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1735 m_find_previous_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1736 = add_action (m_edit_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1737 tr ("Find &Previous..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1738 SLOT (request_find_previous (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1739
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1740 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	1741
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1742 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	1743
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1744 m_delete_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1745 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1746 tr ("Delete Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1747 SLOT (request_delete_line (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1748
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1749 m_copy_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1750 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1751 tr ("Copy Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1752 SLOT (request_copy_line (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1753
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1754 m_cut_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1755 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1756 tr ("Cut Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1757 SLOT (request_cut_line (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1758
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1759 m_edit_cmd_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1760
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1761 m_delete_start_word_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1762 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1763 tr ("Delete to Start of Word"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1764 SLOT (request_delete_start_word (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1765
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1766 m_delete_end_word_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1767 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1768 tr ("Delete to End of Word"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1769 SLOT (request_delete_end_word (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1770
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1771 m_delete_start_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1772 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1773 tr ("Delete to Start of Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1774 SLOT (request_delete_start_line (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1775
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1776 m_delete_end_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1777 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1778 tr ("Delete to End of Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1779 SLOT (request_delete_end_line (bool)));
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	1780
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1781 m_edit_cmd_menu->addSeparator ();
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	1782
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1783 m_duplicate_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1784 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1785 tr ("Duplicate Selection/Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1786 SLOT (request_duplicate_selection (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1787
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1788 m_transpose_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1789 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1790 tr ("Transpose Line"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1791 SLOT (request_transpose_line (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1792
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1793 m_edit_cmd_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1794
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1795 m_completion_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1796 = add_action (m_edit_cmd_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1797 tr ("&Show Completion List"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1798 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	1799
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1800 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	1801
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1802 m_upper_case_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1803 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1804 tr ("&Uppercase Selection"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1805 SLOT (request_upper_case (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1806
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1807 m_lower_case_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1808 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1809 tr ("&Lowercase Selection"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1810 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	1811
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1812 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	1813
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1814 m_comment_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1815 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1816 tr ("&Comment"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1817 SLOT (request_comment_selected_text (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1818
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1819 m_uncomment_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1820 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1821 tr ("&Uncomment"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1822 SLOT (request_uncomment_selected_text (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1823
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1824 m_comment_var_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1825 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1826 tr ("Comment (Choosing String)"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1827 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	1828
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1829 m_edit_fmt_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1830
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1831 m_indent_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1832 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1833 tr ("&Indent Selection Rigidly"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1834 SLOT (request_indent_selected_text (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1835
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1836 m_unindent_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1837 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1838 tr ("&Unindent Selection Rigidly"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1839 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	1840
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1841 m_smart_indent_line_or_selection_action
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1842 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1843 tr ("Indent Code"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1844 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	1845
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1846 m_edit_fmt_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1847
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1848 m_conv_eol_windows_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1849 = 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	1850 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	1851 SLOT (request_conv_eol_windows (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1852
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1853 m_conv_eol_unix_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1854 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1855 tr ("Convert Line Endings to &Unix (LF)"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1856 SLOT (request_conv_eol_unix (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1857
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1858 m_conv_eol_mac_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1859 = add_action (m_edit_fmt_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1860 tr ("Convert Line Endings to &Mac (CR)"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1861 SLOT (request_conv_eol_mac (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_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	1864
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1865 m_goto_line_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1866 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1867 tr ("Go &to Line..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1868 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	1869
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1870 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	1871
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1872 m_move_to_matching_brace
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1873 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1874 tr ("Move to Matching Brace"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1875 SLOT (request_move_match_brace (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_sel_to_matching_brace
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1878 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1879 tr ("Select to Matching Brace"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1880 SLOT (request_sel_match_brace (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1881
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1882 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	1883
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1884 m_next_bookmark_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1885 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1886 tr ("&Next Bookmark"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1887 SLOT (request_next_bookmark (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1888
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1889 m_previous_bookmark_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1890 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1891 tr ("Pre&vious Bookmark"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1892 SLOT (request_previous_bookmark (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1893
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1894 m_toggle_bookmark_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1895 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1896 tr ("Toggle &Bookmark"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1897 SLOT (request_toggle_bookmark (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1898
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1899 m_remove_bookmark_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1900 = add_action (m_edit_nav_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1901 tr ("&Remove All Bookmarks"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1902 SLOT (request_remove_bookmark (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1903
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1904 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	1905
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1906 m_preferences_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1907 = add_action (m_edit_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1908 resource_manager::icon ("preferences-system"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1909 tr ("&Preferences..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1910 SLOT (request_preferences (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1911
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1912 m_styles_preferences_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1913 = add_action (m_edit_menu, resource_manager::icon ("preferences-system"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1914 tr ("&Styles Preferences..."),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1915 SLOT (request_styles_preferences (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1916
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1917 // view menu
19629 8ef79bc61d8a add actions for moving/selecting to matching brace Torsten <ttl@justmail.de> parents: 19608 diff changeset	1918
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1919 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	1920
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1921 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	1922
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1923 m_show_linenum_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1924 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1925 tr ("Show &Line Numbers"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1926 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	1927 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	1928
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1929 m_show_whitespace_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1930 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1931 tr ("Show &Whitespace Characters"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1932 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	1933 m_show_whitespace_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1934
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1935 m_show_eol_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1936 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1937 tr ("Show Line &Endings"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1938 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	1939 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	1940
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1941 m_show_indguide_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1942 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1943 tr ("Show &Indentation Guides"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1944 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	1945 m_show_indguide_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1946
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1947 m_show_longline_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1948 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1949 tr ("Show Long Line &Marker"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1950 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	1951 m_show_longline_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1952
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1953 m_view_editor_menu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1954
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1955 m_show_toolbar_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1956 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1957 tr ("Show &Toolbar"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1958 SLOT (show_toolbar (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1959 m_show_toolbar_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1960
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1961 m_show_statusbar_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1962 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1963 tr ("Show &Statusbar"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1964 SLOT (show_statusbar (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1965 m_show_statusbar_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1966
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1967 m_show_hscrollbar_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1968 = add_action (m_view_editor_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1969 tr ("Show &Horizontal Scrollbar"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1970 SLOT (show_hscrollbar (bool)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1971 m_show_hscrollbar_action->setCheckable (true);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1972
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1973 view_menu->addSeparator ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1974
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1975 m_zoom_in_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1976 = add_action (view_menu, resource_manager::icon ("zoom-in"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1977 tr ("Zoom &In"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1978 SLOT (zoom_in (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1979
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1980 m_zoom_out_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1981 = add_action (view_menu, resource_manager::icon ("zoom-out"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1982 tr ("Zoom &Out"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1983 SLOT (zoom_out (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1984
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1985 m_zoom_normal_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1986 = add_action (view_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1987 tr ("&Normal Size"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1988 SLOT (zoom_normal (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1989
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1990 m_menu_bar->addMenu (view_menu);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	1991
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1992 // debug menu
21002 314245afff3a add a menu entry for showing/hiding the editor horizontal scrollbar Torsten <ttl@justmail.de> parents: 21001 diff changeset	1993
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	1994 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	1995
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1996 m_toggle_breakpoint_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1997 = add_action (m_debug_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1998 resource_manager::icon ("bp-toggle"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	1999 tr ("Toggle &Breakpoint"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2000 SLOT (request_toggle_breakpoint (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2001
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2002 m_next_breakpoint_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2003 = add_action (m_debug_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2004 resource_manager::icon ("bp-next"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2005 tr ("&Next Breakpoint"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2006 SLOT (request_next_breakpoint (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2007
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2008 m_previous_breakpoint_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2009 = add_action (m_debug_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2010 resource_manager::icon ("bp-prev"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2011 tr ("Pre&vious Breakpoint"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2012 SLOT (request_previous_breakpoint (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2013
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2014 m_remove_all_breakpoints_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2015 = add_action (m_debug_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2016 resource_manager::icon ("bp-rm-all"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2017 tr ("&Remove All Breakpoints"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2018 SLOT (request_remove_breakpoint (bool)));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2019
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2020 m_debug_menu->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2021
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2022 // 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	2023
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2024 // run menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2025
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2026 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	2027
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2028 m_run_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2029 = add_action (_run_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2030 resource_manager::icon ("system-run"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2031 tr ("Save File and Run"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2032 SLOT (request_run_file (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2033
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2034 m_run_selection_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2035 = add_action (_run_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2036 tr ("Run &Selection"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2037 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	2038 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	2039
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2040 // 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	2041
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2042 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	2043
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2044 m_context_help_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2045 = add_action (_help_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2046 tr ("&Help on Keyword"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2047 SLOT (request_context_help (bool)));
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2048
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2049 m_context_doc_action
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2050 = add_action (_help_menu,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2051 tr ("&Documentation on Keyword"),
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2052 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	2053
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2054 // 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	2055
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2056 m_switch_left_tab_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2057 = 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	2058 m_tab_widget->get_tab_bar ());
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2059
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2060 m_switch_right_tab_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2061 = 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	2062 m_tab_widget->get_tab_bar ());
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2063
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2064 m_move_tab_left_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2065 = 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	2066 m_tab_widget->get_tab_bar ());
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2067
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2068 m_move_tab_right_action
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2069 = 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	2070 m_tab_widget->get_tab_bar ());
20693 7751bd56d0be added actions and shortcuts for switching editor tabs Torsten <ttl@justmail.de> parents: 20630 diff changeset	2071
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2072 // toolbar
20693 7751bd56d0be added actions and shortcuts for switching editor tabs Torsten <ttl@justmail.de> parents: 20630 diff changeset	2073
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2074 // popdown menu with mru files
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2075 QToolButton *popdown_button = new QToolButton ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2076 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	2077 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	2078 popdown_button->setPopupMode (QToolButton::InstantPopup);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2079 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	2080
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2081 // 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	2082 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	2083 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	2084 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	2085 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	2086 m_tool_bar->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2087 // 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	2088 m_tool_bar->addAction (m_redo_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2089 // 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	2090 m_tool_bar->addAction (m_cut_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2091 // 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	2092 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	2093 //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	2094 //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	2095 m_tool_bar->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2096 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	2097 m_tool_bar->addSeparator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2098 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	2099 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	2100 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	2101 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	2102
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2103 // layout
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2104 QVBoxLayout *vbox_layout = new QVBoxLayout ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2105 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	2106 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	2107 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	2108 vbox_layout->setMargin (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2109 editor_widget->setLayout (vbox_layout);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2110 setWidget (editor_widget);
16981 e86df0d43309 make ctrl-w available for readline in the gui terminal Torsten <ttl@justmail.de> parents: 16970 diff changeset	2111
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2112 // 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	2113 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	2114 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	2115 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	2116 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	2117 ctx_men->addAction (m_close_others_action);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2118
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2119 // signals
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2120 connect (this,
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2121 SIGNAL (execute_command_in_terminal_signal (const QString&)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2122 main_win (), SLOT (execute_command_in_terminal (const QString&)));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	2123
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2124 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	2125 main_win (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2126 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	2127
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2128 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	2129 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	2130
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2131 mru_menu_update ();
23150 d133d90b495a connect execute command signal in editor constructor (bug #50171) Torsten <mttl@mailbox.org> parents: 23146 diff changeset	2132
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2133 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	2134 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	2135
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2136 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	2137 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	2138
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2139 resize (500, 400);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2140 setWindowIcon (QIcon (":/actions/icons/logo.png"));
25508 3edae6ba1fcd use a custom title bar widget for the main dock widgets Torsten <mttl@mailbox.org> parents: 25357 diff changeset	2141 set_title (tr ("Editor"));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2142
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2143 check_actions ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2144 }
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2145
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2146 void file_editor::add_file_editor_tab (file_editor_tab *f, const QString& fn,
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2147 int index)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2148 {
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2149 if (index == -1)
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2150 m_tab_widget->addTab (f, fn);
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2151 else
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2152 m_tab_widget->insertTab (index, f, fn);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	2153
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2154 // 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	2155 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	2156 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	2157
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2158 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	2159 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	2160
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2161 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	2162 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	2163
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2164 connect (f->qsci_edit_area (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2165 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	2166 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	2167
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2168 // Signals from the file editor_tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2169 connect (f, SIGNAL (file_name_changed (const QString&, const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2170 this, SLOT (handle_file_name_changed (const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2171 const QString&)));
19606 3156773fcc80 open a doc page from editor directly without command window Torsten <ttl@justmail.de> parents: 19605 diff changeset	2172
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2173 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	2174 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	2175
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2176 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	2177 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	2178
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2179 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	2180 const QString&, QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2181 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	2182 const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2183 QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2184
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2185 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	2186 this, SLOT (check_conflict_save (const QString&, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2187
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2188 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	2189 this, SLOT (handle_mru_add_file (const QString&, const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2190
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2191 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	2192 main_win (), SLOT (run_file_in_terminal (const QFileInfo&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2193
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2194 connect (f, SIGNAL (request_open_file (const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2195 this, SLOT (request_open_file (const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2196
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2197 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	2198 const QString&, int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2199 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	2200 const QString&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2201 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	2202
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2203 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	2204 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	2205
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2206 // Signals from the file_editor non-trivial operations
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2207 connect (this, SIGNAL (fetab_settings_changed (const QSettings *)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2208 f, SLOT (notice_settings (const QSettings *)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2209
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2210 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	2211 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	2212
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2213 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	2214 f, SLOT (file_name_query (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2215
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2216 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	2217 bool)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2218 f, SLOT (save_file (const QWidget*, const QString&, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2219
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2220 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	2221 f, SLOT (check_modified_file (void)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2222
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2223 connect (f, 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	2224 main_win (), SLOT (execute_command_in_terminal (const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 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 file_editor trivial operations
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2227 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	2228 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	2229
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2230 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	2231 f, SLOT (set_current_directory (const QString&)));
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 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 (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	2234 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	2235 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	2236 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	2237 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	2238 f, SLOT (zoom_normal (const QWidget*)));
19803 415864f5b85f communicating actual working directory to the editor (#44298) Torsten <ttl@justmail.de> parents: 19739 diff changeset	2239
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2240 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	2241 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	2242
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2243 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	2244 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	2245
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2246 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	2247 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	2248
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2249 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	2250 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	2251
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2252 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	2253 f, SLOT (print_file (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 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 (this, SIGNAL (fetab_run_file (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2256 f, SLOT (run_file (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2257
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2258 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	2259 f, SLOT (context_run (const 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 (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	2262 f, SLOT (toggle_bookmark (const QWidget*)));
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 (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	2265 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	2266
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2267 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	2268 f, SLOT (previous_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2269
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2270 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	2271 f, SLOT (remove_bookmark (const QWidget*)));
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 (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	2274 f, SLOT (toggle_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2275
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2276 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	2277 f, SLOT (next_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 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 (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	2280 f, SLOT (previous_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2281
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2282 connect (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	2283 f, SLOT (remove_all_breakpoints (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2284
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2285 connect (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	2286 unsigned int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2287 f, SLOT (scintilla_command (const QWidget *, unsigned int)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 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_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	2290 f, SLOT (comment_selected_text (const QWidget*, bool)));
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_uncomment_selected_text (const QWidget*)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2293 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	2294
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2295 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	2296 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	2297
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2298 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	2299 f, SLOT (unindent_selected_text (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2300
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2301 connect (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	2302 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	2303
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2304 connect (this,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2305 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	2306 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	2307
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2308 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	2309 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	2310
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2311 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	2312 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	2313
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2314 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	2315 f, SLOT (find_previous (const QWidget*)));
22169 b3ced5e3cebb Enable shortcuts for find next / find previous Lachlan Andrew <lachlanbis@gmail.com> parents: 22022 diff changeset	2316
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2317 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	2318 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	2319
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2320 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	2321 f, SLOT (move_match_brace (const QWidget*, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2322
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2323 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	2324 f, SLOT (show_auto_completion (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2325
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2326 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	2327 f, SLOT (set_focus (const QWidget*)));
19629 8ef79bc61d8a add actions for moving/selecting to matching brace Torsten <ttl@justmail.de> parents: 19608 diff changeset	2328
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2329 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	2330 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	2331
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2332 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	2333 f, SLOT (delete_debugger_pointer (const QWidget*, int)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2334
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2335 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	2336 int, const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2337 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	2338 const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2339
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2340 m_tab_widget->setCurrentWidget (f);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2341
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2342 check_actions ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2343 }
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	2344
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2345 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	2346 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2347 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	2348
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2349 // 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	2350 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	2351 {
25062 32a7222d637a [mq]: tr Rik <rik@octave.org> parents: 25054 diff changeset	2352 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	2353 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	2354 m_mru_file_actions[i]->setText (text);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2355
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2356 QStringList action_data;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2357 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	2358 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	2359
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2360 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	2361 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2362
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2363 // hide unused mru-menu entries
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2364 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	2365 m_mru_file_actions[j]->setVisible (false);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2366
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2367 // 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	2368 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	2369 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2370 m_mru_files.removeLast ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2371 m_mru_files_encodings.removeLast ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2372 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2373
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2374 // save actual mru-list in settings
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2375 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2376
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2377 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	2378 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	2379 settings->sync ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2380 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2381
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2382 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	2383 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2384 // Check if the user wants to use a custom file editor.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2385 QSettings *settings = resource_manager::get_settings ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2386
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2387 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	2388 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2389 // 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	2390 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	2391
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2392 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	2393 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	2394 QString ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2395
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2396 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2397 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2398
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2399 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2400 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2401
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2402 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	2403 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2404 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2405 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	2406 settings->setValue (preference,! old);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2407 notice_settings (settings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2408 }
19945 f7a805f02723 link undo in main window to editor if the latter has focus (bug #44402) Torsten <ttl@justmail.de> parents: 19930 diff changeset	2409
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2410 // 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	2411 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	2412 const QString& new_name)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2413 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2414 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	2415 session_data f_data;
20693 7751bd56d0be added actions and shortcuts for switching editor tabs Torsten <ttl@justmail.de> parents: 20630 diff changeset	2416
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2417 // 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	2418 m_editor_tab_map.clear ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2419 emit fetab_file_name_query (nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2420
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2421 // 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	2422 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	2423 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	2424 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2425 QString rel_path_to_file = old_dir.relativeFilePath (p->first);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2426 if (rel_path_to_file.left (3) != QString ("../"))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2427 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2428 // We directly go down from old_dir to reach our file: Our
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2429 // file is included in the removed/renamed diectory.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2430 // Thus delete it.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2431 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	2432 file_editor_tab *editor_tab
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2433 = 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	2434 if (editor_tab)
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2435 {
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2436 // 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	2437 int l, c;
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2438 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	2439 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	2440 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	2441 // Close
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2442 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	2443 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2444 m_no_focus = false; // Back to normal
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2445
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2446 // 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	2447 f_data.file_name = p->first;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2448
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2449 // 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	2450 // if new_name is given
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2451 if (! new_name.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2452 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2453 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	2454 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	2455 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	2456 {
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2457 // 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	2458 // 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	2459 // 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	2460 // to new dir.
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2461 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	2462 "/" + 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	2463 }
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2464 else
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2465 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	2466
872111558bc0 reload editor files when their path changes by using movefile (bug #43922) Torsten <mttl@mailbox.org> parents: 25748 diff changeset	2467 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	2468 = 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	2469 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2470 else
25743 c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2471 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	2472
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2473 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	2474
c2a703df0215 preserve tab position and line when reloading renamed editor file (bug #49322) Torsten <mttl@mailbox.org> parents: 25742 diff changeset	2475 // 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	2476 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	2477 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2478 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2479 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2480
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2481 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	2482 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2483 QWidget *foc_w = focusWidget ();
24730 05c9f42512cb * file-editor.cc: fix broken copy/cut/past/undo actions Torsten <mttl@mailbox.org> parents: 24717 diff changeset	2484 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	2485 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2486 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2487 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2488
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2489 // 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	2490 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	2491 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2492 // 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	2493 m_editor_tab_map.clear ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2494 emit fetab_file_name_query (nullptr);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2495
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2496 // 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	2497 QWidget *retval = nullptr;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2498
25343 4d7790d9793f use cbegin, crbegin, cend, and crend and auto decls where possible John W. Eaton <jwe@octave.org> parents: 25342 diff changeset	2499 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	2500 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	2501 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2502 QString tab_file = p->first;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2503 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	2504 \|\| 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	2505 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2506 retval = p->second.fet_ID;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2507 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2508 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2509 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2510
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2511 return retval;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2512 }
23321 ac4d0a72927a provide a context menu for the tab bar of the editor (bug #44605) Torsten <mttl@mailbox.org> parents: 23304 diff changeset	2513
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2514 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	2515 const char *member,
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2516 QWidget *receiver)
24717 63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2517 {
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2518 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	2519 }
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2520
63b5ac6a5ee7 * file-editor.cc: More style fixes. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	2521 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	2522 const QString& text, const char *member,
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2523 QWidget *receiver)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2524 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2525 QAction *a;
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2526 QWidget *r = this;
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2527
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2528 if (receiver != nullptr)
a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2529 r = receiver;
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2530
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2531 if (menu)
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2532 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	2533 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2534 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2535 a = new QAction (this);
24731 a01472d4a170 use tab navigation from tab_bar in file editor Torsten <mttl@mailbox.org> parents: 24730 diff changeset	2536 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	2537 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2538
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2539 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	2540 a->setShortcutContext (Qt::WidgetWithChildrenShortcut);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2541
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2542 return a;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2543 }
23276 ea143f4f76a5 Allow to close an editor tab with the middle mouse button (bug #44605) Torsten <mttl@mailbox.org> parents: 23223 diff changeset	2544
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2545 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	2546 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2547 QMenu *menu = p->addMenu (name);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2548
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2549 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	2550 // 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	2551 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	2552 // remove single '&' (shortcut)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2553 base_name.remove ("&");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2554 // restore intended '&'
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2555 base_name.replace ("___octave_amp_replacement___", "&&");
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23920 diff changeset	2556
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2557 // 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	2558 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	2559
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2560 return menu;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24715 diff changeset	2561 }
23304 fb495c47e82d allow double left click for closing tabs in the file editor (bug #44605) Torsten <mttl@mailbox.org> parents: 23300 diff changeset	2562 }
fb495c47e82d allow double left click for closing tabs in the file editor (bug #44605) Torsten <mttl@mailbox.org> parents: 23300 diff changeset	2563
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	2564 #endif

Mercurial > octave

annotate libgui/src/m-editor/file-editor.cc @ 25790:872111558bc0