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

annotate libgui/src/m-editor/file-editor-tab.cc @ 27398:db22b63b9c59

attempt to fix threading issues when setting conditional breakpoints in GUI * file-editor-tab.h, file-editor-tab.cc (file_editor_tab::dbstop_if, file_editor_tab::request_add_breakpoint): New signals. (file_editor_tab::handle_dbstop_if): New slot. (file_editor_tab::file_editor_tab): Connect dbstop_if signal to handle_dbstop_if slot. Connect request_add_breakpoint to handle_request_add_breakpoint. (file_editor_tab::handle_context_menu_break_condition): Don't attempt to process everything in the GUI thread. Instead, emit dbstop_if signal to get condition and set breakpoint.

author	John W. Eaton <jwe@octave.org>
date	Thu, 12 Sep 2019 13:28:12 -0400
parents	8132797b4a6a
children	fe6a64dc8605

rev	line source
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	1 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26361 diff changeset	3 Copyright (C) 2011-2019 Jacob Dawid
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	4
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24495 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: 22743 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: 24495 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: 22743 diff changeset	10 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22743 diff changeset	11
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22743 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: 22743 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22743 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22743 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: 24495 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 */
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	22
24164 44f0ad0e3af5 doc: libgui/src/m-editor/file-editor-tab.cc: fix Doxygen comment. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24123 diff changeset	23 //! @file file-editor-tab.cc A single GUI file tab.
24109 1d6c940a1b37 doc: Improve Doxygen documentation for some files in libgui. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23996 diff changeset	24 //!
1d6c940a1b37 doc: Improve Doxygen documentation for some files in libgui. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23996 diff changeset	25 //! This interfaces QsciScintilla with the rest of Octave.
21058 759fcdf3666d Test GUI marker flags correctly, and omit unnecessary test finding next marker Lachlan Andrew <lachlanbis@gmail.com> parents: 21054 diff changeset	26
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21651 diff changeset	27 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21213 diff changeset	28 # include "config.h"
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15257 diff changeset	29 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15257 diff changeset	30
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21651 diff changeset	31 #if defined (HAVE_QSCINTILLA)
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15860 diff changeset	32
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	33 #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
21213 f7d1050b9b53 maint: Clean up various usages of #ifdef. Rik <rik@octave.org> parents: 21203 diff changeset	34 # define HAVE_LEXER_OCTAVE 1
21203 710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21158 diff changeset	35 # include <Qsci/qscilexeroctave.h>
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	36 #elif defined (HAVE_QSCI_QSCILEXERMATLAB_H)
21213 f7d1050b9b53 maint: Clean up various usages of #ifdef. Rik <rik@octave.org> parents: 21203 diff changeset	37 # define HAVE_LEXER_MATLAB 1
21203 710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21158 diff changeset	38 # include <Qsci/qscilexermatlab.h>
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	39 #endif
14873 355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	40 #include <Qsci/qscilexercpp.h>
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	41 #include <Qsci/qscilexerbash.h>
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	42 #include <Qsci/qscilexerperl.h>
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	43 #include <Qsci/qscilexerbatch.h>
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	44 #include <Qsci/qscilexerdiff.h>
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	45 #include <Qsci/qsciprinter.h>
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	46 #include <QApplication>
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	47 #include <QFileDialog>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	48 #include <QMessageBox>
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	49 #include <QTextStream>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	50 #include <QVBoxLayout>
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	51 #include <QInputDialog>
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	52 #include <QPrintDialog>
18833 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18767 diff changeset	53 #include <QDateTime>
22250 2fd4f1a3f4a8 allow building with Qt5 (bug #40252) John W. Eaton <jwe@octave.org> parents: 22181 diff changeset	54 #include <QDesktopServices>
20731 83611b387bc5 provide a user preference for the encoding used by the editor (bug #45597) Torsten <ttl@justmail.de> parents: 20713 diff changeset	55 #include <QTextCodec>
21007 0a09c3cae800 New marker class for modified file breakpoint and position maintenance. Daniel J Sebald <daniel.sebald@ieee.org> parents: 20995 diff changeset	56 #include <QStyle>
0a09c3cae800 New marker class for modified file breakpoint and position maintenance. Daniel J Sebald <daniel.sebald@ieee.org> parents: 20995 diff changeset	57 #include <QTextBlock>
0a09c3cae800 New marker class for modified file breakpoint and position maintenance. Daniel J Sebald <daniel.sebald@ieee.org> parents: 20995 diff changeset	58 #include <QLabel>
0a09c3cae800 New marker class for modified file breakpoint and position maintenance. Daniel J Sebald <daniel.sebald@ieee.org> parents: 20995 diff changeset	59 #include <QCheckBox>
0a09c3cae800 New marker class for modified file breakpoint and position maintenance. Daniel J Sebald <daniel.sebald@ieee.org> parents: 20995 diff changeset	60 #include <QDialogButtonBox>
0a09c3cae800 New marker class for modified file breakpoint and position maintenance. Daniel J Sebald <daniel.sebald@ieee.org> parents: 20995 diff changeset	61 #include <QPushButton>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	62
25617 44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25566 diff changeset	63 #include "gui-preferences.h"
21007 0a09c3cae800 New marker class for modified file breakpoint and position maintenance. Daniel J Sebald <daniel.sebald@ieee.org> parents: 20995 diff changeset	64 #include "resource-manager.h"
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	65
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	66 #include "file-editor-tab.h"
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	67 #include "file-editor.h"
19348 c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19328 diff changeset	68 #include "octave-txt-lexer.h"
21007 0a09c3cae800 New marker class for modified file breakpoint and position maintenance. Daniel J Sebald <daniel.sebald@ieee.org> parents: 20995 diff changeset	69 #include "marker.h"
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	70
21310 fc6a9bd59094 backout changeset e8c3590da9ff Lachlan Andrew <lachlanbis@gmail.com> parents: 21301 diff changeset	71 #include "file-ops.h"
26331 5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	72 #include "uniconv-wrappers.h"
21310 fc6a9bd59094 backout changeset e8c3590da9ff Lachlan Andrew <lachlanbis@gmail.com> parents: 21301 diff changeset	73
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	74 #include "bp-table.h"
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23490 diff changeset	75 #include "interpreter-private.h"
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23490 diff changeset	76 #include "interpreter.h"
27396 930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	77 #include "load-path.h"
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23490 diff changeset	78 #include "oct-map.h"
27396 930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	79 #include "ov-usr-fcn.h"
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	80 #include "qt-interpreter-events.h"
22181 acdd8983d308 Force reload of a function after it is saved in the editor (bug #46632) Lachlan Andrew <lachlanbis@gmail.com> parents: 22180 diff changeset	81 #include "symtab.h"
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	82 #include "unwind-prot.h"
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23490 diff changeset	83 #include "utils.h"
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23490 diff changeset	84 #include "version.h"
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	85
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	86 namespace octave
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	87 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	88 bool file_editor_tab::m_cancelled = false;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	89
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	90 //! A file_editor_tab object consists of a text area and three left margins.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	91 //! The first holds breakpoints, bookmarks, and the debug program counter.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	92 //! The second holds line numbers. The third holds "fold" marks, to hide
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	93 //! sections of text.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	94
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	95 // Make parent null for the file editor tab so that warning WindowModal
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	96 // messages don't affect grandparents.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	97 file_editor_tab::file_editor_tab (const QString& directory_arg)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	98 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	99 m_lexer_apis = nullptr;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	100 m_is_octave_file = true;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	101 m_lines_changed = false;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	102
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	103 m_ced = directory_arg;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	104
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	105 m_file_name = "";
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	106 m_file_system_watcher.setObjectName ("_qt_autotest_force_engine_poller");
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	107
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	108 m_edit_area = new octave_qscintilla (this);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	109 m_line = 0;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	110 m_col = 0;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	111
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	112 m_bp_lines.clear (); // start with empty lists of breakpoints
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	113 m_bp_conditions.clear ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	114 m_bp_restore_count = 0;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	115
27008 e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	116 m_breakpoint_info.remove_next = false;
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	117 m_breakpoint_info.remove_line = -1;
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	118
25369 c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	119 // Initialize last modification date to now
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	120 m_last_modified = QDateTime::currentDateTimeUtc();
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	121
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	122 connect (m_edit_area, SIGNAL (cursorPositionChanged (int, int)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	123 this, SLOT (handle_cursor_moved (int,int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	124
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	125 connect (m_edit_area, SIGNAL (SCN_CHARADDED (int)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	126 this, SLOT (handle_char_added (int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	127
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	128 connect (m_edit_area, SIGNAL (SCN_DOUBLECLICK (int, int, int)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	129 this, SLOT (handle_double_click (int, int, int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	130
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	131 connect (m_edit_area, SIGNAL (linesChanged ()),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	132 this, SLOT (handle_lines_changed ()));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	133
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	134 connect (m_edit_area, SIGNAL (context_menu_edit_signal (const QString&)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	135 this, SLOT (handle_context_menu_edit (const QString&)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	136
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	137 // create statusbar for row/col indicator and eol mode
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	138 m_status_bar = new QStatusBar (this);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	139
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	140 // row- and col-indicator
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	141 m_row_indicator = new QLabel ("", this);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	142 QFontMetrics fm = m_row_indicator->fontMetrics ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	143 m_row_indicator->setMinimumSize (4.5*fm.averageCharWidth (),0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	144 QLabel *row_label = new QLabel (tr ("line:"), this);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	145 m_col_indicator = new QLabel ("", this);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	146 m_col_indicator->setMinimumSize (4*fm.averageCharWidth (),0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	147 QLabel *col_label = new QLabel (tr ("col:"), this);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	148 m_status_bar->addWidget (row_label, 0);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	149 m_status_bar->addWidget (m_row_indicator, 0);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	150 m_status_bar->addWidget (col_label, 0);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	151 m_status_bar->addWidget (m_col_indicator, 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	152
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	153 // status bar: encoding
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	154 QLabel *enc_label = new QLabel (tr ("encoding:"), this);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	155 m_enc_indicator = new QLabel ("",this);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	156 m_status_bar->addWidget (enc_label, 0);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	157 m_status_bar->addWidget (m_enc_indicator, 0);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	158 m_status_bar->addWidget (new QLabel (" ", this), 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	159
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	160 // status bar: eol mode
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	161 QLabel *eol_label = new QLabel (tr ("eol:"), this);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	162 m_eol_indicator = new QLabel ("",this);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	163 m_status_bar->addWidget (eol_label, 0);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	164 m_status_bar->addWidget (m_eol_indicator, 0);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	165 m_status_bar->addWidget (new QLabel (" ", this), 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	166
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	167 // Leave the find dialog box out of memory until requested.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	168 m_find_dialog = nullptr;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	169
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	170 // symbols
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	171 m_edit_area->setMarginType (1, QsciScintilla::SymbolMargin);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	172 m_edit_area->setMarginSensitivity (1, true);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	173 m_edit_area->markerDefine (QsciScintilla::RightTriangle, marker::bookmark);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	174 m_edit_area->setMarkerBackgroundColor (QColor (0,0,232), marker::bookmark);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	175 m_edit_area->markerDefine (QsciScintilla::Circle, marker::breakpoint);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	176 m_edit_area->setMarkerBackgroundColor (QColor (192,0,0), marker::breakpoint);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	177 m_edit_area->markerDefine (QsciScintilla::Circle, marker::cond_break);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	178 m_edit_area->setMarkerBackgroundColor (QColor (255,127,0), marker::cond_break);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	179 m_edit_area->markerDefine (QsciScintilla::RightArrow, marker::debugger_position);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	180 m_edit_area->setMarkerBackgroundColor (QColor (255,255,0),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	181 marker::debugger_position);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	182 m_edit_area->markerDefine (QsciScintilla::RightArrow,
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	183 marker::unsure_debugger_position);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	184 m_edit_area->setMarkerBackgroundColor (QColor (192,192,192),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	185 marker::unsure_debugger_position);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	186
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	187 connect (m_edit_area, SIGNAL (marginClicked (int, int,
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	188 Qt::KeyboardModifiers)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	189 this, SLOT (handle_margin_clicked (int, int,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	190 Qt::KeyboardModifiers)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	191
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	192 connect (m_edit_area, SIGNAL (context_menu_break_condition_signal (int)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	193 this, SLOT (handle_context_menu_break_condition (int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	194
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	195 // line numbers
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	196 m_edit_area->setMarginsForegroundColor (QColor (96, 96, 96));
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	197 m_edit_area->setMarginsBackgroundColor (QColor (232, 232, 220));
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	198 m_edit_area->setMarginType (2, QsciScintilla::TextMargin);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	199
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	200 // other features
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	201 m_edit_area->setBraceMatching (QsciScintilla::StrictBraceMatch);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	202 m_edit_area->setAutoIndent (true);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	203 m_edit_area->setIndentationWidth (2);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	204 m_edit_area->setIndentationsUseTabs (false);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	205
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	206 m_edit_area->setUtf8 (true);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	207
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	208 // auto completion
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	209 m_edit_area->SendScintilla (QsciScintillaBase::SCI_AUTOCSETCANCELATSTART, false);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	210
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	211 QVBoxLayout *edit_area_layout = new QVBoxLayout ();
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	212 edit_area_layout->addWidget (m_edit_area);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	213 edit_area_layout->addWidget (m_status_bar);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	214 edit_area_layout->setMargin (0);
27090 e83d3161b256 make editor toolbar, tabs and statusbar more comapct (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27089 diff changeset	215 edit_area_layout->setSpacing (0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	216 setLayout (edit_area_layout);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	217
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	218 // connect modified signal
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	219 connect (m_edit_area, SIGNAL (modificationChanged (bool)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	220 this, SLOT (update_window_title (bool)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	221
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	222 connect (m_edit_area, SIGNAL (copyAvailable (bool)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	223 this, SLOT (handle_copy_available (bool)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	224
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	225 connect (&m_file_system_watcher, SIGNAL (fileChanged (const QString&)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	226 this, SLOT (file_has_changed (const QString&)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	227
27397 8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	228 connect (this, SIGNAL (maybe_remove_next (int)),
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	229 this, SLOT (handle_remove_next (int)));
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	230
27398 db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	231 connect (this, SIGNAL (dbstop_if (const QString&, int, const QString&)),
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	232 this,
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	233 SLOT (handle_dbstop_if (const QString&, int, const QString&)));
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	234
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	235 connect (this, SIGNAL (request_add_breakpoint (int, const QString&)),
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	236 this, SLOT (handle_request_add_breakpoint (int, const QString&)));
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	237
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	238 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	239 if (settings)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	240 notice_settings (settings, true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	241
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	242 setFocusProxy (m_edit_area);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	243
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	244 // encoding, not updated with the settings
27271 a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27263 diff changeset	245 QString locale_enc_name =
a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27263 diff changeset	246 QTextCodec::codecForLocale ()->name ().toUpper ().prepend ("SYSTEM (").append (")");
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	247 m_encoding = settings->value ("editor/default_encoding", locale_enc_name)
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	248 .toString ();
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	249 m_enc_indicator->setText (m_encoding);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	250 // no changes in encoding yet
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	251 m_new_encoding = m_encoding;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	252 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	253
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	254 file_editor_tab::~file_editor_tab (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	255 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	256 // Tell all connected markers to self-destruct.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	257 emit remove_all_breakpoints ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	258 emit remove_all_positions ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	259
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	260 // Destroy items attached to m_edit_area.
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	261 QsciLexer *lexer = m_edit_area->lexer ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	262 if (lexer)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	263 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	264 delete lexer;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	265 m_edit_area->setLexer (nullptr);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	266 }
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	267 if (m_find_dialog)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	268 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	269 delete m_find_dialog;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	270 m_find_dialog = nullptr;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	271 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	272
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	273 // Destroy m_edit_area.
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	274 delete m_edit_area;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	275 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	276
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	277 void file_editor_tab::set_encoding (const QString& new_encoding)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	278 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	279 if (new_encoding.isEmpty ())
19004 e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18946 diff changeset	280 return;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	281
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	282 m_encoding = new_encoding;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	283 m_enc_indicator->setText (m_encoding);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	284 if (! m_edit_area->text ().isEmpty ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	285 set_modified (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	286 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	287
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	288 void file_editor_tab::closeEvent (QCloseEvent *e)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	289 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	290 m_cancelled = false; // prevent unwanted interaction of previous
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	291 // exits of octave which were canceled by the user
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	292
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	293 if (check_file_modified () == QMessageBox::Cancel)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	294 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	295 // ignore close event if file is not saved and user cancels
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	296 // closing this window
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	297 e->ignore ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	298 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	299 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	300 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	301 e->accept ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	302 emit tab_remove_request ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	303 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	304 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	305
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	306 void file_editor_tab::set_current_directory (const QString& dir)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	307 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	308 m_ced = dir;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	309 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	310
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	311 void file_editor_tab::handle_context_menu_edit (const QString& word_at_cursor)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	312 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	313 // search for a subfunction in actual file (this is done at first because
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	314 // octave finds this function before other with same name in the search path
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	315 QRegExp rxfun1 ("^[\t ]function[^=]+=[\t ]"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	316 + word_at_cursor + "[\t ]\$[^\$]\\)[\t ]*$");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	317 QRegExp rxfun2 ("^[\t ]*function[\t ]+"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	318 + word_at_cursor + "[\t ]\$[^\$]\\)[\t ]*$");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	319 QRegExp rxfun3 ("^[\t ]*function[\t ]+"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	320 + word_at_cursor + "[\t ]*$");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	321 QRegExp rxfun4 ("^[\t ]function[^=]+=[\t ]"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	322 + word_at_cursor + "[\t ]*$");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	323
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	324 int pos_fct = -1;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	325 QStringList lines = m_edit_area->text ().split ("\n");
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	326
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	327 int line;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	328 for (line = 0; line < lines.count (); line++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	329 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	330 if ((pos_fct = rxfun1.indexIn (lines.at (line))) != -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	331 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	332 if ((pos_fct = rxfun2.indexIn (lines.at (line))) != -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	333 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	334 if ((pos_fct = rxfun3.indexIn (lines.at (line))) != -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	335 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	336 if ((pos_fct = rxfun4.indexIn (lines.at (line))) != -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	337 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	338 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	339
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	340 if (pos_fct > -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	341 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	342 // reg expr. found: it is an internal function
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	343 m_edit_area->setCursorPosition (line, pos_fct);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	344 m_edit_area->SendScintilla (2232, line); // SCI_ENSUREVISIBLE
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	345 // SCI_VISIBLEFROMDOCLINE
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	346 int vis_line = m_edit_area->SendScintilla (2220, line);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	347 m_edit_area->SendScintilla (2613, vis_line); // SCI_SETFIRSTVISIBLELINE
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	348 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	349 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	350
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	351 emit edit_mfile_request (word_at_cursor, m_file_name, m_ced, -1);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	352 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	353
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	354 // If "dbstop if ..." selected from context menu, create a conditional
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	355 // breakpoint. The default condition is (a) the existing condition if there
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	356 // is already a breakpoint (b) any selected text, or (c) empty
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	357 void file_editor_tab::handle_context_menu_break_condition (int linenr)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	358 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	359 // Ensure editor line numbers match Octave core's line numbers.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	360 // Give users the option to save modifications if necessary.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	361 if (! unchanged_or_saved ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	362 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	363
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	364 QString cond;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	365
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	366 // Search for previous condition. FIXME: is there a more direct way?
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	367 if (m_edit_area->markersAtLine (linenr) & (1 << marker::cond_break))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	368 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	369 emit report_marker_linenr (m_bp_lines, m_bp_conditions);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	370 for (int i = 0; i < m_bp_lines.length (); i++)
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	371 if (m_bp_lines.value (i) == linenr)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	372 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	373 cond = m_bp_conditions.value (i);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	374 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	375 }
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	376 m_bp_lines.clear ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	377 m_bp_conditions.clear ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	378 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	379
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	380 // If text selected by the mouse, default to that instead
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	381 // If both present, use the OR of them, to avoid accidental overwriting
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	382 // FIXME: If both are present, show old condition unselected and
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	383 // the selection (in edit area) selected (in the dialog).
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	384 if (m_edit_area->hasSelectedText ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	385 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	386 if (cond == "")
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	387 cond = m_edit_area->selectedText ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	388 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	389 cond = '(' + cond + ") \|\| (" + m_edit_area->selectedText () + ')';
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	390 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	391
27398 db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	392 emit dbstop_if ("dbstop if", linenr+1, cond);
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	393 }
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	394
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	395 // Display dialog in GUI thread to get condtition, then emit
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	396 // interpreter_event signal to check it in the interpreter thread.
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	397 // If the dialog returns a valid condition, then either emit a signal
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	398 // to add the breakpoint in the editor tab or a signal to display a
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	399 // new dialog.
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	400
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	401 void file_editor_tab::handle_dbstop_if (const QString& prompt, int line,
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	402 const QString& cond)
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	403 {
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	404 bool ok;
27398 db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	405 QString new_cond
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	406 = QInputDialog::getText (this, tr ("Breakpoint condition"),
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	407 prompt, QLineEdit::Normal, cond, &ok);
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	408
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	409 // If cancel, don't change breakpoint condition.
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	410
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	411 if (ok && ! new_cond.isEmpty ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	412 {
27398 db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	413 emit interpreter_event
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	414 ([this, line, new_cond] (interpreter& interp)
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	415 {
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	416 // INTERPRETER THREAD
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	417
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	418 bool eval_error = false;
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	419
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	420 error_system& es = interp.get_error_system ();
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	421
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	422 try
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	423 {
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	424 // Suppress error messages on the console.
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	425 unwind_protect frame;
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	426
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	427 int bem = es.buffer_error_messages ();
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	428 frame.add_method (es, &error_system::set_buffer_error_messages, bem);
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	429
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	430 es.buffer_error_messages (bem + 1);
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	431
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	432 tree_evaluator& tw = interp.get_evaluator ();
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	433 bp_table& bptab = tw.get_bp_table ();
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	434
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	435 bptab.condition_valid (new_cond.toStdString ());
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	436
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	437 // The condition seems OK, so set the conditional
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	438 // breakpoint.
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	439
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	440 emit request_add_breakpoint (line, new_cond);
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	441 }
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	442 catch (const index_exception& e) { eval_error = true; }
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	443 catch (const execution_exception& e) { eval_error = true; }
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	444 catch (const interrupt_exception&) { eval_error = true; }
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	445
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	446 if (eval_error)
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	447 {
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	448 // Try again with a prompt that indicates the last
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	449 // attempt was an error.
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	450
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	451 std::string msg = es.last_error_message ();
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	452
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	453 QString new_prompt = (tr ("ERROR: ")
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	454 + QString::fromStdString (msg)
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	455 + "\n\ndbstop if");
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	456
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	457 emit dbstop_if (new_prompt, line, "");
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	458 }
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	459 });
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	460 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	461 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	462
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	463 void file_editor_tab::set_file_name (const QString& fileName)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	464 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	465 // update tracked file if we really have a file on disk
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	466 QStringList trackedFiles = m_file_system_watcher.files ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	467 if (! trackedFiles.isEmpty ())
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	468 m_file_system_watcher.removePath (m_file_name);
25369 c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	469 if (! fileName.isEmpty () && QFile::exists (fileName))
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	470 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	471 m_file_system_watcher.addPath (fileName);
25369 c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	472 m_last_modified = QFileInfo (fileName).lastModified ().toUTC ();
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	473 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	474
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	475 // update lexer and file name variable if file name changes
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	476 if (m_file_name != fileName)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	477 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	478 m_file_name = fileName;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	479 update_lexer ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	480 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	481
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	482 // update the file editor with current editing directory
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	483 emit editor_state_changed (m_copy_available, m_is_octave_file);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	484
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	485 // add the new file to the most-recently-used list
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	486 emit mru_add_file (m_file_name, m_encoding);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	487 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	488
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	489 // valid_file_name (file): checks whether "file" names a file.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	490 // By default, "file" is empty; then m_file_name is checked
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	491 bool file_editor_tab::valid_file_name (const QString& file)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	492 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	493 if (file.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	494 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	495 if (m_file_name.isEmpty ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	496 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	497 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	498 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	499 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	500
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	501 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	502 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	503
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	504 // We cannot create a breakpoint when the file is modified
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	505 // because the line number the editor is providing might
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	506 // not match what Octave core is interpreting in the
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	507 // file on disk. This function gives the user the option
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	508 // to save before creating the breakpoint.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	509 bool file_editor_tab::unchanged_or_saved (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	510 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	511 bool retval = true;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	512 if (m_edit_area->isModified () \|\| ! valid_file_name ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	513 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	514 int ans = QMessageBox::question (nullptr, tr ("Octave Editor"),
25566 eee01a6e197f allow setting a breakpoint in an unnamed editor file (bug #54231) Torsten <mttl@mailbox.org> parents: 25558 diff changeset	515 tr ("Cannot add breakpoint to modified or unnamed file.\n"
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	516 "Save and add breakpoint, or cancel?"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	517 QMessageBox::Save \| QMessageBox::Cancel, QMessageBox::Save);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	518
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	519 if (ans == QMessageBox::Save)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	520 save_file (m_file_name, false);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	521 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	522 retval = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	523 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	524
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	525 return retval;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	526 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	527
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	528 // Toggle a breakpoint at the editor_linenr or, if this was called by
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	529 // a click with CTRL pressed, toggle a bookmark at that point.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	530 void file_editor_tab::handle_margin_clicked (int margin, int editor_linenr,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	531 Qt::KeyboardModifiers state)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	532 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	533 if (margin == 1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	534 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	535 unsigned int markers_mask = m_edit_area->markersAtLine (editor_linenr);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	536
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	537 if (state & Qt::ControlModifier)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	538 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	539 if (markers_mask & (1 << marker::bookmark))
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	540 m_edit_area->markerDelete (editor_linenr, marker::bookmark);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	541 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	542 m_edit_area->markerAdd (editor_linenr, marker::bookmark);
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	543 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	544 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	545 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	546 if (markers_mask & ((1 << marker::breakpoint)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	547 \| (1 << marker::cond_break)))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	548 handle_request_remove_breakpoint (editor_linenr + 1);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	549 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	550 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	551 if (unchanged_or_saved ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	552 handle_request_add_breakpoint (editor_linenr + 1, "");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	553 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	554 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	555 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	556 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	557
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	558
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	559 void file_editor_tab::update_lexer (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	560 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	561 // Create a new lexer
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	562 QsciLexer *lexer = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	563
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	564 m_is_octave_file = false;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	565
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	566 // Find the required lexer from file extensions
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	567 if (m_file_name.endsWith (".m")
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	568 \|\| m_file_name.endsWith ("octaverc"))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	569 {
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	570 #if defined (HAVE_LEXER_OCTAVE)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	571 lexer = new QsciLexerOctave ();
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	572 #elif defined (HAVE_LEXER_MATLAB)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	573 lexer = new QsciLexerMatlab ();
19348 c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19328 diff changeset	574 #else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	575 lexer = new octave_txt_lexer ();
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	576 #endif
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	577 m_is_octave_file = true;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	578 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	579
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	580 if (! lexer)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	581 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	582 if (m_file_name.endsWith (".c")
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	583 \|\| m_file_name.endsWith (".cc")
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	584 \|\| m_file_name.endsWith (".cpp")
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	585 \|\| m_file_name.endsWith (".cxx")
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	586 \|\| m_file_name.endsWith (".c++")
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	587 \|\| m_file_name.endsWith (".h")
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	588 \|\| m_file_name.endsWith (".hh")
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	589 \|\| m_file_name.endsWith (".hpp")
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	590 \|\| m_file_name.endsWith (".h++"))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	591 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	592 lexer = new QsciLexerCPP ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	593 }
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	594 else if (m_file_name.endsWith (".pl"))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	595 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	596 lexer = new QsciLexerPerl ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	597 }
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	598 else if (m_file_name.endsWith (".bat"))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	599 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	600 lexer = new QsciLexerBatch ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	601 }
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	602 else if (m_file_name.endsWith (".diff"))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	603 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	604 lexer = new QsciLexerDiff ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	605 }
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	606 else if (m_file_name.endsWith (".sh"))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	607 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	608 lexer = new QsciLexerBash ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	609 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	610 else if (! valid_file_name ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	611 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	612 // new, no yet named file: let us assume it is octave
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	613 #if defined (HAVE_LEXER_OCTAVE)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	614 lexer = new QsciLexerOctave ();
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	615 m_is_octave_file = true;
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	616 #elif defined (HAVE_LEXER_MATLAB)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	617 lexer = new QsciLexerMatlab ();
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	618 m_is_octave_file = true;
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	619 #else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	620 lexer = new octave_txt_lexer ();
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	621 #endif
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	622 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	623 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	624 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	625 // other or no extension
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	626 lexer = new octave_txt_lexer ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	627 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	628 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	629
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	630 // Get any existing lexer
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	631 QsciLexer *old_lexer = m_edit_area->lexer ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	632
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	633 // If new file, no lexer, or lexer has changed,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	634 // delete old one and set the newly created as current lexer
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	635 if (! old_lexer \|\| ! valid_file_name ()
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	636 \|\| QString(old_lexer->lexer ()) != QString(lexer->lexer ()))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	637 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	638 // Delete and set new lexer
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	639 if (old_lexer)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	640 delete old_lexer;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	641 m_edit_area->setLexer (lexer);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	642
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	643 // build information for auto completion (APIs)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	644 m_lexer_apis = new QsciAPIs (lexer);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	645
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	646 // Get the settings for this new lexer
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	647 update_lexer_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	648 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	649 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	650 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	651 // Otherwise, delete the newly created lexer and
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26346 diff changeset	652 // use the old, existing one.
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 26346 diff changeset	653 delete lexer;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	654 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	655 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	656
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	657
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	658 // Update settings, which are lexer related and have to be updated
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	659 // when a) the lexer changes or b) the settings have changed.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	660 void file_editor_tab::update_lexer_settings (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	661 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	662 QsciLexer *lexer = m_edit_area->lexer ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	663
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	664 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	665
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	666 if (m_lexer_apis)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	667 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	668 m_lexer_apis->cancelPreparation (); // stop preparing if apis exists
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	669
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	670 bool update_apis = false; // flag, whether update of apis files
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	671
26927 df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	672 // Get path to prepared api info (cache). Temporarily set the
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	673 // application name to 'octave' instead of 'GNU Octave' name for
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	674 // not having blanks in the path.
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	675 QString tmp_app_name = QCoreApplication::applicationName ();
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	676 QCoreApplication::setApplicationName ("octave"); // Set new name
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	677
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	678 #if defined (HAVE_QSTANDARDPATHS)
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	679 QString local_data_path
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	680 = QStandardPaths::writableLocation (QStandardPaths::CacheLocation);
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	681 #else
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	682 QString local_data_path
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	683 = QDesktopServices::storageLocation (QDesktopServices::CacheLocation);
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	684 #endif
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	685
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	686 QCoreApplication::setApplicationName ("octave"); // Set temp. name
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	687
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	688 QString prep_apis_path = local_data_path + "/"
26855 156bd21bf6bd editor follows XDG_CONFIG_HOME for autocompletion files (bug ##55822) Torsten <mttl@mailbox.org> parents: 26848 diff changeset	689 + QString (OCTAVE_VERSION) + "/qsci/";
18833 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18767 diff changeset	690
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	691 // get settings which infos are used for octave
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	692 bool octave_builtins
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	693 = settings->value ("editor/codeCompletion_octave_builtins", true).toBool ();
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	694 bool octave_functions
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	695 = settings->value ("editor/codeCompletion_octave_functions", true).toBool ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	696
26927 df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	697 QCoreApplication::setApplicationName (tmp_app_name); // Restore name
df9fe0026f73 use user cache location for keyword lists for auto completion (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26873 diff changeset	698
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	699 if (m_is_octave_file)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	700 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	701 // Keywords and Builtins do not change, these informations can be
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	702 // stored in prepared form in a file. Information on function are
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	703 // changing frequently, then if functions should also be auto-
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	704 // completed, the date of any existing file is checked.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	705
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	706 // Keywords are always used
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	707 m_prep_apis_file = prep_apis_path + lexer->lexer () + "_k";
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	708
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	709 // Buitlins are only used if the user settings say so
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	710 if (octave_builtins)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	711 m_prep_apis_file += 'b';
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	712
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	713 if (octave_functions)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	714 m_prep_apis_file += 'f';
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	715
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	716 m_prep_apis_file += ".pap"; // final name of apis file
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	717
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	718 // check whether the APIs info needs to be prepared and saved
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	719 QFileInfo apis_file = QFileInfo (m_prep_apis_file);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	720 // flag whether apis file needs update
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	721 update_apis = ! apis_file.exists ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	722
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	723 if (octave_functions)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	724 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	725 // Functions may change frequently. Update the apis data
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	726 // if the file is older than a few minutes preventing from
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	727 // re-preparing data when the user opens several files.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	728 QDateTime apis_time = apis_file.lastModified ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	729 if (QDateTime::currentDateTime () > apis_time.addSecs (180))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	730 update_apis = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	731 }
23489 1b017f9ee3f1 more frequent preparation of data for autocompletion Torsten <mttl@mailbox.org> parents: 23457 diff changeset	732
18833 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18767 diff changeset	733 }
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18767 diff changeset	734 else // no octave file, just add extension
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18767 diff changeset	735 {
23489 1b017f9ee3f1 more frequent preparation of data for autocompletion Torsten <mttl@mailbox.org> parents: 23457 diff changeset	736
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	737 m_prep_apis_file = prep_apis_path + lexer->lexer () + ".pap";
23489 1b017f9ee3f1 more frequent preparation of data for autocompletion Torsten <mttl@mailbox.org> parents: 23457 diff changeset	738
18833 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18767 diff changeset	739 }
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18767 diff changeset	740
26841 b6dfe7d192bc fix creating keyword files for editor autocompletion (bug #55835) Torsten <mttl@mailbox.org> parents: 26554 diff changeset	741 // Make sure the apis file is usable, otherwise the gui might crash,
b6dfe7d192bc fix creating keyword files for editor autocompletion (bug #55835) Torsten <mttl@mailbox.org> parents: 26554 diff changeset	742 // e.g., in case of max. number of opened files
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	743 QFile f (m_prep_apis_file);
26841 b6dfe7d192bc fix creating keyword files for editor autocompletion (bug #55835) Torsten <mttl@mailbox.org> parents: 26554 diff changeset	744
b6dfe7d192bc fix creating keyword files for editor autocompletion (bug #55835) Torsten <mttl@mailbox.org> parents: 26554 diff changeset	745 bool apis_usable = f.open (QIODevice::ReadOnly);
b6dfe7d192bc fix creating keyword files for editor autocompletion (bug #55835) Torsten <mttl@mailbox.org> parents: 26554 diff changeset	746 if (! apis_usable)
b6dfe7d192bc fix creating keyword files for editor autocompletion (bug #55835) Torsten <mttl@mailbox.org> parents: 26554 diff changeset	747 {
b6dfe7d192bc fix creating keyword files for editor autocompletion (bug #55835) Torsten <mttl@mailbox.org> parents: 26554 diff changeset	748 QDir ().mkpath (QFileInfo (f).absolutePath ());
b6dfe7d192bc fix creating keyword files for editor autocompletion (bug #55835) Torsten <mttl@mailbox.org> parents: 26554 diff changeset	749 apis_usable = f.open (QIODevice::WriteOnly);
b6dfe7d192bc fix creating keyword files for editor autocompletion (bug #55835) Torsten <mttl@mailbox.org> parents: 26554 diff changeset	750 }
26522 d6a4237a26b4 fix crash of gui when too many files are opened (bug #49736) Torsten <mttl@mailbox.org> parents: 26518 diff changeset	751 if (apis_usable)
d6a4237a26b4 fix crash of gui when too many files are opened (bug #49736) Torsten <mttl@mailbox.org> parents: 26518 diff changeset	752 f.close ();
d6a4237a26b4 fix crash of gui when too many files are opened (bug #49736) Torsten <mttl@mailbox.org> parents: 26518 diff changeset	753
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	754 if (apis_usable
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	755 && (update_apis \|\| ! m_lexer_apis->loadPrepared (m_prep_apis_file)))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	756 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	757 // either we have decided to update the apis file or
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	758 // no prepared info was loaded, prepare and save if possible
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	759
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	760 // create raw apis info
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	761 QString keyword;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	762 QStringList keyword_list;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	763 int i,j;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	764
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	765 if (m_is_octave_file)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	766 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	767 // octave: get keywords from internal informations depending on
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	768 // user preferences
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	769
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	770 // keywords are always used
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	771 add_octave_apis (Fiskeyword ()); // add new entries
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	772
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	773 interpreter& interp
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	774 = __get_interpreter__ ("file_editor_tab::update_lexer_settings");
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	775
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	776 if (octave_builtins)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	777 add_octave_apis (F__builtins__ (interp)); // add new entries
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	778
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	779 if (octave_functions)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	780 add_octave_apis (F__list_functions__ (interp)); // add new entries
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	781
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	782 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	783 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	784 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	785
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	786 m_prep_apis_file = prep_apis_path + lexer->lexer () + ".pap";
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	787
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	788 for (i=1; i<=3; i++) // test the first 5 keyword sets
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	789 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	790 keyword = QString (lexer->keywords (i)); // get list
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	791 keyword_list = keyword.split (QRegExp (R"(\s+)")); // split
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	792 for (j = 0; j < keyword_list.size (); j++) // add to API
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	793 m_lexer_apis->add (keyword_list.at (j));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	794 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	795 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	796
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	797 // disconnect slot for saving prepared info if already connected
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	798 disconnect (m_lexer_apis, SIGNAL (apiPreparationFinished ()), nullptr, nullptr);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	799 // check whether path for prepared info exists or can be created
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	800 if (QDir ("/").mkpath (prep_apis_path))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	801 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	802 // path exists, apis info can be saved there
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	803 connect (m_lexer_apis, SIGNAL (apiPreparationFinished ()),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	804 this, SLOT (save_apis_info ()));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	805 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	806
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	807 m_lexer_apis->prepare (); // prepare apis info
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	808
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	809 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	810 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	811
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	812 lexer->readSettings (*settings);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	813
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	814 m_edit_area->setCaretForegroundColor (lexer->color (0));
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	815 m_edit_area->setIndentationGuidesForegroundColor (lexer->color (0));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	816
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	817 // set some colors depending on selected background color of the lexer
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	818 QColor bg = lexer->paper (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	819 QColor fg = lexer->color (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	820
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	821 int bh, bs, bv, fh, fs, fv, h, s, v;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	822 bg.getHsv (&bh,&bs,&bv);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	823 fg.getHsv (&fh,&fs,&fv);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	824
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	825 // margin colors
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	826 h = bh;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	827 s = bs/2;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	828 v = bv + (fv - bv)/5;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	829
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	830 bg.setHsv (h,s,v);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	831 m_edit_area->setEdgeColor (bg);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	832
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	833 v = bv + (fv - bv)/8;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	834 bg.setHsv (h,s,v);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	835 v = bv + (fv - bv)/4;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	836 fg.setHsv (h,s,v);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	837
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	838 m_edit_area->setMarkerForegroundColor (lexer->color (0));
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	839 m_edit_area->setMarginsForegroundColor (lexer->color (0));
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	840 m_edit_area->setMarginsBackgroundColor (bg);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	841 m_edit_area->setFoldMarginColors (bg,fg);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	842
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	843 // color indicator for highlighting all occurrences:
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	844 // applications highlight color with more transparency
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	845 QColor hg = QApplication::palette ().color (QPalette::Highlight);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	846 m_edit_area->set_selection_marker_color (hg);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	847
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	848 // fix line number width with respect to the font size of the lexer and
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	849 // set the line numbers font depending on the lexers font
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	850 if (settings->value ("editor/showLineNumbers", true).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	851 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	852 // Line numbers width
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	853 auto_margin_width ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	854
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	855 // Line numbers font
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	856 QFont line_numbers_font = lexer->defaultFont ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	857 int font_size = line_numbers_font.pointSize ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	858 font_size = font_size
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	859 + settings->value ("editor/line_numbers_size", 0).toInt ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	860 if (font_size < 4)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	861 font_size = 4;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	862 line_numbers_font.setPointSize (font_size);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	863
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	864 m_edit_area->setMarginsFont (line_numbers_font);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	865 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	866 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	867 m_edit_area->setMarginWidth (2,0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	868 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	869
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	870
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	871 // function for adding entries to the octave lexer's APIs
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	872 void file_editor_tab::add_octave_apis (octave_value_list key_ovl)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	873 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	874 octave_value keys = key_ovl(0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	875 Cell key_list = keys.cell_value ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	876
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	877 for (int idx = 0; idx < key_list.numel (); idx++)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	878 m_lexer_apis->add (QString (key_list.elem (idx).string_value ().data ()));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	879 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	880
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	881 void file_editor_tab::save_apis_info (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	882 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	883 m_lexer_apis->savePrepared (m_prep_apis_file);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	884 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	885
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	886 // Slot for editors signal is its toplevel state has changed
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	887 void file_editor_tab::handle_toplevel_changed (bool)
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	888 {
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	889 // The find dialog has to be re-created since making the editor
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	890 // floating or docked obviously changes the parent/child relation
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	891 // of the find dialog
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	892 if (m_find_dialog == nullptr)
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	893 return;
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	894 else
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	895 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	896 if (m_find_dialog->isVisible ())
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	897 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	898 m_find_dialog->save_data (&m_find_dlg_data); // Save current data
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	899 delete m_find_dialog;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	900 m_find_dialog = nullptr;
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	901
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	902 find_create (); // Create new dialog
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	903
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	904 m_find_dialog->restore_data (&m_find_dlg_data); // Restore data
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	905
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	906 m_edit_area->setFocus ();
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	907 }
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	908 }
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	909 }
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	910
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	911 // slot for fetab_set_focus: sets the focus to the current edit area
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	912 void file_editor_tab::set_focus (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	913 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	914 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	915 return;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	916 m_edit_area->setFocus ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	917 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	918
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	919 void file_editor_tab::context_help (const QWidget *ID, bool doc)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	920 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	921 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	922 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	923
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	924 m_edit_area->context_help_doc (doc);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	925 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	926
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	927 void file_editor_tab::context_edit (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	928 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	929 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	930 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	931
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	932 m_edit_area->context_edit ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	933 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	934
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	935 void file_editor_tab::check_modified_file (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	936 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	937 if (m_cancelled)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	938 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	939
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	940 if (check_file_modified () == QMessageBox::Cancel)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	941 m_cancelled = true;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	942 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	943
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	944 void file_editor_tab::save_file (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	945 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	946 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	947 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	948
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	949 save_file (m_file_name);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	950 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	951
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	952 void file_editor_tab::save_file (const QWidget *ID, const QString& fileName,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	953 bool remove_on_success)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	954 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	955 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	956 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	957
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	958 save_file (fileName, remove_on_success);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	959 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	960
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	961 void file_editor_tab::save_file_as (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	962 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	963 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	964 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	965
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	966 save_file_as ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	967 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	968
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	969 void file_editor_tab::print_file (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	970 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	971 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	972 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	973
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	974 QsciPrinter *printer = new QsciPrinter (QPrinter::HighResolution);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	975
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	976 QPrintDialog printDlg (printer, this);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	977
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	978 if (printDlg.exec () == QDialog::Accepted)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	979 printer->printRange (m_edit_area);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	980
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	981 delete printer;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	982 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	983
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26855 diff changeset	984 void file_editor_tab::run_file (const QWidget *ID, bool step_into)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	985 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	986 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	987 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	988
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	989 if (m_edit_area->isModified () \| ! valid_file_name ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	990 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	991 save_file (m_file_name); // save file dialog
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	992 if (! valid_file_name ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	993 return; // still invalid filename: "save as" was cancelled
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	994 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	995
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26855 diff changeset	996 if (step_into)
27008 e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	997 {
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	998 // Get current first breakpoint and set breakpoint waiting for
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	999 // the returned line number. Store whether to remove this breakpoint
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	1000 // afterwards.
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	1001 int first_bp_line
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1002 = m_edit_area->markerFindNext (0, (1 << marker::breakpoint)) + 1;
27008 e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	1003
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	1004 // Set flag for storing the line number of the breakpoint
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	1005 m_breakpoint_info.remove_next = true;
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	1006 m_breakpoint_info.do_not_remove_line = first_bp_line;
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	1007
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	1008 // Add breakpoint, storing its line number
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	1009 handle_request_add_breakpoint (1, QString ());
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	1010 }
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26855 diff changeset	1011
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1012 QFileInfo info (m_file_name);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1013 emit run_file_signal (info);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1014 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1015
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1016 void file_editor_tab::context_run (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1017 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1018 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1019 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1020
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1021 m_edit_area->context_run ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1022 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1023
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1024 void file_editor_tab::toggle_bookmark (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1025 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1026 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1027 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1028
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1029 int line, cur;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1030 m_edit_area->getCursorPosition (&line, &cur);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1031
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1032 if (m_edit_area->markersAtLine (line) & (1 << marker::bookmark))
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1033 m_edit_area->markerDelete (line, marker::bookmark);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1034 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1035 m_edit_area->markerAdd (line, marker::bookmark);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1036 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1037
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1038 // Move the text cursor to the closest bookmark
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1039 // after the current line.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1040 void file_editor_tab::next_bookmark (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1041 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1042 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1043 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1044
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1045 int line, cur;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1046 m_edit_area->getCursorPosition (&line, &cur);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1047
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1048 line++; // Find bookmark strictly after the current line.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1049
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1050 int nextline = m_edit_area->markerFindNext (line, (1 << marker::bookmark));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1051
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1052 // Wrap.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1053 if (nextline == -1)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1054 nextline = m_edit_area->markerFindNext (1, (1 << marker::bookmark));
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1055
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1056 m_edit_area->setCursorPosition (nextline, 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1057 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1058
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1059 // Move the text cursor to the closest bookmark
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1060 // before the current line.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1061 void file_editor_tab::previous_bookmark (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1062 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1063 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1064 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1065
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1066 int line, cur;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1067 m_edit_area->getCursorPosition (&line, &cur);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1068
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1069 line--; // Find bookmark strictly before the current line.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1070
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1071 int prevline = m_edit_area->markerFindPrevious (line, (1 << marker::bookmark));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1072
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1073 // Wrap. Should use the last line of the file, not 1<<15
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1074 if (prevline == -1)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1075 prevline = m_edit_area->markerFindPrevious (m_edit_area->lines (),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1076 (1 << marker::bookmark));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1077
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1078 m_edit_area->setCursorPosition (prevline, 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1079 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1080
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1081 void file_editor_tab::remove_bookmark (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1082 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1083 if (ID != this)
24123 16c8ec7f0867 do not move the cursor when saving a file with breakpoints (bug #51793) Torsten <mttl@mailbox.org> parents: 24109 diff changeset	1084 return;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1085
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1086 m_edit_area->markerDeleteAll (marker::bookmark);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1087 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1088
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1089 file_editor_tab::bp_info::bp_info (const QString& fname, int l,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1090 const QString& cond)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1091 : line (l), file (fname.toStdString ()), condition (cond.toStdString ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1092 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1093 QFileInfo file_info (fname);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1094
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1095 QString q_dir = file_info.absolutePath ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1096 QString q_function_name = file_info.fileName ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1097
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1098 // We have to cut off the suffix, because octave appends it.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1099 q_function_name.chop (file_info.suffix ().length () + 1);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1100
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1101 dir = q_dir.toStdString ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1102 function_name = q_function_name.toStdString ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1103
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1104 // Is the last component of DIR @foo? If so, strip it and prepend it
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1105 // to the name of the function.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1106
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1107 size_t pos = dir.rfind (sys::file_ops::dir_sep_chars ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1108
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1109 if (pos != std::string::npos && pos < dir.length () - 1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1110 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1111 if (dir[pos+1] == '@')
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1112 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1113 function_name = sys::file_ops::concat (dir.substr (pos+1), function_name);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1114
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1115 dir = dir.substr (0, pos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1116 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1117 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1118 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1119
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1120 void file_editor_tab::handle_request_add_breakpoint (int line,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1121 const QString& condition)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1122 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1123 bp_info info (m_file_name, line, condition);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1124
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1125 add_breakpoint_event (info);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1126 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1127
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1128 void file_editor_tab::handle_request_remove_breakpoint (int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1129 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1130 bp_info info (m_file_name, line);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1131
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1132 emit interpreter_event
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1133 ([info] (interpreter& interp)
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1134 {
27393 efe72866b483 mark all interpreter_event lambda functions with special comment John W. Eaton <jwe@octave.org> parents: 27378 diff changeset	1135 // INTERPRETER THREAD
efe72866b483 mark all interpreter_event lambda functions with special comment John W. Eaton <jwe@octave.org> parents: 27378 diff changeset	1136
27396 930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	1137 load_path& lp = interp.get_load_path ();
930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	1138
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1139 bp_table::intmap line_info;
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1140 line_info[0] = info.line;
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1141
27396 930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	1142 if (lp.contains_file_in_dir (info.file, info.dir))
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1143 {
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1144 tree_evaluator& tw = interp.get_evaluator ();
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1145
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1146 bp_table& bptab = tw.get_bp_table ();
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1147
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1148 bptab.remove_breakpoint (info.function_name, line_info);
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1149 }
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1150 });
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1151 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1152
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1153 void file_editor_tab::toggle_breakpoint (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1154 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1155 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1156 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1157
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1158 int editor_linenr, cur;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1159 m_edit_area->getCursorPosition (&editor_linenr, &cur);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1160
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1161 if (m_edit_area->markersAtLine (editor_linenr) & (1 << marker::breakpoint))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1162 request_remove_breakpoint_via_editor_linenr (editor_linenr);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1163 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1164 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1165 if (unchanged_or_saved ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1166 handle_request_add_breakpoint (editor_linenr + 1, "");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1167 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1168 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1169
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1170 // Move the text cursor to the closest breakpoint (conditional or unconditional)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1171 // after the current line.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1172 void file_editor_tab::next_breakpoint (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1173 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1174 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1175 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1176
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1177 int line, cur;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1178 m_edit_area->getCursorPosition (&line, &cur);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1179
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1180 line++; // Find breakpoint strictly after the current line.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1181
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1182 int nextline = m_edit_area->markerFindNext (line, (1 << marker::breakpoint));
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1183 int nextcond = m_edit_area->markerFindNext (line, (1 << marker::cond_break));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1184
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1185 // Check if the next conditional breakpoint is before next unconditional one.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1186 if (nextcond != -1 && (nextcond < nextline \|\| nextline == -1))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1187 nextline = nextcond;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1188
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1189 m_edit_area->setCursorPosition (nextline, 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1190 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1191
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1192 // Move the text cursor to the closest breakpoint (conditional or unconditional)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1193 // before the current line.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1194 void file_editor_tab::previous_breakpoint (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1195 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1196 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1197 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1198
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1199 int line, cur, prevline, prevcond;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1200 m_edit_area->getCursorPosition (&line, &cur);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1201
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1202 line--; // Find breakpoint strictly before the current line.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1203
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1204 prevline = m_edit_area->markerFindPrevious (line, (1 << marker::breakpoint));
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1205 prevcond = m_edit_area->markerFindPrevious (line, (1 << marker::cond_break));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1206
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1207 // Check if the prev conditional breakpoint is closer than the unconditional.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1208 if (prevcond != -1 && prevcond > prevline)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1209 prevline = prevcond;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1210
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1211 m_edit_area->setCursorPosition (prevline, 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1212 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1213
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1214 void file_editor_tab::remove_all_breakpoints (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1215 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1216 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1217 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1218
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1219 bp_info info (m_file_name);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1220
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1221 emit interpreter_event
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1222 ([info] (interpreter& interp)
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1223 {
27393 efe72866b483 mark all interpreter_event lambda functions with special comment John W. Eaton <jwe@octave.org> parents: 27378 diff changeset	1224 // INTERPRETER THREAD
efe72866b483 mark all interpreter_event lambda functions with special comment John W. Eaton <jwe@octave.org> parents: 27378 diff changeset	1225
27396 930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	1226 load_path& lp = interp.get_load_path ();
930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	1227
930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	1228 if (lp.contains_file_in_dir (info.file, info.dir))
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1229 {
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1230 tree_evaluator& tw = interp.get_evaluator ();
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1231
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1232 bp_table& bptab = tw.get_bp_table ();
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1233
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1234 bptab.remove_all_breakpoints_in_file (info.function_name, true);
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1235 }
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1236 });
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1237 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1238
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1239 void file_editor_tab::scintilla_command (const QWidget *ID, unsigned int sci_msg)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1240 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1241 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1242 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1243
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1244 m_edit_area->SendScintilla (sci_msg);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1245 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1246
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1247 void file_editor_tab::comment_selected_text (const QWidget *ID, bool input_str)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1248 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1249 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1250 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1251
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1252 do_comment_selected_text (true, input_str);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1253 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1254
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1255 void file_editor_tab::uncomment_selected_text (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1256 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1257 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1258 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1259
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1260 do_comment_selected_text (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1261 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1262
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1263 void file_editor_tab::indent_selected_text (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1264 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1265 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1266 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1267
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1268 do_indent_selected_text (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1269 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1270
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1271 void file_editor_tab::unindent_selected_text (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1272 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1273 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1274 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1275
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1276 do_indent_selected_text (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1277 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1278
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1279 void file_editor_tab::smart_indent_line_or_selected_text (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1280 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1281 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1282 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1283
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1284 do_smart_indent_line_or_selected_text ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1285 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1286
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1287 void file_editor_tab::convert_eol (const QWidget *ID,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1288 QsciScintilla::EolMode eol_mode)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1289 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1290 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1291 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1292
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1293 m_edit_area->convertEols (eol_mode);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1294 m_edit_area->setEolMode (eol_mode);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1295 update_eol_indicator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1296 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1297
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1298 void file_editor_tab::zoom_in (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1299 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1300 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1301 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1302
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1303 m_edit_area->zoomIn (1);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1304 auto_margin_width ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1305 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1306
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1307 void file_editor_tab::zoom_out (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1308 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1309 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1310 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1311
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1312 m_edit_area->zoomOut (1);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1313 auto_margin_width ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1314 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1315
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1316 void file_editor_tab::zoom_normal (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1317 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1318 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1319 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1320
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1321 m_edit_area->zoomTo (0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1322 auto_margin_width ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1323 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1324
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1325 void file_editor_tab::handle_find_dialog_finished (int)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1326 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1327 // Find dialog is going to hide. Save location of window for
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1328 // when it is reshown.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1329 m_find_dlg_data.geometry = m_find_dialog->geometry ();
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1330 m_find_dlg_data.is_visible = false;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1331 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1332
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1333 // Slot for initially creating and showing the find dialog
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1334 void file_editor_tab::find (const QWidget ID, QList<QAction > fetab_actions)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1335 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1336 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1337 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1338
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1339 m_find_dlg_data.actions = fetab_actions.mid (0,2);
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1340
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1341 // Create the dialog
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1342 find_create ();
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1343
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1344 // Since find_create shows the dialog without activating the widget
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1345 // (which is reuqired in other cases) do this manually here
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1346 m_find_dialog->activateWindow ();
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1347
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1348 // Initiate search text from possible selection and save the initial
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1349 // data from the dialog on the defined structure
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1350 m_find_dialog->init_search_text ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1351 m_find_dialog->save_data (&m_find_dlg_data);
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1352 }
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1353
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1354 void file_editor_tab::add_breakpoint_event (const bp_info& info)
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1355 {
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1356 emit interpreter_event
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1357 ([this, info] (interpreter& interp)
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1358 {
27393 efe72866b483 mark all interpreter_event lambda functions with special comment John W. Eaton <jwe@octave.org> parents: 27378 diff changeset	1359 // INTERPRETER THREAD
efe72866b483 mark all interpreter_event lambda functions with special comment John W. Eaton <jwe@octave.org> parents: 27378 diff changeset	1360
27398 db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	1361 // FIXME: note duplication with the code in
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	1362 // handle_context_menu_break_condition.
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	1363
27396 930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	1364 load_path& lp = interp.get_load_path ();
930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	1365
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1366 bp_table::intmap line_info;
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1367 line_info[0] = info.line;
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1368
27396 930c0fbc003b move qt_interpreter_events::file_in_path to load_path::contains_file_in_dir John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	1369 if (lp.contains_file_in_dir (info.file, info.dir))
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1370 {
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1371 tree_evaluator& tw = interp.get_evaluator ();
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1372
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1373 bp_table& bptab = tw.get_bp_table ();
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1374
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1375 bp_table::intmap bpmap
27398 db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	1376 = bptab.add_breakpoint (info.function_name, "", line_info,
db22b63b9c59 attempt to fix threading issues when setting conditional breakpoints in GUI John W. Eaton <jwe@octave.org> parents: 27397 diff changeset	1377 info.condition);
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1378
27397 8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1379 if (! bpmap.empty ())
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1380 {
27397 8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1381 bp_table::intmap::iterator bp_it = bpmap.begin ();
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1382
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1383 int remove_line = bp_it->second;
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1384
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1385 emit maybe_remove_next (remove_line);
27247 9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1386 }
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1387 }
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1388 });
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1389 }
9e5a825bb966 replace more explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1390
27397 8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1391 void file_editor_tab::handle_remove_next (int remove_line)
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1392 {
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1393 // Store some info breakpoint
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1394 if (m_breakpoint_info.remove_next)
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1395 {
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1396 m_breakpoint_info.remove_line = remove_line;
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1397 m_breakpoint_info.remove_next = false;
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1398 }
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1399 }
8132797b4a6a use signal/slot connection in file-editor-tab for thread safety John W. Eaton <jwe@octave.org> parents: 27396 diff changeset	1400
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1401 // This methos creates the find dialog in way that is at first suitable
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1402 // for re-creating it after the toplevel of the editor has changed.
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1403 // The find dialog is initially creatied, activated and shown with find ()
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1404 void file_editor_tab::find_create ()
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1405 {
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1406 // The find_dialog feature doesn't need a slot for return info.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1407 // Rather than Qt::DeleteOnClose, let the find feature hang about
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1408 // in case it contains useful information like previous searches
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1409 // and so on. Perhaps one find dialog for the whole editor is
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1410 // better, but individual find dialogs has the nice feature of
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1411 // retaining position per file editor tabs, which can be undocked.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1412
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1413 if (! m_find_dialog)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1414 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1415 m_find_dialog = new find_dialog (m_edit_area,
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1416 m_find_dlg_data.actions,
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 27053 diff changeset	1417 this);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1418 connect (m_find_dialog, SIGNAL (finished (int)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1419 this, SLOT (handle_find_dialog_finished (int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1420
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1421 connect (this, SIGNAL (request_find_next ()),
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1422 m_find_dialog, SLOT (find_next ()));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1423
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1424 connect (this, SIGNAL (request_find_previous ()),
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1425 m_find_dialog, SLOT (find_prev ()));
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1426
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1427 m_find_dialog->setWindowModality (Qt::NonModal);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1428 }
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1429 else if (! m_find_dialog->isVisible ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1430 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1431 m_find_dialog->setGeometry (m_find_dlg_data.geometry);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1432 QPoint p = m_find_dialog->pos ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1433 m_find_dialog->move (p.x ()+10, p.y ()+10);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1434 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1435
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1436 m_find_dialog->setAttribute(Qt::WA_ShowWithoutActivating);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1437 m_find_dialog->show ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1438 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1439
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1440 void file_editor_tab::find_next (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1441 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1442 if (ID == this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1443 emit request_find_next ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1444 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1445
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1446 void file_editor_tab::find_previous (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1447 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1448 if (ID == this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1449 emit request_find_previous ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1450 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1451
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1452 void file_editor_tab::goto_line (const QWidget *ID, int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1453 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1454 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1455 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1456
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1457 if (m_bp_restore_count > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1458 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1459 // This goto-line request is invoked by restoring a breakpoint during
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1460 // saving the file, thus, do not go to the related line
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1461 m_bp_restore_count--;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1462 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1463 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1464
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1465 if (line <= 0) // ask for desired line
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1466 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1467 bool ok = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1468 int index;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1469 m_edit_area->getCursorPosition (&line, &index);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1470 line = QInputDialog::getInt (m_edit_area, tr ("Goto line"),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1471 tr ("Line number"), line+1, 1,
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1472 m_edit_area->lines (), 1, &ok);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1473 if (ok)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1474 m_edit_area->setCursorPosition (line-1, 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1475 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1476 else // go to given line without dialog
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1477 m_edit_area->setCursorPosition (line-1, 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1478
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1479 center_current_line (false); // only center line if at top or bottom
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1480 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1481
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1482 void file_editor_tab::move_match_brace (const QWidget *ID, bool select)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1483 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1484 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1485 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1486
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1487 if (select)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1488 m_edit_area->selectToMatchingBrace ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1489 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1490 m_edit_area->moveToMatchingBrace ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1491 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1492
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1493 void file_editor_tab::show_auto_completion (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1494 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1495 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1496 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1497
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1498 QsciScintilla::AutoCompletionSource s = m_edit_area->autoCompletionSource ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1499 switch (s)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1500 {
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1501 case QsciScintilla::AcsAll:
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1502 m_edit_area->autoCompleteFromAll ();
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1503 break;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1504
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1505 case QsciScintilla::AcsAPIs:
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1506 m_edit_area->autoCompleteFromAPIs ();
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1507 break;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1508
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1509 case QsciScintilla::AcsDocument:
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1510 m_edit_area->autoCompleteFromDocument ();
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1511 break;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1512
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1513 case QsciScintilla::AcsNone:
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1514 break;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1515 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1516 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1517
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1518 void file_editor_tab::do_indent_selected_text (bool indent)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1519 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1520 // FIXME:
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1521 m_edit_area->beginUndoAction ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1522
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1523 if (m_edit_area->hasSelectedText ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1524 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1525 int lineFrom, lineTo, colFrom, colTo;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1526 m_edit_area->getSelection (&lineFrom, &colFrom, &lineTo, &colTo);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1527
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1528 if (colTo == 0) // the beginning of last line is not selected
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1529 lineTo--; // stop at line above
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1530
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1531 for (int i = lineFrom; i <= lineTo; i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1532 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1533 if (indent)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1534 m_edit_area->indent (i);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1535 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1536 m_edit_area->unindent (i);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1537 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1538 //set selection on (un)indented section
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1539 m_edit_area->setSelection (lineFrom, 0, lineTo,
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1540 m_edit_area->text (lineTo).length ()-1);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1541 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1542 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1543 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1544 int cpline, col;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1545 m_edit_area->getCursorPosition (&cpline, &col);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1546 if (indent)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1547 m_edit_area->indent (cpline);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1548 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1549 m_edit_area->unindent (cpline);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1550 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1551
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1552 m_edit_area->endUndoAction ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1553 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1554
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1555 void file_editor_tab::do_smart_indent_line_or_selected_text (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1556 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1557 m_edit_area->beginUndoAction ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1558
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1559 int lineFrom, lineTo;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1560
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1561 if (m_edit_area->hasSelectedText ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1562 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1563 int colFrom, colTo;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1564 m_edit_area->getSelection (&lineFrom, &colFrom, &lineTo, &colTo);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1565
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1566 if (colTo == 0) // the beginning of last line is not selected
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1567 lineTo--; // stop at line above
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1568 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1569 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1570 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1571 int col;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1572 m_edit_area->getCursorPosition (&lineFrom, &col);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1573
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1574 lineTo = lineFrom;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1575 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1576
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1577 m_edit_area->smart_indent_line_or_selected_text (lineFrom, lineTo);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1578
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1579 m_edit_area->endUndoAction ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1580 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1581
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1582 void file_editor_tab::do_comment_selected_text (bool comment, bool input_str)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1583 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1584 QRegExp rxc;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1585 QString ws = "^([ \\t]*)";
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1586 QStringList comment_str = m_edit_area->comment_string (comment);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1587 QString used_comment_str = comment_str.at (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1588
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1589 if (comment)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1590 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1591 if (input_str)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1592 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1593 bool ok;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1594 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1595
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	1596 used_comment_str
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	1597 = QInputDialog::getText (this, tr ("Comment selected text"),
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	1598 tr ("Comment string to use:\n"),
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	1599 QLineEdit::Normal,
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	1600 settings->value (ed_last_comment_str, comment_str.at (0)).toString (),
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	1601 &ok);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1602
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1603 if ((! ok) \|\| used_comment_str.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1604 return; // No input, do nothing
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1605 else
25617 44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25566 diff changeset	1606 settings->setValue (ed_last_comment_str, used_comment_str); // Store last
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1607 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1608 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1609 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1610 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1611 // Uncommenting (several strings possible)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1612
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1613 // Sort strings according their length
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1614 QStringList comment_str_sorted (comment_str.at (0));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1615 bool inserted;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1616
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1617 for (int i = 1; i < comment_str.length (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1618 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1619 inserted = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1620 for (int j = 0; j < comment_str_sorted.length (); j++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1621 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1622 if (comment_str.at (i).length () > comment_str_sorted.at (j).length ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1623 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1624 comment_str_sorted.insert (j, comment_str.at (i));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1625 inserted = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1626 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1627 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1628 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1629 if (! inserted)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1630 comment_str_sorted << comment_str.at (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1631 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1632
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1633 // Create regular expression
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1634 QString regexp;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1635 for (int i = 0; i < comment_str_sorted.length (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1636 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1637 if (i > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1638 regexp = regexp + QString ("\|");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1639 regexp = regexp + comment_str_sorted.at (i);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1640 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1641 rxc = QRegExp (ws + "(" + regexp + ")");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1642 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1643
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1644 // Do the commenting/uncommenting
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1645 int len = 0, lenc = 0;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1646 m_edit_area->beginUndoAction ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1647
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1648 if (m_edit_area->hasSelectedText ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1649 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1650 int lineFrom, lineTo, colFrom, colTo;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1651 int change_col_from = 1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1652 int change_col_to = 1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1653 bool removed;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1654
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1655 m_edit_area->getSelection (&lineFrom, &colFrom, &lineTo, &colTo);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1656
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1657 if (colTo == 0) // the beginning of last line is not selected
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1658 lineTo--; // stop at line above
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1659
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1660 for (int i = lineFrom; i <= lineTo; i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1661 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1662 if (comment)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1663 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1664 m_edit_area->insertAt (used_comment_str, i, 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1665 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1666 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1667 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1668 QString line (m_edit_area->text (i));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1669 if ((removed = line.contains (rxc)))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1670 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1671 len = rxc.matchedLength (); // complete length
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1672 QString matched_text = rxc.capturedTexts ().at (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1673 lenc = matched_text.remove (QRegExp (ws)).length (); // only comment string
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1674 m_edit_area->setSelection (i, len-lenc, i, len);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1675 m_edit_area->removeSelectedText ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1676 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1677
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1678 // handle case, where the selection remains unchanged
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1679 if (i == lineFrom && (colFrom < len-lenc \|\| ! removed))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1680 change_col_from = 0; // do not change start of selection
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1681 if (i == lineTo && (colTo < len-lenc \|\| ! removed))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1682 change_col_to = 0; // do not change end of selection
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1683 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1684 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1685
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1686 // update the selection area
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1687 if (comment)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1688 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1689 colFrom = colFrom + lenc; // shift start position by comment length
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1690 if (colTo > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1691 colTo = colTo + lenc; // shift end position by comment length
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1692 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1693 lineTo++; // colTo == 0 , fully select previous line
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1694 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1695 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1696 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1697 if (colTo == 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1698 lineTo++; // colTo == 0 , fully select previous line
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1699 colFrom = colFrom - change_col_from*lenc;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1700 colTo = colTo - change_col_to*lenc;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1701 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1702
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1703 // set updated selection area
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1704 m_edit_area->setSelection (lineFrom, colFrom, lineTo, colTo);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1705 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1706 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1707 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1708 int cpline, col;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1709 m_edit_area->getCursorPosition (&cpline, &col);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1710 if (comment)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1711 m_edit_area->insertAt (used_comment_str, cpline, 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1712 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1713 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1714 QString line (m_edit_area->text (cpline));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1715 if (line.contains (rxc))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1716 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1717 len = rxc.matchedLength (); // complete length
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1718 QString matched_text = rxc.capturedTexts ().at (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1719 lenc = matched_text.remove (QRegExp (ws)).length (); // only comment string
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1720 m_edit_area->setSelection (cpline, len-lenc, cpline, len);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1721 m_edit_area->removeSelectedText ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1722 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1723 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1724 }
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1725 m_edit_area->endUndoAction ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1726 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1727
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1728 void file_editor_tab::update_window_title (bool modified)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1729 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1730 QString title ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1731 QString tooltip ("");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1732
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1733 if (! valid_file_name ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1734 title = tr ("<unnamed>");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1735 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1736 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1737 if (m_long_title)
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1738 title = m_file_name;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1739 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1740 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1741 QFileInfo file (m_file_name);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1742 title = file.fileName ();
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1743 tooltip = m_file_name;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1744 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1745 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1746
27053 1bdfd2b523c9 use tab icon for indicating a modified editor file (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 27037 diff changeset	1747 emit file_name_changed (title, tooltip, modified);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1748 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1749
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1750 void file_editor_tab::handle_copy_available (bool enableCopy)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1751 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1752 m_copy_available = enableCopy;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1753 emit editor_state_changed (m_copy_available, m_is_octave_file);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1754 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1755
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1756 // show_dialog: shows a modal or non modal dialog depending on input arg
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1757 void file_editor_tab::show_dialog (QDialog *dlg, bool modal)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1758 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1759 dlg->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1760 if (modal)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1761 dlg->exec ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1762 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1763 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1764 dlg->setWindowModality (Qt::NonModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1765 dlg->show ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1766 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1767 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1768
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1769 int file_editor_tab::check_file_modified (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1770 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1771 int decision = QMessageBox::Yes;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1772 if (m_edit_area->isModified ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1773 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1774 // File is modified but not saved, ask user what to do. The file
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1775 // editor tab can't be made parent because it may be deleted depending
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1776 // upon the response. Instead, change the m_edit_area to read only.
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1777 QMessageBox::StandardButtons buttons = QMessageBox::Save \|
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	1778 QMessageBox::Discard \|
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	1779 QMessageBox::Cancel;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1780
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1781 // For now, just a warning message about closing a tab that has been
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1782 // modified seems sufficient. Exit-condition-specific messages could
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1783 // be achieved by making 'available_actions' a function input string.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1784 QString available_actions =
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19697 diff changeset	1785 tr ("Do you want to cancel closing, save or discard the changes?");
16638 3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1786
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1787 QString file;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1788 if (valid_file_name ())
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1789 file = m_file_name;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1790 else
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1791 file = tr ("<unnamed>");
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1792
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1793 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1794 = new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1795 tr ("The file\n\n"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1796 " %1\n\n"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1797 "is about to be closed but has been modified. "
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1798 "%2").
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1799 arg (file). arg (available_actions),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1800 buttons, qobject_cast<QWidget *> (parent ()));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1801
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1802 msgBox->setDefaultButton (QMessageBox::Save);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1803 m_edit_area->setReadOnly (true);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1804 connect (msgBox, SIGNAL (finished (int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1805 this, SLOT (handle_file_modified_answer (int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1806
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1807 show_dialog (msgBox, true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1808
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1809 if (m_cancelled)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1810 return QMessageBox::Cancel;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1811 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1812 return decision;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1813 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1814 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1815 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1816 // Nothing was modified. Leave tab present in case user
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1817 // decides to cancel some point further along.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1818 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1819
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1820 return decision;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1821 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1822
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1823 void file_editor_tab::handle_file_modified_answer (int decision)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1824 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1825 if (decision == QMessageBox::Save)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1826 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1827 // Save file, but do not remove from editor.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1828 save_file (m_file_name, false, false);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1829 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1830 else if (decision == QMessageBox::Discard)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1831 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1832 // User doesn't want to save, leave tab and remove subsequently.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1833 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1834 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1835 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1836 // User canceled, allow editing again.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1837 m_edit_area->setReadOnly (false);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1838 m_cancelled = true;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1839 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1840 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1841
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1842 void file_editor_tab::set_modified (bool modified)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1843 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1844 m_edit_area->setModified (modified);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1845 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1846
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1847 void file_editor_tab::recover_from_exit (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1848 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1849 // reset the possibly still existing read only state
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1850 m_edit_area->setReadOnly (false);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1851
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1852 // if we are in this slot and the list of breakpoint is not empty,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1853 // then this tab was saved during an exit of the applications (not
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1854 // restoring the breakpoints and not emptying the list) and the user
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1855 // canceled this closing late on.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1856 check_restore_breakpoints ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1857 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1858
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1859 void file_editor_tab::check_restore_breakpoints (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1860 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1861 if (! m_bp_lines.isEmpty ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1862 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1863 // At least one breakpoint is present.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1864 // Get rid of breakpoints at old (now possibly invalid) linenumbers
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1865 remove_all_breakpoints (this);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1866
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1867 // and set breakpoints at the new linenumbers
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1868 m_bp_restore_count = m_bp_lines.length ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1869 for (int i = 0; i < m_bp_lines.length (); i++)
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1870 handle_request_add_breakpoint (m_bp_lines.value (i) + 1,
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1871 m_bp_conditions.value (i));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1872
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1873 // Keep the list of breakpoints empty, except after explicit requests.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1874 m_bp_lines.clear ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1875 m_bp_conditions.clear ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1876 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1877 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1878
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1879 QString file_editor_tab::load_file (const QString& fileName)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1880 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1881 // get the absolute path
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1882 QFileInfo file_info = QFileInfo (fileName);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1883 QString file_to_load;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1884 if (file_info.exists ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1885 file_to_load = file_info.canonicalFilePath ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1886 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1887 file_to_load = fileName;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1888 QFile file (file_to_load);
25883 cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1889 if (!file.open(QIODevice::ReadOnly))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1890 return file.errorString ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1891
26131 22edc076543e restore line/column when reloading externally changed editor files (bug #54961) Torsten <mttl@mailbox.org> parents: 26119 diff changeset	1892 int col = 0, line = 0;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1893 if (fileName == m_file_name)
26131 22edc076543e restore line/column when reloading externally changed editor files (bug #54961) Torsten <mttl@mailbox.org> parents: 26119 diff changeset	1894 {
22edc076543e restore line/column when reloading externally changed editor files (bug #54961) Torsten <mttl@mailbox.org> parents: 26119 diff changeset	1895 // We have to reload the current file, thus get current cursor position
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1896 line = m_line;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1897 col = m_col;
26131 22edc076543e restore line/column when reloading externally changed editor files (bug #54961) Torsten <mttl@mailbox.org> parents: 26119 diff changeset	1898 }
22edc076543e restore line/column when reloading externally changed editor files (bug #54961) Torsten <mttl@mailbox.org> parents: 26119 diff changeset	1899
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1900 QApplication::setOverrideCursor (Qt::WaitCursor);
25883 cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1901
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1902 // read the file binary, decoding later
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1903 const QByteArray text_data = file.readAll ();
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1904
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1905 // decode
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1906 QTextCodec::ConverterState st;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1907 QTextCodec *codec = QTextCodec::codecForName (m_encoding.toLatin1 ());
26172 a7be718a9dd3 validate editor file codec derived from name (bug #55139) Torsten <mttl@mailbox.org> parents: 26131 diff changeset	1908 if (codec == nullptr)
a7be718a9dd3 validate editor file codec derived from name (bug #55139) Torsten <mttl@mailbox.org> parents: 26131 diff changeset	1909 codec = QTextCodec::codecForLocale ();
a7be718a9dd3 validate editor file codec derived from name (bug #55139) Torsten <mttl@mailbox.org> parents: 26131 diff changeset	1910
25883 cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1911 const QString text = codec->toUnicode(text_data.constData(),
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1912 text_data.size(), &st);
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1913
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1914 // Decoding with invalid characters?
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1915 if (st.invalidChars > 0)
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1916 {
25895 bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1917 // Set read only
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1918 m_edit_area->setReadOnly (true);
25895 bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1919
25883 cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1920 // Message box for user decision
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1921 QString msg = tr ("There were problems reading the file\n"
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1922 "%1\n"
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1923 "with the selected encoding %2.\n\n"
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1924 "Modifying and saving the file might "
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1925 "cause data loss!")
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1926 .arg (file_to_load).arg (m_encoding);
25883 cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1927 QMessageBox *msg_box = new QMessageBox ();
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1928 msg_box->setIcon (QMessageBox::Warning);
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1929 msg_box->setText (msg);
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1930 msg_box->setWindowTitle (tr ("Octave Editor"));
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1931 msg_box->addButton (tr ("&Edit anyway"), QMessageBox::YesRole);
25895 bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1932 msg_box->addButton (tr ("Chan&ge encoding"), QMessageBox::AcceptRole);
25883 cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1933 msg_box->addButton (tr ("&Close"), QMessageBox::RejectRole);
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1934
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1935 connect (msg_box, SIGNAL (buttonClicked (QAbstractButton *)),
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1936 this, SLOT (handle_decode_warning_answer (QAbstractButton *)));
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1937
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1938 msg_box->setWindowModality (Qt::WindowModal);
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1939 msg_box->setAttribute (Qt::WA_DeleteOnClose);
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1940 msg_box->show ();
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1941 }
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1942
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1943 m_edit_area->setText (text);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1944 m_edit_area->setEolMode (detect_eol_mode ());
25883 cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1945
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1946 QApplication::restoreOverrideCursor ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1947
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1948 m_copy_available = false; // no selection yet available
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1949 set_file_name (file_to_load);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1950 update_window_title (false); // window title (no modification)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1951 m_edit_area->setModified (false); // loaded file is not modified yet
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1952
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1953 update_eol_indicator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1954
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	1955 m_edit_area->setCursorPosition (line, col);
26131 22edc076543e restore line/column when reloading externally changed editor files (bug #54961) Torsten <mttl@mailbox.org> parents: 26119 diff changeset	1956
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1957 // FIXME: (BREAKPOINTS) At this point it would be nice to put any set
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1958 // breakpoints on the margin. In order to do this, somehow the
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1959 // "dbstatus" command needs to be accessed. All it would require is a
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1960 // routine that does "res = feval ("dbstatus") and signals that result
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1961 // to some slot.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1962 //
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1963 // See patch #8016 for a general way to get Octave results from
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1964 // commands processed in the background.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1965
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1966 /*
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1967 connect (event_manager, SIGNAL (fileSelected (QObject *, const QString&, const octave_value_list&)),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1968 this, SLOT (handle_feval_result (QObject *, const QString&, const octave_value_list&)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1969 connect (this, SIGNAL (evaluate_octave_command (const QString&)),
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1970 event_manager, SLOT (queue_octave_command (const QString&)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1971
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1972 emit evaluate_octave_command ("dbstatus");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1973 */
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1974
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1975 return QString ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1976 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	1977
25883 cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1978 void file_editor_tab::handle_decode_warning_answer (QAbstractButton *btn)
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1979 {
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1980 QString txt = btn->text ();
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1981
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	1982 if (txt == tr ("&Close"))
25895 bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1983 {
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1984 // Just close the file
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1985 close ();
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1986 return;
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1987 }
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1988
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1989 if (txt == tr ("Chan&ge encoding"))
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1990 {
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1991 // Dialog for reloading the file with another encoding
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1992 QDialog dlg;
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1993 dlg.setWindowTitle (tr ("Select new default encoding"));
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1994
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1995 QLabel *text
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1996 = new QLabel (tr ("Please select a new encoding\n"
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1997 "for reloading the current file.\n\n"
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1998 "This does not change the default encoding.\n"));
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1999
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2000 QComboBox *enc_combo = new QComboBox ();
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2001 resource_manager::combo_encoding (enc_combo);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2002 m_new_encoding = enc_combo->currentText ();
25895 bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2003 connect (enc_combo, SIGNAL (currentTextChanged (const QString&)),
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2004 this , SLOT (handle_current_enc_changed (const QString&)));
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2005
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2006 QDialogButtonBox *buttons
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2007 = new QDialogButtonBox (QDialogButtonBox::Ok \| QDialogButtonBox::Cancel,
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2008 Qt::Horizontal);
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2009 connect (buttons, SIGNAL (accepted ()), &dlg, SLOT (accept ()));
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2010 connect (buttons, SIGNAL (rejected ()), &dlg, SLOT (reject ()));
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2011
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2012 QGridLayout *main_layout = new QGridLayout;
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2013 main_layout->setSizeConstraint (QLayout::SetFixedSize);
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2014 main_layout->addWidget (text, 0, 0);
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2015 main_layout->addWidget (enc_combo, 1, 0);
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2016 main_layout->addWidget (buttons, 2, 0);
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2017 dlg.setLayout (main_layout);
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2018
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2019 int answer = dlg.exec ();
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2020
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2021 if (answer == QDialog::Accepted)
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2022 {
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2023 // Reload the file with new encoding but using the same tab
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2024 QString reload_file_name = m_file_name; // store file name
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2025 m_file_name = ""; // force reuse of this tab when opening a new file
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2026 emit request_open_file (reload_file_name, m_new_encoding);
25895 bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2027 }
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2028 }
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2029
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2030 // Continue editing, set writable again
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2031 m_edit_area->setReadOnly (false);
25895 bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2032 }
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2033
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2034 void file_editor_tab::handle_current_enc_changed (const QString& enc)
bb0c58796275 allow to change the encoding when editor detects decoding errors (bug #54607) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	2035 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2036 m_new_encoding = enc;
25883 cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	2037 }
cfdc768b661c allow native dialogs for remaining file open/save dialogs (bug #5 Torsten <mttl@mailbox.org> parents: 25811 diff changeset	2038
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2039 QsciScintilla::EolMode file_editor_tab::detect_eol_mode (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2040 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2041 QByteArray text = m_edit_area->text ().toLatin1 ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2042
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2043 QByteArray eol_lf = QByteArray (1,0x0a);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2044 QByteArray eol_cr = QByteArray (1,0x0d);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2045 QByteArray eol_crlf = eol_cr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2046 eol_crlf.append (eol_lf);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2047
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2048 int count_crlf = text.count (eol_crlf);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2049 int count_lf = text.count (eol_lf) - count_crlf; // isolated lf
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2050 int count_cr = text.count (eol_cr) - count_crlf; // isolated cr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2051
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2052 // get default from OS or from settings
19248 54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19247 diff changeset	2053 #if defined (Q_OS_WIN32)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2054 int os_eol_mode = QsciScintilla::EolWindows;
19248 54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19247 diff changeset	2055 #else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2056 int os_eol_mode = QsciScintilla::EolUnix;
19248 54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19247 diff changeset	2057 #endif
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2058 QSettings *settings = resource_manager::get_settings ();
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	2059 QsciScintilla::EolMode eol_mode
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	2060 = static_cast<QsciScintilla::EolMode> (settings->value ("editor/default_eol_mode",os_eol_mode).toInt ());
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2061
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2062 int count_max = 0;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2063
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2064 if (count_crlf > count_max)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2065 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2066 eol_mode = QsciScintilla::EolWindows;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2067 count_max = count_crlf;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2068 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2069 if (count_lf > count_max)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2070 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2071 eol_mode = QsciScintilla::EolUnix;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2072 count_max = count_lf;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2073 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2074 if (count_cr > count_max)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2075 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2076 eol_mode = QsciScintilla::EolMac;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2077 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2078
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2079 return eol_mode;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2080 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2081
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2082 void file_editor_tab::update_eol_indicator (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2083 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2084 switch (m_edit_area->eolMode ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2085 {
19237 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18237 diff changeset	2086 case QsciScintilla::EolWindows:
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2087 m_eol_indicator->setText ("CRLF");
19237 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18237 diff changeset	2088 break;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18237 diff changeset	2089 case QsciScintilla::EolMac:
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2090 m_eol_indicator->setText ("CR");
19237 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18237 diff changeset	2091 break;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18237 diff changeset	2092 case QsciScintilla::EolUnix:
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2093 m_eol_indicator->setText ("LF");
19237 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18237 diff changeset	2094 break;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2095 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2096 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2097
25923 a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2098 void file_editor_tab::update_breakpoints ()
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2099 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2100 if (m_file_name.isEmpty ())
25923 a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2101 return;
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2102
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2103 // Create and queue the command object.
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2104
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2105 emit interpreter_event
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2106 ([this] (interpreter& interp)
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2107 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2108 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2109
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2110 octave_value_list argout = Fdbstatus (interp, ovl (), 1);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2111
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2112 connect (this, SIGNAL (update_breakpoints_signal (const octave_value_list&)),
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2113 this, SLOT (update_breakpoints_handler (const octave_value_list&)),
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2114 Qt::QueuedConnection);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2115
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2116 emit update_breakpoints_signal (argout);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2117 });
25923 a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2118 }
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2119
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2120 void file_editor_tab::update_breakpoints_handler (const octave_value_list& argout)
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2121 {
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2122 octave_map dbg = argout(0).map_value ();
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2123 octave_idx_type n_dbg = dbg.numel ();
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2124
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2125 Cell file = dbg.contents ("file");
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2126 Cell line = dbg.contents ("line");
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2127 Cell cond = dbg.contents ("cond");
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2128
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2129 for (octave_idx_type i = 0; i < n_dbg; i++)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2130 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2131 if (file (i).string_value () == m_file_name.toStdString ())
25923 a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2132 do_breakpoint_marker (true, this, line (i).int_value (),
a7511a1489b8 call octave functions with return value from GUI (bug #47585) Torsten <mttl@mailbox.org> parents: 25914 diff changeset	2133 QString::fromStdString (cond (i).string_value ()));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2134 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2135 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2136
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2137 void file_editor_tab::new_file (const QString& commands)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2138 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2139 update_window_title (false); // window title (no modification)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2140
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2141 QSettings *settings = resource_manager::get_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2142
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2143 // set the eol mode from the settings or depending on the OS if the entry is
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2144 // missing in the settings
19245 f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19244 diff changeset	2145 #if defined (Q_OS_WIN32)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2146 int eol_mode = QsciScintilla::EolWindows;
19245 f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19244 diff changeset	2147 #else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2148 int eol_mode = QsciScintilla::EolUnix;
19245 f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19244 diff changeset	2149 #endif
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2150 m_edit_area->setEolMode (static_cast<QsciScintilla::EolMode> (settings->value ("editor/default_eol_mode",eol_mode).toInt ()));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2151
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2152 update_eol_indicator ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2153
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2154 update_lexer ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2155
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2156 m_edit_area->setText (commands);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2157 m_edit_area->setModified (false); // new file is not modified yet
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2158 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2159
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2160 // Force reloading of a file after it is saved.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2161 // This is needed to get the right line numbers for breakpoints (bug #46632).
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2162 bool file_editor_tab::exit_debug_and_clear (const QString& full_name_q,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2163 const QString& base_name_q)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2164 {
27375 2fb37768085d mark locations in GUI that should be checked for thread safety John W. Eaton <jwe@octave.org> parents: 27302 diff changeset	2165 // FIXME: the following does not appear to be thread safe.
2fb37768085d mark locations in GUI that should be checked for thread safety John W. Eaton <jwe@octave.org> parents: 27302 diff changeset	2166
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2167 interpreter& interp
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2168 = __get_interpreter__ ("file_editor_tab::exit_debug_and_clear");
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2169
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2170 symbol_table& symtab = interp.get_symbol_table ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2171
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2172 std::string base_name = base_name_q.toStdString ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2173 octave_value sym;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2174 try
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2175 {
26654 c54953342372 don't go through scope to find function in file editor John W. Eaton <jwe@octave.org> parents: 26624 diff changeset	2176 sym = symtab.find_user_function (base_name);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2177 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2178 catch (const execution_exception& e)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2179 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2180 // Ignore syntax error.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2181 // It was in the old file on disk; the user may have fixed it already.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2182 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2183
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2184 // Return early if this file is not loaded in the symbol table
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2185 if (! sym.is_defined () \|\| ! sym.is_user_code ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2186 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2187
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2188 octave_user_code *fcn = sym.user_code_value ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2189
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2190 std::string full_name = full_name_q.toStdString ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2191 if (sys::canonicalize_file_name (full_name.c_str ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2192 != sys::canonicalize_file_name (fcn->fcn_file_name ().c_str ()))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2193 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2194
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2195 // If this file is loaded, check that we aren't currently running it
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2196 bool retval = true;
27209 ac92aa74fa1a eliminate some direct access to call stack in gui and octave_base_value John W. Eaton <jwe@octave.org> parents: 27198 diff changeset	2197
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2198 octave_idx_type curr_frame = -1;
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2199
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2200 tree_evaluator& tw = interp.get_evaluator ();
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	2201
27209 ac92aa74fa1a eliminate some direct access to call stack in gui and octave_base_value John W. Eaton <jwe@octave.org> parents: 27198 diff changeset	2202 octave_map stk = tw.backtrace (curr_frame, false);
ac92aa74fa1a eliminate some direct access to call stack in gui and octave_base_value John W. Eaton <jwe@octave.org> parents: 27198 diff changeset	2203
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2204 Cell names = stk.contents ("name");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2205 for (octave_idx_type i = names.numel () - 1; i >= 0; i--)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2206 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2207 if (names(i).string_value () == base_name)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2208 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2209 int ans = QMessageBox::question (nullptr, tr ("Debug or Save"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2210 tr ("This file is currently being executed.\n"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2211 "Quit debugging and save?"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2212 QMessageBox::Save \| QMessageBox::Cancel);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2213
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2214 if (ans == QMessageBox::Save)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2215 {
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2216 emit debug_quit_signal ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2217
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27247 diff changeset	2218 // Wait until dbquit has actually occurred.
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2219 while (names.numel () > i)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2220 {
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27090 diff changeset	2221 sleep (0.01);
27209 ac92aa74fa1a eliminate some direct access to call stack in gui and octave_base_value John W. Eaton <jwe@octave.org> parents: 27198 diff changeset	2222 stk = tw.backtrace (curr_frame, false);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2223 names = stk.contents ("name");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2224 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2225 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2226 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2227 retval = false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2228 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2229 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2230 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2231
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2232 // If we aren't currently running it, or have quit above, force a reload.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2233 if (retval == true)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2234 symtab.clear_user_function (base_name);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2235
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2236 return retval;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2237 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2238
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2239 void file_editor_tab::save_file (const QString& saveFileName,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2240 bool remove_on_success,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2241 bool restore_breakpoints)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2242 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2243 // If it is a new file with no name, signal that saveFileAs
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2244 // should be performed.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2245 if (! valid_file_name (saveFileName))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2246 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2247 save_file_as (remove_on_success);
22181 acdd8983d308 Force reload of a function after it is saved in the editor (bug #46632) Lachlan Andrew <lachlanbis@gmail.com> parents: 22180 diff changeset	2248 return;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2249 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2250
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2251 m_encoding = m_new_encoding; // consider a possible new encoding
26393 1e3c42fbf4d3 Don't overwrite content of non-encodable .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	2252
1e3c42fbf4d3 Don't overwrite content of non-encodable .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	2253 // set the desired codec (if suitable for contents)
1e3c42fbf4d3 Don't overwrite content of non-encodable .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	2254 QTextCodec *codec = check_valid_codec ();
1e3c42fbf4d3 Don't overwrite content of non-encodable .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	2255 if (! codec)
1e3c42fbf4d3 Don't overwrite content of non-encodable .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	2256 return; // No valid codec
1e3c42fbf4d3 Don't overwrite content of non-encodable .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	2257
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2258 // Get a list of breakpoint line numbers, before exit_debug_and_clear().
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2259 emit report_marker_linenr (m_bp_lines, m_bp_conditions);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2260
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2261 // get the absolute path (if existing)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2262 QFileInfo file_info = QFileInfo (saveFileName);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2263 QString file_to_save;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2264 if (file_info.exists ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2265 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2266 file_to_save = file_info.canonicalFilePath ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2267 // Force reparse of this function next time it is used (bug #46632)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2268 if ((Fisdebugmode ())(0).is_true ()
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2269 && ! exit_debug_and_clear (file_to_save, file_info.baseName ()))
23892 ba46a8015b26 close editor tab when related file is deleted in file browser (bug #43922) Torsten <mttl@mailbox.org> parents: 23810 diff changeset	2270 return;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2271 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2272 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2273 file_to_save = saveFileName;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2274 QFile file (file_to_save);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2275
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2276 // stop watching file
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2277 QStringList trackedFiles = m_file_system_watcher.files ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2278 if (trackedFiles.contains (file_to_save))
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2279 m_file_system_watcher.removePath (file_to_save);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2280
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2281 // open the file for writing
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2282 if (! file.open (QIODevice::WriteOnly))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2283 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2284 // Unsuccessful, begin watching file again if it was being
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2285 // watched previously.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2286 if (trackedFiles.contains (file_to_save))
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2287 m_file_system_watcher.addPath (file_to_save);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2288
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2289 // Create a NonModal message about error.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2290 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2291 = new QMessageBox (QMessageBox::Critical,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2292 tr ("Octave Editor"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2293 tr ("Could not open file %1 for write:\n%2.").
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2294 arg (file_to_save).arg (file.errorString ()),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2295 QMessageBox::Ok, nullptr);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2296 show_dialog (msgBox, false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2297
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2298 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2299 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2300
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2301 // save the contents into the file
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2302
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2303 // write the file
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2304 QTextStream out (&file);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2305 out.setCodec (codec);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2306
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2307 QApplication::setOverrideCursor (Qt::WaitCursor);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2308 out << m_edit_area->text ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2309 out.flush ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2310 QApplication::restoreOverrideCursor ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2311 file.flush ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2312 file.close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2313
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2314 // file exists now
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2315 file_info = QFileInfo (file);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2316 file_to_save = file_info.canonicalFilePath ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2317
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2318 // save filename after closing file as set_file_name starts watching again
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2319 set_file_name (file_to_save); // make absolute
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2320
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2321 // set the window title to actual filename (not modified)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2322 update_window_title (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2323
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2324 // files is save -> not modified, update encoding in statusbar
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2325 m_edit_area->setModified (false);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2326 m_enc_indicator->setText (m_encoding);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2327
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2328 if (remove_on_success)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2329 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2330 emit tab_remove_request ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2331 return; // Don't touch member variables after removal
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2332 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2333
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2334 // Attempt to restore the breakpoints if that is desired.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2335 // This is only allowed if the tab is not closing since changing
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2336 // breakpoints would reopen the tab in this case.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2337 if (restore_breakpoints)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2338 check_restore_breakpoints ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2339 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2340
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2341 void file_editor_tab::save_file_as (bool remove_on_success)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2342 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2343 // Simply put up the file chooser dialog box with a slot connection
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2344 // then return control to the system waiting for a file selection.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2345
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2346 // reset m_new_encoding
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2347 m_new_encoding = m_encoding;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2348
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2349 // If the tab is removed in response to a QFileDialog signal, the tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2350 // can't be a parent.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2351 QFileDialog *fileDialog;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2352 if (remove_on_success)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2353 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2354 // If tab is closed, "this" cannot be parent in which case modality
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2355 // has no effect. Disable editing instead.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2356 m_edit_area->setReadOnly (true);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2357 fileDialog = new QFileDialog ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2358 }
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	2359 else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2360 fileDialog = new QFileDialog (this);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2361
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2362 // add the possible filters and the default suffix
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2363 QStringList filters;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2364 filters << tr ("Octave Files (*.m)")
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2365 << tr ("All Files (*)");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2366 fileDialog->setNameFilters (filters);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2367 fileDialog->setDefaultSuffix ("m");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2368
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2369 if (valid_file_name ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2370 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2371 fileDialog->selectFile (m_file_name);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2372 QFileInfo file_info (m_file_name);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2373 if (file_info.suffix () != "m")
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	2374 {
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	2375 // it is not an octave file
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2376 fileDialog->selectNameFilter (filters.at (1)); // "All Files"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2377 fileDialog->setDefaultSuffix (""); // no default suffix
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2378 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2379 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2380 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2381 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2382 fileDialog->selectFile ("");
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2383 fileDialog->setDirectory (m_ced);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2384
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2385 // propose a name corresponding to the function name
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2386 QString fname = get_function_name ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2387 if (! fname.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2388 fileDialog->selectFile (fname + ".m");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2389 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2390
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2391 fileDialog->setAcceptMode (QFileDialog::AcceptSave);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2392 fileDialog->setViewMode (QFileDialog::Detail);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2393
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26065 diff changeset	2394 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26065 diff changeset	2395 if (! resource_manager::get_settings ()->value ("use_native_file_dialogs",
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26065 diff changeset	2396 true).toBool ())
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26065 diff changeset	2397 fileDialog->setOption(QFileDialog::DontUseNativeDialog);
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26065 diff changeset	2398
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2399 connect (fileDialog, SIGNAL (filterSelected (const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2400 this, SLOT (handle_save_as_filter_selected (const QString&)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2401
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2402 if (remove_on_success)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2403 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2404 connect (fileDialog, SIGNAL (fileSelected (const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2405 this, SLOT (handle_save_file_as_answer_close (const QString&)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2406
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2407 connect (fileDialog, SIGNAL (rejected ()),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2408 this, SLOT (handle_save_file_as_answer_cancel ()));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2409 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2410 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2411 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2412 connect (fileDialog, SIGNAL (fileSelected (const QString&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2413 this, SLOT (handle_save_file_as_answer (const QString&)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2414 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2415
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2416 show_dialog (fileDialog, ! valid_file_name ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2417 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2418
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2419 void file_editor_tab::handle_save_as_filter_selected (const QString& filter)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2420 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2421 QFileDialog file_dialog = qobject_cast<QFileDialog > (sender ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2422
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2423 QRegExp rx ("\\\\.([^ ^\\)])[ \\)]"); // regexp for suffix in filter
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2424 int index = rx.indexIn (filter,0); // get first suffix in filter
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2425
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2426 if (index > -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2427 file_dialog->setDefaultSuffix (rx.cap (1)); // found a suffix, set default
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2428 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2429 file_dialog->setDefaultSuffix (""); // not found, clear default
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2430 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2431
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2432 bool file_editor_tab::check_valid_identifier (QString file_name)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2433 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2434 QFileInfo file = QFileInfo (file_name);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2435 QString base_name = file.baseName ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2436
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2437 if ((file.suffix () == "m")
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2438 && (! valid_identifier (base_name.toStdString ())))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2439 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2440 int ans = QMessageBox::question (nullptr, tr ("Octave Editor"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2441 tr ("\"%1\"\n"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2442 "is not a valid identifier.\n\n"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2443 "If you keep this filename, you will not be able to\n"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2444 "call your script using its name as an Octave command.\n\n"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2445 "Do you want to choose another name?").arg (base_name),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2446 QMessageBox::Yes \| QMessageBox::No, QMessageBox::Yes);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2447
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2448 if (ans == QMessageBox::Yes)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2449 return true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2450 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2451
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2452 return false;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2453 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2454
26291 f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	2455 QTextCodec* file_editor_tab::check_valid_codec ()
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2456 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2457 QTextCodec *codec = QTextCodec::codecForName (m_encoding.toLatin1 ());
26291 f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	2458
27272 9de4741a896e Do not ignore user preferences for locale encoding on non-Windows platforms. Markus Mützel <markus.muetzel@gmx.de> parents: 27271 diff changeset	2459 // "SYSTEM" is used as alias for the locale encoding.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2460 if ((! codec) && m_encoding.startsWith("SYSTEM"))
26291 f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	2461 codec = QTextCodec::codecForLocale ();
f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	2462
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2463 if (! codec)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2464 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2465 QMessageBox::critical (nullptr,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2466 tr ("Octave Editor"),
25062 32a7222d637a [mq]: tr Rik <rik@octave.org> parents: 25054 diff changeset	2467 tr ("The current encoding %1\n"
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2468 "can not be applied.\n\n"
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2469 "Please select another one!").arg (m_encoding));
26291 f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	2470
f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	2471 return nullptr;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2472 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2473
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2474 QString editor_text = m_edit_area->text ();
26331 5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2475 bool can_encode = codec->canEncode (editor_text);
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2476
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2477 // We cannot rely on QTextCodec::canEncode because it uses the
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2478 // ConverterState of convertFromUnicode which isn't updated by some
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2479 // implementations.
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2480 if (can_encode)
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2481 {
26346 fd890481c408 file-editor-tab.cc: Use function available since Qt4.2. Markus Mützel <markus.muetzel@gmx.de> parents: 26331 diff changeset	2482 QVector<uint> u32_str = editor_text.toUcs4 ();
26331 5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2483 const uint32_t src = reinterpret_cast<const uint32_t >
26346 fd890481c408 file-editor-tab.cc: Use function available since Qt4.2. Markus Mützel <markus.muetzel@gmx.de> parents: 26331 diff changeset	2484 (u32_str.data ());
26331 5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2485
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2486 size_t length;
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2487 char *res_str =
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2488 octave_u32_conv_to_encoding_strict (m_encoding.toStdString ().c_str (),
26429 ba8493779dc8 file-editor-tab.cc: Revert accidental change in 1e3c42fbf4d3. Markus Mützel <markus.muetzel@gmx.de> parents: 26394 diff changeset	2489 src, u32_str.size (), &length);
26331 5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2490 if (! res_str)
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2491 {
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2492 if (errno == EILSEQ)
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2493 can_encode = false;
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2494 }
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2495 else
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2496 ::free (static_cast<void *> (res_str));
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2497 }
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2498
5f10217b562d Use gnulib to check if encoding is possible (bug #55306). Markus Mützel <markus.muetzel@gmx.de> parents: 26291 diff changeset	2499 if (! can_encode)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2500 {
26394 6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2501 QMessageBox::StandardButton pressed_button
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2502 = QMessageBox::critical (nullptr,
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2503 tr ("Octave Editor"),
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2504 tr ("The current editor contents can not be encoded\n"
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2505 "with the selected encoding %1.\n"
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2506 "Using it would result in data loss!\n\n"
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2507 "Please select another one!").arg (m_encoding),
26394 6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2508 QMessageBox::Cancel \| QMessageBox::Ignore,
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2509 QMessageBox::Cancel);
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2510
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2511 if (pressed_button == QMessageBox::Ignore)
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2512 return codec;
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2513 else
6323979ee312 Optionally, ignore data loss when saving .m file (bug #55364). Markus Mützel <markus.muetzel@gmx.de> parents: 26393 diff changeset	2514 return nullptr;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2515 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2516
26291 f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	2517 return codec;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2518 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2519
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2520 void file_editor_tab::handle_save_file_as_answer (const QString& saveFileName)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2521 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2522 if (m_save_as_desired_eol != m_edit_area->eolMode ())
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2523 convert_eol (this,m_save_as_desired_eol);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2524
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2525 if (saveFileName == m_file_name)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2526 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2527 save_file (saveFileName);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2528 }
16702 553cfdd5d660 make white space visibility in the editor configurable Torsten <ttl@justmail.de> parents: 16701 diff changeset	2529 else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2530 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2531 // Have editor check for conflict, do not delete tab after save.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2532 if (check_valid_identifier (saveFileName))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2533 save_file_as (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2534 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2535 emit editor_check_conflict_save (saveFileName, false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2536 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2537 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2538
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2539 void file_editor_tab::handle_save_file_as_answer_close (const QString& saveFileName)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2540 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2541 if (m_save_as_desired_eol != m_edit_area->eolMode ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2542 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2543 m_edit_area->setReadOnly (false); // was set to read-only in save_file_as
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2544 convert_eol (this,m_save_as_desired_eol);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2545 m_edit_area->setReadOnly (true); // restore read-only mode
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2546 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2547
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2548 // saveFileName == m_file_name can not happen, because we only can get here
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2549 // when we close a tab and m_file_name is not a valid filename yet
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2550
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2551 // Have editor check for conflict, delete tab after save.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2552 if (check_valid_identifier (saveFileName))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2553 save_file_as (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2554 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2555 emit editor_check_conflict_save (saveFileName, true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2556 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2557
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2558 void file_editor_tab::handle_save_file_as_answer_cancel (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2559 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2560 // User canceled, allow editing again.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2561 m_edit_area->setReadOnly (false);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2562 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2563
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2564 void file_editor_tab::file_has_changed (const QString&, bool do_close)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2565 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2566 bool file_exists = QFile::exists (m_file_name);
25369 c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2567
25741 a3f2b06c599a fix broken file closing when deleted/renamed in file browser Torsten <mttl@mailbox.org> parents: 25646 diff changeset	2568 if (file_exists && ! do_close)
25369 c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2569 {
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2570 // Test if file is really modified or if just the timezone has
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2571 // changed. In the latter, just return without doing anything
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2572 QDateTime modified = QFileInfo (m_file_name).lastModified ().toUTC ();
25369 c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2573
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2574 if (modified <= m_last_modified)
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2575 return;
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2576
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2577 m_last_modified = modified;
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2578 }
c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2579
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2580 // Prevent popping up multiple message boxes when the file has
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2581 // been changed multiple times by temporarily removing from the
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2582 // file watcher.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2583 QStringList trackedFiles = m_file_system_watcher.files ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2584 if (! trackedFiles.isEmpty ())
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2585 m_file_system_watcher.removePath (m_file_name);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2586
25369 c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2587 if (file_exists && ! do_close)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2588 {
25369 c89fa0989e7b prevent notifications on externally changed editor files (bug 53539) Torsten <mttl@mailbox.org> parents: 25336 diff changeset	2589
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2590 // The file is modified
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2591 if (m_always_reload_changed_files)
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2592 load_file (m_file_name);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2593
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2594 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2595 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2596 // give editor and this tab the focus,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2597 // possibly making the editor visible if it is hidden
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2598 emit set_focus_editor_signal (this);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2599 m_edit_area->setFocus ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2600
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2601 // Create a WindowModal message that blocks the edit area
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2602 // by making m_edit_area parent.
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2603 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2604 = new QMessageBox (QMessageBox::Warning,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2605 tr ("Octave Editor"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2606 tr ("It seems that \'%1\' has been modified by another application. Do you want to reload it?").
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2607 arg (m_file_name),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2608 QMessageBox::Yes \| QMessageBox::No, this);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2609
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2610 connect (msgBox, SIGNAL (finished (int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2611 this, SLOT (handle_file_reload_answer (int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2612
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2613 msgBox->setWindowModality (Qt::WindowModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2614 msgBox->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2615 msgBox->show ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2616 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2617 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2618 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2619 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2620 // If desired and if file is not modified,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2621 // close the file without any user interaction
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2622 if (do_close && ! m_edit_area->isModified ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2623 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2624 handle_file_resave_answer (QMessageBox::Cancel);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2625 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2626 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2627
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2628 // give editor and this tab the focus,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2629 // possibly making the editor visible if it is hidden
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2630 emit set_focus_editor_signal (this);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2631 m_edit_area->setFocus ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2632
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2633 QString modified = "";
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2634 if (m_edit_area->isModified ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2635 modified = tr ("\n\nWarning: The contents in the editor is modified!");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2636
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2637 // Create a WindowModal message. The file editor tab can't be made
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2638 // parent because it may be deleted depending upon the response.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2639 // Instead, change the m_edit_area to read only.
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2640 QMessageBox *msgBox
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2641 = new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2642 tr ("It seems that the file\n"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2643 "%1\n"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2644 "has been deleted or renamed. Do you want to save it now?%2").
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2645 arg (m_file_name).arg (modified),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2646 QMessageBox::Save \| QMessageBox::Close, nullptr);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2647
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2648 m_edit_area->setReadOnly (true);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2649
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2650 connect (msgBox, SIGNAL (finished (int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2651 this, SLOT (handle_file_resave_answer (int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2652
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2653 msgBox->setWindowModality (Qt::WindowModal);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2654 msgBox->setAttribute (Qt::WA_DeleteOnClose);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2655 msgBox->show ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2656 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2657 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2658
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2659 void file_editor_tab::notice_settings (const QSettings *settings, bool init)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2660 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2661 // QSettings pointer is checked before emitting.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2662
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2663 if (! init)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2664 update_lexer_settings ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2665
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2666 // code folding
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2667 if (settings->value ("editor/code_folding",true).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2668 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2669 m_edit_area->setMarginType (3, QsciScintilla::SymbolMargin);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2670 m_edit_area->setFolding (QsciScintilla::BoxedTreeFoldStyle , 3);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2671 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2672 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2673 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2674 m_edit_area->setFolding (QsciScintilla::NoFoldStyle, 3);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2675 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2676
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2677 // status bar
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2678 if (settings->value ("editor/show_edit_status_bar",true).toBool ())
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2679 m_status_bar->show ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2680 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2681 m_status_bar->hide ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2682
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2683 //highlight current line color
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2684 QVariant default_var = QColor (240, 240, 240);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2685 QColor setting_color = settings->value ("editor/highlight_current_line_color",
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2686 default_var).value<QColor> ();
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2687 m_edit_area->setCaretLineBackgroundColor (setting_color);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2688 m_edit_area->setCaretLineVisible
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2689 (settings->value ("editor/highlightCurrentLine", true).toBool ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2690
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2691 bool match_keywords = settings->value
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	2692 ("editor/codeCompletion_keywords",true).toBool ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2693 bool match_document = settings->value
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	2694 ("editor/codeCompletion_document",true).toBool ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2695
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2696 QsciScintilla::AutoCompletionSource source = QsciScintilla::AcsNone;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2697 if (match_keywords)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2698 if (match_document)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2699 source = QsciScintilla::AcsAll;
23996 a5b20fc6588a editor: more consistent behavior of lon line marker settings in (bug #51872) Torsten <mttl@mailbox.org> parents: 23905 diff changeset	2700 else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2701 source = QsciScintilla::AcsAPIs;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2702 else if (match_document)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2703 source = QsciScintilla::AcsDocument;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2704 m_edit_area->setAutoCompletionSource (source);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2705
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2706 m_edit_area->setAutoCompletionReplaceWord
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2707 (settings->value ("editor/codeCompletion_replace",false).toBool ());
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2708 m_edit_area->setAutoCompletionCaseSensitivity
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2709 (settings->value ("editor/codeCompletion_case",true).toBool ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2710
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2711 if (settings->value ("editor/codeCompletion", true).toBool ())
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2712 m_edit_area->setAutoCompletionThreshold
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2713 (settings->value ("editor/codeCompletion_threshold",2).toInt ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2714 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2715 m_edit_area->setAutoCompletionThreshold (-1);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2716
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2717 if (settings->value ("editor/show_white_space",false).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2718 if (settings->value ("editor/show_white_space_indent",false).toBool ())
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2719 m_edit_area->setWhitespaceVisibility (QsciScintilla::WsVisibleAfterIndent);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2720 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2721 m_edit_area->setWhitespaceVisibility (QsciScintilla::WsVisible);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2722 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2723 m_edit_area->setWhitespaceVisibility (QsciScintilla::WsInvisible);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2724
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2725 m_edit_area->setEolVisibility (settings->value ("editor/show_eol_chars",false).toBool ());
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2726
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2727 if (settings->value ("editor/showLineNumbers", true).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2728 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2729 m_edit_area->setMarginLineNumbers (2, true);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2730 auto_margin_width ();
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2731 connect (m_edit_area, SIGNAL (linesChanged ()),
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2732 this, SLOT (auto_margin_width ()));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2733 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2734 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2735 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2736 m_edit_area->setMarginLineNumbers (2, false);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2737 disconnect (m_edit_area, SIGNAL (linesChanged ()), nullptr, nullptr);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2738 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2739
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2740 m_smart_indent = settings->value ("editor/auto_indent",true).toBool ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2741 m_edit_area->setAutoIndent (m_smart_indent);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2742 m_edit_area->setTabIndents
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2743 (settings->value ("editor/tab_indents_line",false).toBool ());
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2744 m_edit_area->setBackspaceUnindents
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2745 (settings->value ("editor/backspace_unindents_line",false).toBool ());
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2746 m_edit_area->setIndentationGuides
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2747 (settings->value ("editor/show_indent_guides",false).toBool ());
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2748 m_edit_area->setIndentationsUseTabs
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2749 (settings->value ("editor/indent_uses_tabs",false).toBool ());
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2750 m_edit_area->setIndentationWidth
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2751 (settings->value ("editor/indent_width",2).toInt ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2752
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2753 m_edit_area->setTabWidth
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2754 (settings->value ("editor/tab_width",2).toInt ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2755
27198 dffdabfd0213 fix cursor position for editor smart indent after keyword (bug #56533) Torsten Lilge <ttl-octave@mailbox.org> parents: 27160 diff changeset	2756 m_ind_char_width = 1;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2757 if (m_edit_area->indentationsUseTabs ())
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2758 m_ind_char_width = m_edit_area->tabWidth ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2759
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2760 m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETHSCROLLBAR,
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2761 settings->value ("editor/show_hscroll_bar",true).toBool ());
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2762 m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETSCROLLWIDTH,-1);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2763 m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETSCROLLWIDTHTRACKING,true);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2764
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2765 m_long_title = settings->value ("editor/longWindowTitle", false).toBool ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2766 update_window_title (m_edit_area->isModified ());
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2767
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2768 m_auto_endif = settings->value ("editor/auto_endif",1).toInt ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2769
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2770 // long line marker
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2771 int line_length = settings->value ("editor/long_line_column",80).toInt ();
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2772 m_edit_area->setEdgeColumn (line_length);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2773
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2774 if (settings->value ("editor/long_line_marker",true).toBool ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2775 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2776 if (settings->value ("editor/long_line_marker_line",true).toBool ())
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2777 m_edit_area->setEdgeMode (QsciScintilla::EdgeLine);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2778 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2779 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2780 if (settings->value ("editor/long_line_marker_background",false)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2781 .toBool ())
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2782 m_edit_area->setEdgeMode (QsciScintilla::EdgeBackground);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2783 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2784 m_edit_area->setEdgeMode (QsciScintilla::EdgeLine);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2785 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2786 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2787 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2788 m_edit_area->setEdgeMode (QsciScintilla::EdgeNone);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2789
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2790 // line wrapping and breaking
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2791 m_edit_area->setWrapVisualFlags (QsciScintilla::WrapFlagByBorder);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2792 m_edit_area->setWrapIndentMode (QsciScintilla::WrapIndentSame);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2793
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2794 if (settings->value ("editor/wrap_lines",false).toBool ())
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2795 m_edit_area->setWrapMode (QsciScintilla::WrapWord);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2796 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2797 m_edit_area->setWrapMode (QsciScintilla::WrapNone);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2798
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2799 if (settings->value ("editor/break_lines",false).toBool ())
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2800 m_line_break = line_length;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2801 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2802 m_line_break = 0;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2803
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2804 m_line_break_comments =
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2805 settings->value ("editor/break_lines_comments",false).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2806
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2807 // highlight all occurrences of a word selected by a double click
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2808 m_highlight_all_occurrences =
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2809 settings->value ("editor/highlight_all_occurrences", true).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2810
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2811 // reload changed files
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2812 m_always_reload_changed_files =
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2813 settings->value ("editor/always_reload_changed_files",false).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2814
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2815 // Set cursor blinking depending on the settings.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2816 // QScintilla ignores the application global settings, so some special
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2817 // handling is required
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2818 bool cursor_blinking;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2819
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2820 if (settings->contains ("cursor_blinking"))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2821 cursor_blinking = settings->value ("cursor_blinking",true).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2822 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2823 cursor_blinking = settings->value ("terminal/cursorBlinking",true).toBool ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2824
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2825 if (cursor_blinking)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2826 m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETCARETPERIOD,500);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2827 else
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2828 m_edit_area->SendScintilla (QsciScintillaBase::SCI_SETCARETPERIOD,0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2829
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2830 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2831
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2832
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2833 void file_editor_tab::auto_margin_width (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2834 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2835 m_edit_area->setMarginWidth (2, "1" + QString::number (m_edit_area->lines ()));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2836 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2837
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2838 // the following close request was changed from a signal slot into a
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2839 // normal function because we need the return value from close whether
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2840 // the tab really was closed (for canceling exiting octave).
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2841 // When emitting a signal, only the return value from the last slot
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2842 // goes back to the sender
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2843 bool file_editor_tab::conditional_close (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2844 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2845 return close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2846 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2847
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2848 void file_editor_tab::change_editor_state (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2849 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2850 if (ID != this)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2851 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2852 // Widget may be going out of focus. If so, record location.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2853 if (m_find_dialog)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2854 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2855 if (m_find_dialog->isVisible ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2856 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2857 m_find_dlg_data.geometry = m_find_dialog->geometry ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2858 m_find_dialog->hide ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2859 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2860 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2861 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2862 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2863
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2864 if (m_find_dialog && m_find_dlg_data.is_visible)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2865 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2866 m_find_dialog->setGeometry (m_find_dlg_data.geometry);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2867 QPoint p = m_find_dialog->pos ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2868 m_find_dialog->move (p.x ()+10, p.y ()+10);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2869 m_find_dialog->show ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2870 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2871
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2872 emit editor_state_changed (m_copy_available, m_is_octave_file);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2873 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2874
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2875 void file_editor_tab::file_name_query (const QWidget *ID)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2876 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2877 // A zero (null pointer) means that all file editor tabs
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2878 // should respond, otherwise just the desired file editor tab.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2879 if (ID != this && ID != nullptr)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	2880 return;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2881
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2882 // This list also includes windows with name ""
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2883 emit add_filename_to_list (m_file_name, m_encoding, this);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2884 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2885
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2886 void file_editor_tab::handle_file_reload_answer (int decision)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2887 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2888 if (decision == QMessageBox::Yes)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2889 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2890 // reload: file is readded to the file watcher in set_file_name ()
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2891 load_file (m_file_name);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2892 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2893 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2894 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2895 // do not reload: readd to the file watche
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2896 m_file_system_watcher.addPath (m_file_name);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2897 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2898 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2899
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2900 void file_editor_tab::handle_file_resave_answer (int decision)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2901 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2902 // check decision of user in dialog
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2903 if (decision == QMessageBox::Save)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2904 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2905 save_file (m_file_name); // readds file to watcher in set_file_name ()
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2906 m_edit_area->setReadOnly (false); // delete read only flag
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2907 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2908 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2909 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2910 // Definitely close the file.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2911 // Set modified to false to prevent the dialog box when the close event
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2912 // is posted. If the user cancels the close in this dialog the tab is
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2913 // left open with a non-existing file.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2914 m_edit_area->setModified (false);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2915 close ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2916 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2917 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2918
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2919 void file_editor_tab::insert_debugger_pointer (const QWidget *ID, int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2920 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2921 if (ID != this \|\| ID == nullptr)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2922 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2923
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2924 emit remove_all_positions (); // debugger_position, unsure_debugger_position
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2925
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2926 if (line > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2927 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2928 marker *dp;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2929
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2930 if (m_edit_area->isModified ())
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2931 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2932 // The best that can be done if the editor contents has been
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2933 // modified is to see if there is a match with the original
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2934 // line number of any existing breakpoints. We can put a normal
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2935 // debugger pointer at that breakpoint position. Otherwise, it
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2936 // isn't certain whether the original line number and current line
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2937 // number match.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2938 int editor_linenr = -1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2939 marker *dummy;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2940 emit find_translated_line_number (line, editor_linenr, dummy);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2941 if (editor_linenr != -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2942 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2943 // Match with an existing breakpoint.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2944 dp = new marker (m_edit_area, line,
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2945 marker::debugger_position, editor_linenr);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2946 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2947 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2948 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2949 int original_linenr = -1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2950 editor_linenr = -1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2951 emit find_linenr_just_before (line, original_linenr, editor_linenr);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2952 if (original_linenr >= 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2953 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2954 // Make a guess by using an offset from the breakpoint.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2955 int linenr_guess = editor_linenr + line - original_linenr;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2956 dp = new marker (m_edit_area, line,
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2957 marker::unsure_debugger_position,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2958 linenr_guess);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2959 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2960 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2961 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2962 // Can't make a very good guess, so just use the debugger
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2963 // line number.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2964 dp = new marker (m_edit_area, line,
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2965 marker::unsure_debugger_position);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2966 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2967 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2968 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2969 else
27008 e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2970 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	2971 dp = new marker (m_edit_area, line, marker::debugger_position);
27008 e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2972
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2973 // In case of a not modified file we might have to remove
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2974 // a breakpoint here if we have stepped into the file
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2975 if (line == m_breakpoint_info.remove_line)
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2976 {
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2977 m_breakpoint_info.remove_line = -1;
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2978 if (line != m_breakpoint_info.do_not_remove_line)
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2979 handle_request_remove_breakpoint (line);
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2980 }
e93b8887fedf remove additionally added breakpoint when stepping into a file (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26975 diff changeset	2981 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2982
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2983 connect (this, SIGNAL (remove_position_via_debugger_linenr (int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2984 dp, SLOT (handle_remove_via_original_linenr (int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2985 connect (this, SIGNAL (remove_all_positions (void)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2986 dp, SLOT (handle_remove (void)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2987
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2988 center_current_line (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2989 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2990 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2991
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2992 void file_editor_tab::delete_debugger_pointer (const QWidget *ID, int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2993 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2994 if (ID != this \|\| ID == nullptr)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2995 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2996
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2997 if (line > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2998 emit remove_position_via_debugger_linenr (line);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	2999 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3000
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3001 void file_editor_tab::do_breakpoint_marker (bool insert,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3002 const QWidget *ID, int line,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3003 const QString& cond)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3004 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3005 if (ID != this \|\| ID == nullptr)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3006 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3007
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3008 if (line > 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3009 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3010 if (insert)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3011 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3012 int editor_linenr = -1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3013 marker *bp = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3014
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3015 // If comes back indicating a non-zero breakpoint marker,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3016 // reuse it if possible
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3017 emit find_translated_line_number (line, editor_linenr, bp);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3018 if (bp != nullptr)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3019 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3020 if ((cond == "") != (bp->get_cond () == ""))
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	3021 {
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	3022 // can only reuse conditional bp as conditional
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3023 emit remove_breakpoint_via_debugger_linenr (line);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3024 bp = nullptr;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3025 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3026 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3027 bp->set_cond (cond);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3028 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3029
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3030 if (bp == nullptr)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3031 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3032 bp = new marker (m_edit_area, line,
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3033 cond == "" ? marker::breakpoint
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3034 : marker::cond_break, cond);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3035
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3036 connect (this, SIGNAL (remove_breakpoint_via_debugger_linenr
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3037 (int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3038 bp, SLOT (handle_remove_via_original_linenr (int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3039 connect (this, SIGNAL (request_remove_breakpoint_via_editor_linenr
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3040 (int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3041 bp, SLOT (handle_request_remove_via_editor_linenr
21651 b4354327d2b5 dbstop: Fix confusion when breakpoints are changed by the GUI (bug #47675) Lachlan Andrew <lachlanbis@gmail.com> parents: 21578 diff changeset	3042 (int)));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3043 connect (this, SIGNAL (remove_all_breakpoints (void)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3044 bp, SLOT (handle_remove (void)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3045 connect (this, SIGNAL (find_translated_line_number (int, int&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3046 marker*&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3047 bp, SLOT (handle_find_translation (int, int&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3048 marker*&)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3049 connect (this, SIGNAL (find_linenr_just_before (int, int&, int&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3050 bp, SLOT (handle_find_just_before (int, int&, int&)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3051 connect (this, SIGNAL (report_marker_linenr (QIntList&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3052 QStringList&)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3053 bp, SLOT (handle_report_editor_linenr (QIntList&,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3054 QStringList&)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3055 connect (bp, SIGNAL (request_remove (int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3056 this, SLOT (handle_request_remove_breakpoint (int)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3057 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3058 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3059 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3060 emit remove_breakpoint_via_debugger_linenr (line);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3061 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3062 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3063
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3064 void file_editor_tab::center_current_line (bool always)
23181 78f04a9dfeee allow line breaking in the editor (bug #41555) Torsten <mttl@mailbox.org> parents: 23179 diff changeset	3065 {
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3066 long int visible_lines
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3067 = m_edit_area->SendScintilla (QsciScintillaBase::SCI_LINESONSCREEN);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3068
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3069 if (visible_lines > 2)
23237 904c8a356e76 provide the possibility for breaking lines only in comments (bug #41555) Torsten <mttl@mailbox.org> parents: 23236 diff changeset	3070 {
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3071 int line, index;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3072 m_edit_area->getCursorPosition (&line, &index);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3073 // compensate for "folding":
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3074 // step 1: expand the current line, if it was folded
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3075 m_edit_area->SendScintilla (2232, line); // SCI_ENSUREVISIBLE
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3076
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3077 // step 2: map file line num to "visible" one // SCI_VISIBLEFROMDOCLINE
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3078 int vis_line = m_edit_area->SendScintilla (2220, line);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3079
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3080 int first_line = m_edit_area->firstVisibleLine ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3081
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3082 if (always \|\| vis_line == first_line
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3083 \|\| vis_line > first_line + visible_lines - 2)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3084 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3085 first_line += (vis_line - first_line - (visible_lines - 1) / 2);
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3086 m_edit_area->SendScintilla (2613, first_line); // SCI_SETFIRSTVISIBLELINE
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3087 }
23237 904c8a356e76 provide the possibility for breaking lines only in comments (bug #41555) Torsten <mttl@mailbox.org> parents: 23236 diff changeset	3088 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3089 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3090
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3091 void file_editor_tab::handle_lines_changed (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3092 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3093 // the related signal is emitted before cursor-move-signal!
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3094 m_lines_changed = true;
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3095 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3096
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3097 void file_editor_tab::handle_cursor_moved (int line, int col)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3098 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3099 if (m_edit_area->SendScintilla (QsciScintillaBase::SCI_AUTOCACTIVE))
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3100 show_auto_completion (this);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3101
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3102 if (m_lines_changed) // cursor moved and lines have changed
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3103 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3104 m_lines_changed = false;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3105 if (m_is_octave_file && line == m_line+1 && col < m_col)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3106 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3107 // Obviously, we have a newline here
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3108 if (m_smart_indent \|\| m_auto_endif)
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3109 m_edit_area->smart_indent (m_smart_indent, m_auto_endif,
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3110 m_line, m_ind_char_width);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3111 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3112 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3113
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3114 m_line = line;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3115 m_col = col;
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3116
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3117 m_row_indicator->setNum (line+1);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3118 m_col_indicator->setNum (col+1);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3119 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3120
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3121 // Slot that is entered each time a new character was typed.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3122 // It is used for handling line breaking if this is desired.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3123 // The related signal is emitted after the signal for a moved cursor
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3124 // such that m_col and m_line can not be used for current position.
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3125 void file_editor_tab::handle_char_added (int)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3126 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3127 if (m_line_break)
23181 78f04a9dfeee allow line breaking in the editor (bug #41555) Torsten <mttl@mailbox.org> parents: 23179 diff changeset	3128 {
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3129 // If line breaking is desired, get the current line and column.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3130 // For taking the tab width into consideration, use own function
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3131 int line, col, pos;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3132 m_edit_area->get_current_position (&pos, &line, &col);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3133
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3134 // immediately return if line has not reached the max. line length
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3135 if (col <= m_line_break)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3136 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3137
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3138 // If line breaking is only desired in comments,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3139 // return if not in a comment
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3140 int style_comment = octave_qscintilla::ST_NONE;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3141 if (m_line_break_comments)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3142 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3143 // line breaking only in comments, check for comment style
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3144 style_comment = m_edit_area->is_style_comment ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3145 if (! style_comment)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3146 return; // no comment, return
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3147 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3148
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3149 // Here we go for breaking the current line by inserting a newline.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3150 // For determining the position of a specific column, we have to get
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3151 // the column from the QScintila function without taking tab lengths
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3152 // into account, since the calculation from line/col to position ignores
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3153 // this, too
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3154 m_edit_area->getCursorPosition (&line, &col);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3155 int c = 0;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3156 int col_space = col;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3157 int indentation = m_edit_area->indentation (line);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3158
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3159 // Search the first occurence of space or tab backwards starting from
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3160 // the current column (col_space).
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3161 while (c != ' ' && c != '\t' && col_space > indentation)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3162 {
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3163 pos = m_edit_area->positionFromLineIndex (line, col_space--);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3164 c = m_edit_area->SendScintilla (QsciScintillaBase::SCI_GETCHARAT, pos);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3165 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3166
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3167 // If a space or tab was found, break at this char,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3168 // otherwise break at cursor position
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3169 int col_newline = col - 1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3170 if (c == ' ' \|\| c == '\t')
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3171 col_newline = col_space + 1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3172
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3173 // Insert a newline char for breaking the line possibly followed
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3174 // by a line comment string
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3175 QString newline = QString ("\n");
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3176 style_comment = m_edit_area->is_style_comment ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3177 if (style_comment == octave_qscintilla::ST_LINE_COMMENT)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3178 newline = newline + m_edit_area->comment_string ().at (0);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3179 m_edit_area->insertAt (newline, line, col_newline);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3180
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3181 // Automatically indent the new line to the indentation of previous line
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3182 // and set the cursor position to the end of the indentation.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3183 m_edit_area->setIndentation (line + 1, indentation);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3184 m_edit_area->SendScintilla (QsciScintillaBase::SCI_LINEEND);
23181 78f04a9dfeee allow line breaking in the editor (bug #41555) Torsten <mttl@mailbox.org> parents: 23179 diff changeset	3185 }
78f04a9dfeee allow line breaking in the editor (bug #41555) Torsten <mttl@mailbox.org> parents: 23179 diff changeset	3186 }
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3187
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3188 // Slot handling a double click into the text area
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3189 void file_editor_tab::handle_double_click (int, int, int modifier)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3190 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3191 if (! modifier)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3192 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3193 // double clicks without modifier
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3194 // clear any existing indicators of this type
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3195 m_edit_area->clear_selection_markers ();
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3196
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3197 if (m_highlight_all_occurrences)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3198 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3199 // Clear any previous selection.
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3200 m_edit_area->set_word_selection ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3201
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3202 // highlighting of all occurrences of the clicked word is enabled
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3203
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3204 // get the resulting cursor position
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3205 // (required if click was beyond a line ending)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3206 int line, col;
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3207 m_edit_area->getCursorPosition (&line, &col);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3208
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3209 // get the word at the cursor (if any)
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3210 QString word = m_edit_area->wordAtLineIndex (line, col);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3211 word = word.trimmed ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3212
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3213 if (! word.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3214 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3215 // word is not empty, so find all occurrences of the word
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3216
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3217 // remember first visible line for restoring the view afterwards
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3218 int first_line = m_edit_area->firstVisibleLine ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3219
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3220 // search for first occurrence of the detected word
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3221 bool find_result_available
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3222 = m_edit_area->findFirst (word,
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3223 false, // no regexp
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3224 true, // case sensitive
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3225 true, // whole words only
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3226 false, // do not wrap
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3227 true, // forward
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3228 0,0, // from the beginning
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3229 false
23190 4a2c42792d6c highlight all occurrences of a selected word in the editor (bug #41470) Torsten <mttl@mailbox.org> parents: 23186 diff changeset	3230 #if defined (HAVE_QSCI_VERSION_2_6_0)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3231 , true
23190 4a2c42792d6c highlight all occurrences of a selected word in the editor (bug #41470) Torsten <mttl@mailbox.org> parents: 23186 diff changeset	3232 #endif
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25070 diff changeset	3233 );
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3234
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3235 // loop over all occurrences and set the related indicator
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3236 int oline, ocol;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3237 int wlen = word.length ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3238
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3239 while (find_result_available)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3240 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3241 // get cursor position after having found an occurrence
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3242 m_edit_area->getCursorPosition (&oline, &ocol);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3243 // mark the selection
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3244 m_edit_area->show_selection_markers (oline, ocol-wlen, oline, ocol);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3245
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3246 // find next occurrence
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3247 find_result_available = m_edit_area->findNext ();
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3248 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3249
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3250 // restore the visible area of the file, the cursor position,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3251 // and the selection
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3252 m_edit_area->setFirstVisibleLine (first_line);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3253 m_edit_area->setCursorPosition (line, col);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3254 m_edit_area->setSelection (line, col - wlen, line, col);
6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3255 m_edit_area->set_word_selection (word);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3256 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3257 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3258 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3259 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3260
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3261 QString file_editor_tab::get_function_name (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3262 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3263 QRegExp rxfun1 ("^[\t ]function[^=]+=([^\$]+)\\([^\$]\\)[\t ]*$");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3264 QRegExp rxfun2 ("^[\t ]function[\t ]+([^\$]+)\\([^\$]\\)[\t ]*$");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3265 QRegExp rxfun3 ("^[\t ]function[^=]+=[\t ]([^\\s]+)[\t ]*$");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3266 QRegExp rxfun4 ("^[\t ]function[\t ]+([^\\s]+)[\t ]$");
26624 7994f91cbdb8 Provide correct guess at filename when saving classdef file from GUI (bug #55497). Rik <rik@octave.org> parents: 26561 diff changeset	3267 QRegExp rxfun5 ("^[\t ]classdef[\t ]+([^\\s]+)[\t ]$");
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3268
27378 6d0585c8ee11 use m_ prefix for data members in file_editor_tab class John W. Eaton <jwe@octave.org> parents: 27375 diff changeset	3269 QStringList lines = m_edit_area->text ().split ("\n");
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3270
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3271 for (int i = 0; i < lines.count (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3272 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3273 if (rxfun1.indexIn (lines.at (i)) != -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3274 return rxfun1.cap (1).remove (QRegExp ("[ \t]*"));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3275 else if (rxfun2.indexIn (lines.at (i)) != -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3276 return rxfun2.cap (1).remove (QRegExp ("[ \t]*"));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3277 else if (rxfun3.indexIn (lines.at (i)) != -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3278 return rxfun3.cap (1).remove (QRegExp ("[ \t]*"));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3279 else if (rxfun4.indexIn (lines.at (i)) != -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3280 return rxfun4.cap (1).remove (QRegExp ("[ \t]*"));
26624 7994f91cbdb8 Provide correct guess at filename when saving classdef file from GUI (bug #55497). Rik <rik@octave.org> parents: 26561 diff changeset	3281 else if (rxfun5.indexIn (lines.at (i)) != -1)
7994f91cbdb8 Provide correct guess at filename when saving classdef file from GUI (bug #55497). Rik <rik@octave.org> parents: 26561 diff changeset	3282 return rxfun5.cap (1).remove (QRegExp ("[ \t]*"));
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3283 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3284
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3285 return QString ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24666 diff changeset	3286 }
18834 0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18833 diff changeset	3287 }
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18833 diff changeset	3288
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15860 diff changeset	3289 #endif

Mercurial > octave

annotate libgui/src/m-editor/file-editor-tab.cc @ 27398:db22b63b9c59