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

annotate libgui/src/m-editor/file-editor-tab.cc @ 19642:4b980842edba gui-release

clean up some signal-slot combinations in the editor * file-editor-tab.cc (contructor): remove connections of signals for command execution and for creating the context menu; (execute_command_in_terminal, create_context_menu): related slots removed * file-editor-tab.h: removed slots and signals that were emitted therein * file-editor.cc (add_file_editor_tab): connect edit area signals directly to the related slots without involving the editor tab

author	Torsten <ttl@justmail.de>
date	Thu, 22 Jan 2015 21:38:12 +0100
parents	d258070914ef
children	8ef79bc61d8a

rev	line source
18315 6e8188effddf file-editor-tab.cc: Fix a typo. Julien Bect <julien.bect@supelec.fr> parents: 18303 diff changeset	1
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	3
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17737 diff changeset	4 Copyright (C) 2011-2013 Jacob Dawid
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	8 Octave is free software; you can redistribute it and/or modify it
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	9 under the terms of the GNU General Public License as published by the
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	11 option) any later version.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	16 for more details.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	18 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	19 along with Octave; see the file COPYING. If not, see
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	20 <http://www.gnu.org/licenses/>.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	22 */
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	23
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15257 diff changeset	24 #ifdef HAVE_CONFIG_H
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15257 diff changeset	25 #include <config.h>
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15257 diff changeset	26 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15257 diff changeset	27
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15860 diff changeset	28 #ifdef HAVE_QSCINTILLA
7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15860 diff changeset	29
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	30 #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	31 #define HAVE_LEXER_OCTAVE
16646 025bc6b5080e use QScintilla's lexer for highlighting Octave programs John W. Eaton <jwe@octave.org> parents: 16638 diff changeset	32 #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	33 #elif defined (HAVE_QSCI_QSCILEXERMATLAB_H)
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	34 #define HAVE_LEXER_MATLAB
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	35 #include <Qsci/qscilexermatlab.h>
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	36 #endif
14873 355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	37 #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	38 #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	39 #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	40 #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	41 #include <Qsci/qscilexerdiff.h>
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	42 #include <Qsci/qsciprinter.h>
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	43 #include "resource-manager.h"
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	44 #include <QApplication>
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	45 #include <QFileDialog>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	46 #include <QMessageBox>
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	47 #include <QTextStream>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	48 #include <QVBoxLayout>
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	49 #include <QInputDialog>
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	50 #include <QPrintDialog>
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	51 #include <QDateTime>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	52
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	53 #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	54 #include "file-editor.h"
19382 c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19366 diff changeset	55 #include "octave-txt-lexer.h"
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	56
18236 f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	57 #include "file-ops.h"
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	58
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	59 #include "debug.h"
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16591 diff changeset	60 #include "octave-qt-link.h"
16715 96ed7ab44e2e save prepared apis info for qscintilla into a path depending on octave version Torsten <ttl@justmail.de> parents: 16704 diff changeset	61 #include "version.h"
18318 770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	62 #include "utils.h"
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	63 #include "defaults.h"
19038 e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	64 #include <oct-map.h>
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	65
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	66 // Make parent null for the file editor tab so that warning
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	67 // WindowModal messages don't affect grandparents.
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	68 file_editor_tab::file_editor_tab (const QString& directory_arg)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	69 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	70 QString directory = directory_arg;
16704 e38a0fa08368 fix restoring editor files from previous session and speedup lexer preparation Torsten <ttl@justmail.de> parents: 16703 diff changeset	71 _lexer_apis = 0;
19445 ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	72 _app_closing = 0; // app is not closing
18801 095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	73 _is_octave_file = true;
18871 08d7dbd728bc save a new file before trying to run it from the editor (bug #42571) Torsten <ttl@justmail.de> parents: 18868 diff changeset	74 _modal_dialog = false;
16638 3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	75
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	76 // Make sure there is a slash at the end of the directory name
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	77 // for identification when saved later.
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	78 if (directory.count () && directory.at (directory.count () - 1) != '/')
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	79 directory.append ("/");
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	80
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	81 _file_name = directory;
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17706 diff changeset	82 _file_system_watcher.setObjectName ("_qt_autotest_force_engine_poller");
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	83
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: 16721 diff changeset	84 _edit_area = new octave_qscintilla (this);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	85
19642 4b980842edba clean up some signal-slot combinations in the editor Torsten <ttl@justmail.de> parents: 19639 diff changeset	86 connect (_edit_area, SIGNAL (cursorPositionChanged (int, int)),
4b980842edba clean up some signal-slot combinations in the editor Torsten <ttl@justmail.de> parents: 19639 diff changeset	87 this, SLOT (handle_cursor_moved (int,int)));
17962 4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	88
19038 e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	89 connect (_edit_area, SIGNAL (context_menu_edit_signal (const QString&)),
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	90 this, SLOT (handle_context_menu_edit (const QString&)));
18721 99e26cb0f87f use the actions from the editor for the context menu Torsten <ttl@justmail.de> parents: 18720 diff changeset	91
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	92 // create statusbar for row/col indicator and eol mode
17962 4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	93 _status_bar = new QStatusBar (this);
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	94
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	95 // eol mode
19278 05d8e71d20cb add a label to the eol indicator in the editors status bar Torsten <ttl@justmail.de> parents: 19274 diff changeset	96 QLabel *eol_label = new QLabel (tr ("eol:"), this);
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	97 _eol_indicator = new QLabel ("",this);
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	98 _eol_indicator->setMinimumSize (35,0);
19278 05d8e71d20cb add a label to the eol indicator in the editors status bar Torsten <ttl@justmail.de> parents: 19274 diff changeset	99 _status_bar->addPermanentWidget (eol_label, 0);
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	100 _status_bar->addPermanentWidget (_eol_indicator, 0);
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	101
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	102 // row- and col-indicator
17962 4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	103 _row_indicator = new QLabel ("", this);
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	104 _row_indicator->setMinimumSize (30,0);
19278 05d8e71d20cb add a label to the eol indicator in the editors status bar Torsten <ttl@justmail.de> parents: 19274 diff changeset	105 QLabel *row_label = new QLabel (tr ("line:"), this);
17962 4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	106 _col_indicator = new QLabel ("", this);
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	107 _col_indicator->setMinimumSize (25,0);
19278 05d8e71d20cb add a label to the eol indicator in the editors status bar Torsten <ttl@justmail.de> parents: 19274 diff changeset	108 QLabel *col_label = new QLabel (tr ("col:"), this);
17962 4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	109 _status_bar->addPermanentWidget (row_label, 0);
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	110 _status_bar->addPermanentWidget (_row_indicator, 0);
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	111 _status_bar->addPermanentWidget (col_label, 0);
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	112 _status_bar->addPermanentWidget (_col_indicator, 0);
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	113
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	114 // Leave the find dialog box out of memory until requested.
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	115 _find_dialog = 0;
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	116 _find_dialog_is_visible = false;
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	117
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	118 // symbols
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	119 _edit_area->setMarginType (1, QsciScintilla::SymbolMargin);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	120 _edit_area->setMarginSensitivity (1, true);
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	121 _edit_area->markerDefine (QsciScintilla::RightTriangle, bookmark);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	122 _edit_area->markerDefine (QPixmap (":/actions/icons/redled.png"),
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	123 breakpoint);
17699 1be2993d3656 improve appearance of gui's dcoumentation browser Torsten <ttl@justmail.de> parents: 17636 diff changeset	124 _edit_area->markerDefine (QPixmap (":/actions/icons/bookmark.png"),
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	125 debugger_position);
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	126
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	127 connect (_edit_area, SIGNAL (marginClicked (int, int,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	128 Qt::KeyboardModifiers)),
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	129 this, SLOT (handle_margin_clicked (int, int,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	130 Qt::KeyboardModifiers)));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	131
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	132 // line numbers
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	133 _edit_area->setMarginsForegroundColor (QColor (96, 96, 96));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	134 _edit_area->setMarginsBackgroundColor (QColor (232, 232, 220));
15365 b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	135 _edit_area->setMarginType (2, QsciScintilla::TextMargin);
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	136
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	137 // other features
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	138 _edit_area->setBraceMatching (QsciScintilla::StrictBraceMatch);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	139 _edit_area->setAutoIndent (true);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	140 _edit_area->setIndentationWidth (2);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	141 _edit_area->setIndentationsUseTabs (false);
15365 b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	142
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	143 _edit_area->setUtf8 (true);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	144
15365 b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	145 // auto completion
18483 0f3bc7ccb875 update the completion list of the editor while typing Torsten <ttl@justmail.de> parents: 18482 diff changeset	146 _edit_area->SendScintilla (QsciScintillaBase::SCI_AUTOCSETCANCELATSTART, false);
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	147
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	148 QVBoxLayout *edit_area_layout = new QVBoxLayout ();
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	149 edit_area_layout->addWidget (_edit_area);
17962 4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	150 edit_area_layout->addWidget (_status_bar);
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	151 edit_area_layout->setMargin (0);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	152 setLayout (edit_area_layout);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	153
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	154 // connect modified signal
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	155 connect (_edit_area, SIGNAL (modificationChanged (bool)),
14788 85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	156 this, SLOT (update_window_title (bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	157
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	158 connect (_edit_area, SIGNAL (copyAvailable (bool)),
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	159 this, SLOT (handle_copy_available (bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	160
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	161 connect (&_file_system_watcher, SIGNAL (fileChanged (const QString&)),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	162 this, SLOT (file_has_changed (const QString&)));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	163
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16402 diff changeset	164 QSettings *settings = resource_manager::get_settings ();
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16402 diff changeset	165 if (settings)
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16402 diff changeset	166 notice_settings (settings);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	167 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	168
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	169 file_editor_tab::~file_editor_tab (void)
14680 628eeaf879f7 Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14676 diff changeset	170 {
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	171 // Destroy items attached to _edit_area.
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	172 QsciLexer *lexer = _edit_area->lexer ();
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	173 if (lexer)
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	174 {
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	175 delete lexer;
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	176 _edit_area->setLexer (0);
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	177 }
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	178 if (_find_dialog)
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	179 {
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	180 delete _find_dialog;
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	181 _find_dialog = 0;
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	182 }
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	183
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	184 // Destroy _edit_area.
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	185 delete _edit_area;
14680 628eeaf879f7 Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14676 diff changeset	186 }
628eeaf879f7 Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14676 diff changeset	187
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	188 void
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	189 file_editor_tab::closeEvent (QCloseEvent *e)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	190 {
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	191 // ignore close event if file is not saved and user cancels
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	192 // closing this window
16018 e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	193 if (check_file_modified () == QMessageBox::Cancel)
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	194 e->ignore ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	195 else
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	196 e->accept ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	197 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	198
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	199 void
19038 e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	200 file_editor_tab::handle_context_menu_edit (const QString& word_at_cursor)
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	201 {
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	202 // search for a subfunction in actual file (this is done at first because
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	203 // octave finds this function before other with same name in the search path
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	204 QRegExp rxfun1 ("^[\t ]function[^=]+=[\t ]"
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	205 + word_at_cursor + "[\t ]\$[^\$]\\)[\t ]*$");
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	206 QRegExp rxfun2 ("^[\t ]*function[\t ]+"
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	207 + word_at_cursor + "[\t ]\$[^\$]\\)[\t ]*$");
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	208 QRegExp rxfun3 ("^[\t ]*function[\t ]+"
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	209 + word_at_cursor + "[\t ]*$");
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	210 QRegExp rxfun4 ("^[\t ]function[^=]+=[\t ]"
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	211 + word_at_cursor + "[\t ]*$");
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	212
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	213 int pos_fct = -1;
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	214 QStringList lines = _edit_area->text ().split ("\n");
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	215
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	216 int line;
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	217 for (line = 0; line < lines.count (); line++)
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	218 {
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	219 if ((pos_fct = rxfun1.indexIn (lines.at (line))) != -1)
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	220 break;
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	221 if ((pos_fct = rxfun2.indexIn (lines.at (line))) != -1)
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	222 break;
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	223 if ((pos_fct = rxfun3.indexIn (lines.at (line))) != -1)
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	224 break;
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	225 if ((pos_fct = rxfun4.indexIn (lines.at (line))) != -1)
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	226 break;
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	227 }
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	228
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	229 if (pos_fct > -1)
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	230 { // reg expr. found: it is an internal function
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	231 _edit_area->setCursorPosition (line, pos_fct);
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	232 _edit_area->SendScintilla (2613, line); // SCI_SETFIRSTVISIBLELINE
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	233 return;
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	234 }
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	235
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	236 // Is it a regular function within the search path? (Call __which__)
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	237 octave_value_list fct = F__which__ (ovl (word_at_cursor.toStdString ()),0);
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	238 octave_map map = fct(0).map_value ();
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	239
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	240 QString type = QString::fromStdString (
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	241 map.contents ("type").data ()[0].string_value ());
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	242 QString name = QString::fromStdString (
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	243 map.contents ("name").data ()[0].string_value ());
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	244
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	245 QString message = QString ();
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	246 QString filename = QString ();
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	247
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	248 if (type == QString("built-in function"))
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	249 { // built in function: can't edit
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	250 message = tr ("%1 is a built-in function");
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	251 }
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	252 else if (type.isEmpty ())
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	253 {
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	254 // function not known to octave -> try directory of edited file
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	255 QFileInfo file = QFileInfo (_file_name);
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	256 file = QFileInfo (QDir (file.canonicalPath ()), word_at_cursor + ".m");
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	257
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	258 if (file.exists ())
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	259 {
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	260 filename = file.canonicalFilePath (); // local file exists
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	261 }
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	262 else
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	263 { // local file does not exist -> try private directory
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	264 file = QFileInfo (_file_name);
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	265 file = QFileInfo (QDir (file.canonicalPath () + "/private"),
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	266 word_at_cursor + ".m");
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	267
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	268 if (file.exists ())
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	269 {
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	270 filename = file.canonicalFilePath (); // private function exists
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	271 }
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	272 else
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	273 {
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	274 message = tr ("Can not find function %1"); // no file found
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	275 }
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	276 }
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	277 }
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	278
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	279 if (! message.isEmpty ())
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	280 {
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	281 QMessageBox *msgBox
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	282 = new QMessageBox (QMessageBox::Critical,
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	283 tr ("Octave Editor"),
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	284 message.arg (name),
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	285 QMessageBox::Ok, this);
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	286
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	287 msgBox->setWindowModality (Qt::NonModal);
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	288 msgBox->setAttribute (Qt::WA_DeleteOnClose);
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	289 msgBox->show ();
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	290 return;
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	291 }
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	292
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	293 if ( filename.isEmpty ())
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	294 filename = QString::fromStdString (
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	295 map.contents ("file").data ()[0].string_value ());
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	296
19639 d258070914ef open file directly without edit command when editing a function from editor Torsten <ttl@justmail.de> parents: 19629 diff changeset	297 if (! filename.endsWith (".m"))
d258070914ef open file directly without edit command when editing a function from editor Torsten <ttl@justmail.de> parents: 19629 diff changeset	298 filename.append (".m");
d258070914ef open file directly without edit command when editing a function from editor Torsten <ttl@justmail.de> parents: 19629 diff changeset	299
d258070914ef open file directly without edit command when editing a function from editor Torsten <ttl@justmail.de> parents: 19629 diff changeset	300 emit request_open_file (filename);
19038 e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	301 }
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	302
e87e65bc71ae improved finding a function file for editing in gui (bug #41509) Torsten <ttl@justmail.de> parents: 18980 diff changeset	303 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	304 file_editor_tab::set_file_name (const QString& fileName)
14690 ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14680 diff changeset	305 {
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	306 // update tracked file if we really have a file on disk
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	307 QStringList trackedFiles = _file_system_watcher.files ();
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	308 if (!trackedFiles.isEmpty ())
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	309 _file_system_watcher.removePath (_file_name);
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	310 if (!fileName.isEmpty ())
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	311 _file_system_watcher.addPath (fileName);
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	312 _file_name = fileName;
15425 8ae34ffe5c1b Retain QsciAPIs lexer_api as part of lexer_octave_gui object (bug #37359) Daniel J Sebald <daniel.sebald@ieee.org> parents: 15402 diff changeset	313
8ae34ffe5c1b Retain QsciAPIs lexer_api as part of lexer_octave_gui object (bug #37359) Daniel J Sebald <daniel.sebald@ieee.org> parents: 15402 diff changeset	314 // update lexer after _file_name change
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	315 update_lexer ();
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	316
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	317 // update the file editor with current editing directory
18801 095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	318 emit editor_state_changed (_copy_available, _file_name, _is_octave_file);
095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	319
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15849 diff changeset	320 // add the new file to the mru list
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	321 emit mru_add_file (_file_name);
14690 ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14680 diff changeset	322 }
ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14680 diff changeset	323
17979 a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	324 // valid_file_name (file): checks whether "file" names a file
a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	325 // by default, "file" is empty, then _file_name is checked
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	326 bool
17979 a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	327 file_editor_tab::valid_file_name (const QString& file)
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	328 {
17979 a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	329 QString file_name;
a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	330 if (file.isEmpty ())
a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	331 file_name = _file_name;
a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	332 else
a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	333 file_name = file;
a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	334 return (! file_name.isEmpty ()
a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	335 && file_name.at (file_name.count () - 1) != '/');
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	336 }
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	337
14690 ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14680 diff changeset	338 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	339 file_editor_tab::handle_margin_clicked (int margin, int line,
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	340 Qt::KeyboardModifiers state)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	341 {
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	342 if (margin == 1)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	343 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	344 unsigned int markers_mask = _edit_area->markersAtLine (line);
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	345
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	346 if (state & Qt::ControlModifier)
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	347 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	348 if (markers_mask && (1 << bookmark))
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	349 _edit_area->markerDelete (line, bookmark);
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	350 else
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	351 _edit_area->markerAdd (line, bookmark);
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	352 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	353 else
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	354 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	355 if (markers_mask && (1 << breakpoint))
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	356 request_remove_breakpoint (line);
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	357 else
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	358 request_add_breakpoint (line);
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	359 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	360 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	361 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	362
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	363 void
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	364 file_editor_tab::update_lexer ()
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	365 {
16704 e38a0fa08368 fix restoring editor files from previous session and speedup lexer preparation Torsten <ttl@justmail.de> parents: 16703 diff changeset	366 if (_lexer_apis)
e38a0fa08368 fix restoring editor files from previous session and speedup lexer preparation Torsten <ttl@justmail.de> parents: 16703 diff changeset	367 _lexer_apis->cancelPreparation (); // stop preparing if apis exists
e38a0fa08368 fix restoring editor files from previous session and speedup lexer preparation Torsten <ttl@justmail.de> parents: 16703 diff changeset	368
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	369 QsciLexer *lexer = _edit_area->lexer ();
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	370 delete lexer;
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	371 lexer = 0;
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	372
18801 095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	373 _is_octave_file = false;
095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	374
16559 78765ae325fd gui: handle octaverc files with the octave lexer Mike Miller <mtmiller@ieee.org> parents: 16558 diff changeset	375 if (_file_name.endsWith (".m")
78765ae325fd gui: handle octaverc files with the octave lexer Mike Miller <mtmiller@ieee.org> parents: 16558 diff changeset	376 \|\| _file_name.endsWith ("octaverc"))
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	377 {
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	378 #if defined (HAVE_LEXER_OCTAVE)
16646 025bc6b5080e use QScintilla's lexer for highlighting Octave programs John W. Eaton <jwe@octave.org> parents: 16638 diff changeset	379 lexer = new QsciLexerOctave ();
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	380 #elif defined (HAVE_LEXER_MATLAB)
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	381 lexer = new QsciLexerMatlab ();
19382 c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19366 diff changeset	382 #else
c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19366 diff changeset	383 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	384 #endif
18801 095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	385 _is_octave_file = true;
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	386 }
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	387
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	388 if (! lexer)
14873 355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	389 {
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	390 if (_file_name.endsWith (".c")
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	391 \|\| _file_name.endsWith (".cc")
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	392 \|\| _file_name.endsWith (".cpp")
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	393 \|\| _file_name.endsWith (".cxx")
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	394 \|\| _file_name.endsWith (".c++")
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	395 \|\| _file_name.endsWith (".h")
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	396 \|\| _file_name.endsWith (".hh")
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	397 \|\| _file_name.endsWith (".hpp")
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	398 \|\| _file_name.endsWith (".h++"))
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	399 {
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	400 lexer = new QsciLexerCPP ();
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	401 }
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	402 else if (_file_name.endsWith (".pl"))
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	403 {
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	404 lexer = new QsciLexerPerl ();
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	405 }
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	406 else if (_file_name.endsWith (".bat"))
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	407 {
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	408 lexer = new QsciLexerBatch ();
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	409 }
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	410 else if (_file_name.endsWith (".diff"))
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	411 {
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	412 lexer = new QsciLexerDiff ();
72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	413 }
19382 c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19366 diff changeset	414 else if (_file_name.endsWith (".sh"))
c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19366 diff changeset	415 {
c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19366 diff changeset	416 lexer = new QsciLexerBash ();
c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19366 diff changeset	417 }
17979 a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	418 else if (! valid_file_name ())
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	419 {
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	420 // 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	421 #if defined (HAVE_LEXER_OCTAVE)
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	422 lexer = new QsciLexerOctave ();
18801 095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	423 _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	424 #elif defined (HAVE_LEXER_MATLAB)
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	425 lexer = new QsciLexerMatlab ();
18801 095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	426 _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	427 #else
19382 c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19366 diff changeset	428 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	429 #endif
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	430 }
16720 973fd2367d44 select octave lexer for unnamed files and bash lexer for files without extension Torsten <ttl@justmail.de> parents: 16719 diff changeset	431 else
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	432 {
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	433 // other or no extension
19382 c364b9a44580 provide an editor lexer for text or unknown files (bug #43572) Torsten <ttl@justmail.de> parents: 19366 diff changeset	434 lexer = new octave_txt_lexer ();
16720 973fd2367d44 select octave lexer for unnamed files and bash lexer for files without extension Torsten <ttl@justmail.de> parents: 16719 diff changeset	435 }
14874 5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	436 }
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	437
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	438 QSettings *settings = resource_manager::get_settings ();
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	439
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	440 // build information for auto completion (APIs)
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	441 _lexer_apis = new QsciAPIs(lexer);
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	442
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	443 if (_lexer_apis)
16678 518dbe0ae857 fix auto completion for octave files in editor Torsten <ttl@justmail.de> parents: 16662 diff changeset	444 {
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	445 bool update_apis_file = false; // flag, whether update of apis files
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	446
16717 9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	447 // get path to prepared api info
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	448 QDesktopServices desktopServices;
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	449 QString prep_apis_path
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	450 = desktopServices.storageLocation (QDesktopServices::HomeLocation)
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	451 + "/.config/octave/" + QString(OCTAVE_VERSION) + "/qsci/";
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	452
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	453 // get settings which infos are used for octave
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	454 bool octave_builtins = settings->value (
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	455 "editor/codeCompletion_octave_builtins", true).toBool ();
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	456 bool octave_functions = settings->value (
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	457 "editor/codeCompletion_octave_functions", true).toBool ();
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	458
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	459 if (_is_octave_file)
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	460 {
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	461 // octave file: keywords are always used
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	462 _prep_apis_file = prep_apis_path + lexer->lexer () + "_k";
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	463
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	464 if (octave_builtins)
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	465 _prep_apis_file = _prep_apis_file + "b"; // use builtins, too
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	466
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	467 if (octave_functions)
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	468 _prep_apis_file = _prep_apis_file + "f"; // use keywords, too
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	469
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	470 _prep_apis_file = _prep_apis_file + ".pap"; // final name of apis file
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	471
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	472 // check whether the APIs info needs to be prepared and saved
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	473 QFileInfo apis_file = QFileInfo (_prep_apis_file);
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	474 update_apis_file = ! apis_file.exists (); // flag whether apis file needs update
16715 96ed7ab44e2e save prepared apis info for qscintilla into a path depending on octave version Torsten <ttl@justmail.de> parents: 16704 diff changeset	475
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	476 // function list depends on installed packages: check mod. date
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	477 if (! update_apis_file & octave_functions)
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	478 {
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	479 // check whether package file is newer than apis_file
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	480 QDateTime apis_date = apis_file.lastModified ();
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	481
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	482 // compare to local package list
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	483 // FIXME: How to get user chosen location?
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	484 QFileInfo local_pkg_list = QFileInfo (
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	485 desktopServices.storageLocation (QDesktopServices::HomeLocation)
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	486 + "/.octave_packages");
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	487 if (local_pkg_list.exists ()
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	488 & (apis_date < local_pkg_list.lastModified ()) )
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	489 update_apis_file = true;
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	490
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	491 // compare to global package list
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	492 // FIXME: How to get user chosen location?
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	493 QFileInfo global_pkg_list = QFileInfo (
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	494 QString::fromStdString (Voctave_home)
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	495 + "/share/octave/octave_packages");
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	496 if (global_pkg_list.exists ()
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	497 & (apis_date < global_pkg_list.lastModified ()) )
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	498 update_apis_file = true;
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	499 }
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	500 }
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	501 else // no octave file, just add extension
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	502 {
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	503 _prep_apis_file = prep_apis_path + lexer->lexer () + ".pap";
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	504 }
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	505
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	506 if (update_apis_file \| !_lexer_apis->loadPrepared (_prep_apis_file))
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	507 {
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	508 // no prepared info loaded, prepare and save if possible
16717 9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	509
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	510 // create raw apis info
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	511 QString keyword;
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	512 QStringList keyword_list;
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	513 int i,j;
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	514
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	515 if (_is_octave_file)
16717 9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	516 {
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	517 // octave: get keywords from internal informations depending on
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	518 // user preferences
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	519
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	520 // keywords are always used
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	521 add_octave_apis (F__keywords__ ()); // add new entries
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	522
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	523 if (octave_builtins)
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	524 add_octave_apis (F__builtins__ ()); // add new entries
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	525
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	526 if (octave_functions)
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	527 add_octave_apis (F__list_functions__ ()); // add new entries
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	528
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	529 }
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	530 else
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	531 {
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	532
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	533 _prep_apis_file = prep_apis_path + lexer->lexer () + ".pap";
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	534
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	535 for (i=1; i<=3; i++) // test the first 5 keyword sets
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	536 {
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	537 keyword = QString(lexer->keywords (i)); // get list
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	538 keyword_list = keyword.split (QRegExp ("\\s+")); // split
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	539 for (j = 0; j < keyword_list.size (); j++) // add to API
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	540 _lexer_apis->add (keyword_list.at (j));
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	541 }
16717 9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	542 }
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	543
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	544 // dsiconnect slot for saving prepared info if already connected
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	545 disconnect (_lexer_apis, SIGNAL (apiPreparationFinished ()), 0, 0);
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	546 // check whether path for prepared info exists or can be created
9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	547 if (QDir("/").mkpath (prep_apis_path))
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	548 {
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	549 // path exists, apis info can be saved there
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	550 connect (_lexer_apis, SIGNAL (apiPreparationFinished ()),
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	551 this, SLOT (save_apis_info ()));
16704 e38a0fa08368 fix restoring editor files from previous session and speedup lexer preparation Torsten <ttl@justmail.de> parents: 16703 diff changeset	552 }
16721 a71a784c7611 * file-editor-tab.cc(update_lexer): redundant code removed Torsten <ttl@justmail.de> parents: 16720 diff changeset	553 _lexer_apis->prepare (); // prepare apis info
16678 518dbe0ae857 fix auto completion for octave files in editor Torsten <ttl@justmail.de> parents: 16662 diff changeset	554 }
518dbe0ae857 fix auto completion for octave files in editor Torsten <ttl@justmail.de> parents: 16662 diff changeset	555 }
518dbe0ae857 fix auto completion for octave files in editor Torsten <ttl@justmail.de> parents: 16662 diff changeset	556
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	557 lexer->readSettings (*settings);
16662 72665c4ae25b allow build to continue without QScintilla lexer for Octave John W. Eaton <jwe@octave.org> parents: 16646 diff changeset	558
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16395 diff changeset	559 _edit_area->setLexer (lexer);
19215 e85203f41402 set cursor color of the editor to color of default text (bug #43314) Torsten <ttl@justmail.de> parents: 19077 diff changeset	560 _edit_area->setCaretForegroundColor (lexer->color (0));
e85203f41402 set cursor color of the editor to color of default text (bug #43314) Torsten <ttl@justmail.de> parents: 19077 diff changeset	561 _edit_area->setIndentationGuidesForegroundColor (lexer->color (0));
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	562
16717 9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	563 // fix line number width with respect to the font size of the lexer
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	564 if (settings->value ("editor/showLineNumbers", true).toBool ())
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	565 auto_margin_width ();
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	566 else
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	567 _edit_area->setMarginWidth (2,0);
16717 9ad6e7d4fa42 fix bug concerning preparing the apis info for code completion Torsten <ttl@justmail.de> parents: 16716 diff changeset	568
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	569 }
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	570
18867 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	571 // function for adding entries to the octave lexer's APIs
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	572 void
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	573 file_editor_tab::add_octave_apis (octave_value_list key_ovl)
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	574 {
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	575 octave_value keys = key_ovl(0);
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	576 Cell key_list = keys.cell_value ();
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	577
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	578 for (int idx = 0; idx < key_list.numel (); idx++)
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	579 _lexer_apis->add (QString (key_list.elem (idx).string_value ().data ()));
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	580 }
6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18801 diff changeset	581
16704 e38a0fa08368 fix restoring editor files from previous session and speedup lexer preparation Torsten <ttl@justmail.de> parents: 16703 diff changeset	582 void
e38a0fa08368 fix restoring editor files from previous session and speedup lexer preparation Torsten <ttl@justmail.de> parents: 16703 diff changeset	583 file_editor_tab::save_apis_info ()
e38a0fa08368 fix restoring editor files from previous session and speedup lexer preparation Torsten <ttl@justmail.de> parents: 16703 diff changeset	584 {
16715 96ed7ab44e2e save prepared apis info for qscintilla into a path depending on octave version Torsten <ttl@justmail.de> parents: 16704 diff changeset	585 _lexer_apis->savePrepared (_prep_apis_file);
16704 e38a0fa08368 fix restoring editor files from previous session and speedup lexer preparation Torsten <ttl@justmail.de> parents: 16703 diff changeset	586 }
e38a0fa08368 fix restoring editor files from previous session and speedup lexer preparation Torsten <ttl@justmail.de> parents: 16703 diff changeset	587
16719 0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	588 QString
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	589 file_editor_tab::comment_string (const QString& lexer)
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	590 {
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	591 if (lexer == "octave" \|\| lexer == "matlab")
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	592 return QString("%");
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	593 else if (lexer == "perl" \|\| lexer == "bash" \|\| lexer == "diff")
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	594 return QString("#");
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	595 else if (lexer == "cpp")
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	596 return ("//");
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	597 else if (lexer == "batch")
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	598 return ("REM ");
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	599 else
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	600 return ("%"); // should never happen
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	601 }
0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	602
15980 6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	603 // slot for fetab_set_focus: sets the focus to the current edit area
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	604 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	605 file_editor_tab::set_focus (const QWidget *ID)
15980 6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	606 {
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	607 if (ID != this)
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	608 return;
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	609 _edit_area->setFocus ();
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	610 }
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	611
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	612 void
17627 811019b9ef57 Add help and documentation on actual keyword to the editor menu Torsten <ttl@justmail.de> parents: 16912 diff changeset	613 file_editor_tab::context_help (const QWidget *ID, bool doc)
811019b9ef57 Add help and documentation on actual keyword to the editor menu Torsten <ttl@justmail.de> parents: 16912 diff changeset	614 {
811019b9ef57 Add help and documentation on actual keyword to the editor menu Torsten <ttl@justmail.de> parents: 16912 diff changeset	615 if (ID != this)
811019b9ef57 Add help and documentation on actual keyword to the editor menu Torsten <ttl@justmail.de> parents: 16912 diff changeset	616 return;
811019b9ef57 Add help and documentation on actual keyword to the editor menu Torsten <ttl@justmail.de> parents: 16912 diff changeset	617
811019b9ef57 Add help and documentation on actual keyword to the editor menu Torsten <ttl@justmail.de> parents: 16912 diff changeset	618 _edit_area->context_help_doc (doc);
811019b9ef57 Add help and documentation on actual keyword to the editor menu Torsten <ttl@justmail.de> parents: 16912 diff changeset	619 }
811019b9ef57 Add help and documentation on actual keyword to the editor menu Torsten <ttl@justmail.de> parents: 16912 diff changeset	620
811019b9ef57 Add help and documentation on actual keyword to the editor menu Torsten <ttl@justmail.de> parents: 16912 diff changeset	621 void
17628 99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	622 file_editor_tab::context_edit (const QWidget *ID)
99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	623 {
99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	624 if (ID != this)
99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	625 return;
99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	626
99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	627 _edit_area->context_edit ();
99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	628 }
99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	629
99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	630 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	631 file_editor_tab::save_file (const QWidget *ID)
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	632 {
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	633 if (ID != this)
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	634 return;
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	635
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	636 save_file (_file_name);
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	637 }
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	638 void
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	639
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	640 file_editor_tab::save_file (const QWidget *ID, const QString& fileName,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	641 bool remove_on_success)
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	642 {
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	643 if (ID != this)
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	644 return;
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	645
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	646 save_file (fileName, remove_on_success);
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	647 }
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	648
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	649 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	650 file_editor_tab::save_file_as (const QWidget *ID)
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	651 {
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	652 if (ID != this)
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	653 return;
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	654
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	655 save_file_as ();
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	656 }
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	657
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	658 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	659 file_editor_tab::print_file (const QWidget *ID)
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	660 {
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	661 if (ID != this)
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	662 return;
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	663
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	664 QsciPrinter *printer = new QsciPrinter (QPrinter::HighResolution);
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	665
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	666 QPrintDialog printDlg (printer, this);
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	667
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	668 if (printDlg.exec () == QDialog::Accepted)
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	669 printer->printRange (_edit_area);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	670
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	671 delete printer;
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	672 }
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16437 diff changeset	673
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	674 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	675 file_editor_tab::run_file (const QWidget *ID)
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	676 {
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	677 if (ID != this)
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	678 return;
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	679
18872 b43157d085ba make sure a new and still unnamed file is saved when run from the editor Torsten <ttl@justmail.de> parents: 18871 diff changeset	680 if (_edit_area->isModified () \| ! valid_file_name ())
18871 08d7dbd728bc save a new file before trying to run it from the editor (bug #42571) Torsten <ttl@justmail.de> parents: 18868 diff changeset	681 {
08d7dbd728bc save a new file before trying to run it from the editor (bug #42571) Torsten <ttl@justmail.de> parents: 18868 diff changeset	682 _modal_dialog = true; // force modal dialog if the file is a new one
08d7dbd728bc save a new file before trying to run it from the editor (bug #42571) Torsten <ttl@justmail.de> parents: 18868 diff changeset	683 save_file (_file_name); // save file dialog
08d7dbd728bc save a new file before trying to run it from the editor (bug #42571) Torsten <ttl@justmail.de> parents: 18868 diff changeset	684 _modal_dialog = false; // back to non-modal dialogs
08d7dbd728bc save a new file before trying to run it from the editor (bug #42571) Torsten <ttl@justmail.de> parents: 18868 diff changeset	685 }
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	686
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16591 diff changeset	687 QFileInfo info (_file_name);
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16591 diff changeset	688 emit run_file_signal (info);
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	689 }
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	690
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	691 void
17635 7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	692 file_editor_tab::context_run (const QWidget *ID)
7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	693 {
7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	694 if (ID != this)
7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	695 return;
7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	696
7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	697 _edit_area->context_run ();
7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	698 }
7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	699
7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	700 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	701 file_editor_tab::toggle_bookmark (const QWidget *ID)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	702 {
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	703 if (ID != this)
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	704 return;
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	705
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	706 int line, cur;
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	707 _edit_area->getCursorPosition (&line, &cur);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	708
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	709 if (_edit_area->markersAtLine (line) && (1 << bookmark))
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	710 _edit_area->markerDelete (line, bookmark);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	711 else
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	712 _edit_area->markerAdd (line, bookmark);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	713 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	714
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	715 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	716 file_editor_tab::next_bookmark (const QWidget *ID)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	717 {
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	718 if (ID != this)
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	719 return;
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	720
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	721 int line, cur;
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	722 _edit_area->getCursorPosition (&line, &cur);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	723
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	724 if (_edit_area->markersAtLine (line) && (1 << bookmark))
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	725 line++; // we have a breakpoint here, so start search from next line
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	726
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	727 int nextline = _edit_area->markerFindNext (line, (1 << bookmark));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	728
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	729 _edit_area->setCursorPosition (nextline, 0);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	730 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	731
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	732 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	733 file_editor_tab::previous_bookmark (const QWidget *ID)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	734 {
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	735 if (ID != this)
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	736 return;
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	737
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	738 int line, cur;
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	739 _edit_area->getCursorPosition (&line, &cur);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	740
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	741 if (_edit_area->markersAtLine (line) && (1 << bookmark))
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	742 line--; // we have a breakpoint here, so start search from prev line
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	743
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	744 int prevline = _edit_area->markerFindPrevious (line, (1 << bookmark));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	745
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	746 _edit_area->setCursorPosition (prevline, 0);
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	747 }
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	748
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	749 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	750 file_editor_tab::remove_bookmark (const QWidget *ID)
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	751 {
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	752 if (ID != this)
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	753 return;
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	754
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	755 _edit_area->markerDeleteAll (bookmark);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	756 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	757
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	758 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	759 file_editor_tab::add_breakpoint_callback (const bp_info& info)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	760 {
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	761 bp_table::intmap line_info;
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	762 line_info[0] = info.line;
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	763
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16591 diff changeset	764 if (octave_qt_link::file_in_path (info.file, info.dir))
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	765 bp_table::add_breakpoint (info.function_name, line_info);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	766 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	767
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	768 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	769 file_editor_tab::remove_breakpoint_callback (const bp_info& info)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	770 {
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	771 bp_table::intmap line_info;
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	772 line_info[0] = info.line;
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	773
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16591 diff changeset	774 if (octave_qt_link::file_in_path (info.file, info.dir))
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	775 bp_table::remove_breakpoint (info.function_name, line_info);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	776 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	777
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	778 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	779 file_editor_tab::remove_all_breakpoints_callback (const bp_info& info)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	780 {
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16591 diff changeset	781 if (octave_qt_link::file_in_path (info.file, info.dir))
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	782 bp_table::remove_all_breakpoints_in_file (info.function_name, true);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	783 }
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	784
18236 f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	785 file_editor_tab::bp_info::bp_info (const QString& fname, int l)
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	786 : line (l), file (fname.toStdString ())
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	787 {
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	788 QFileInfo file_info (fname);
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	789
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	790 QString q_dir = file_info.absolutePath ();
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	791 QString q_function_name = file_info.fileName ();
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	792
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	793 // We have to cut off the suffix, because octave appends it.
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	794 q_function_name.chop (file_info.suffix ().length () + 1);
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	795
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	796 dir = q_dir.toStdString ();
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	797 function_name = q_function_name.toStdString ();
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	798
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	799 // Is the last component of DIR @foo? If so, strip it and prepend it
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	800 // to the name of the function.
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	801
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	802 size_t pos = dir.rfind (file_ops::dir_sep_chars ());
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	803
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	804 if (pos != std::string::npos && pos < dir.length () - 1)
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	805 {
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	806 if (dir[pos+1] == '@')
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	807 {
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	808 function_name = file_ops::concat (dir.substr (pos+1), function_name);
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	809
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	810 dir = dir.substr (0, pos);
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	811 }
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	812 }
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	813 }
f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	814
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	815 void
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	816 file_editor_tab::request_add_breakpoint (int line)
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	817 {
18236 f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	818 bp_info info (_file_name, line+1);
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	819
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	820 octave_link::post_event
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	821 (this, &file_editor_tab::add_breakpoint_callback, info);
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	822 }
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	823
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	824 void
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	825 file_editor_tab::request_remove_breakpoint (int line)
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	826 {
18236 f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	827 bp_info info (_file_name, line+1);
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	828
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	829 octave_link::post_event
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	830 (this, &file_editor_tab::remove_breakpoint_callback, info);
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	831 }
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	832
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	833 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	834 file_editor_tab::toggle_breakpoint (const QWidget *ID)
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	835 {
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	836 if (ID != this)
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	837 return;
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	838
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	839 int line, cur;
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	840 _edit_area->getCursorPosition (&line, &cur);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	841
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	842 if (_edit_area->markersAtLine (line) && (1 << breakpoint))
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	843 request_remove_breakpoint (line);
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	844 else
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	845 request_add_breakpoint (line);
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	846 }
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	847
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	848 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	849 file_editor_tab::next_breakpoint (const QWidget *ID)
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	850 {
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	851 if (ID != this)
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	852 return;
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	853
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	854 int line, cur;
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	855 _edit_area->getCursorPosition (&line, &cur);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	856
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	857 if (_edit_area->markersAtLine (line) && (1 << breakpoint))
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	858 line++; // we have a breakpoint here, so start search from next line
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	859
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	860 int nextline = _edit_area->markerFindNext (line, (1 << breakpoint));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	861
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	862 _edit_area->setCursorPosition (nextline, 0);
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	863 }
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	864
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	865 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	866 file_editor_tab::previous_breakpoint (const QWidget *ID)
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	867 {
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	868 if (ID != this)
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	869 return;
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	870
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	871 int line, cur, prevline;
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	872 _edit_area->getCursorPosition (&line, &cur);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	873
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	874 if (_edit_area->markersAtLine (line) && (1 << breakpoint))
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	875 line--; // we have a breakpoint here, so start search from prev line
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	876
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	877 prevline = _edit_area->markerFindPrevious (line, (1 << breakpoint));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	878
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	879 _edit_area->setCursorPosition (prevline, 0);
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	880 }
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	881
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	882 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	883 file_editor_tab::remove_all_breakpoints (const QWidget *ID)
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	884 {
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	885 if (ID != this)
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	886 return;
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	887
18236 f26d527c1a71 allow the gui editor to set breakpoints in class methods (bug #41126) John W. Eaton <jwe@octave.org> parents: 18082 diff changeset	888 bp_info info (_file_name);
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	889
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	890 octave_link::post_event
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	891 (this, &file_editor_tab::remove_all_breakpoints_callback, info);
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	892 }
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	893
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	894 void
18690 1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18573 diff changeset	895 file_editor_tab::scintilla_command (const QWidget *ID, unsigned int sci_msg)
1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18573 diff changeset	896 {
1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18573 diff changeset	897 if (ID != this)
1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18573 diff changeset	898 return;
1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18573 diff changeset	899
1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18573 diff changeset	900 _edit_area->SendScintilla (sci_msg);
1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18573 diff changeset	901 }
1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18573 diff changeset	902
1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18573 diff changeset	903 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	904 file_editor_tab::comment_selected_text (const QWidget *ID)
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	905 {
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	906 if (ID != this)
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	907 return;
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	908
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	909 do_comment_selected_text (true);
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	910 }
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	911
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	912 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	913 file_editor_tab::uncomment_selected_text (const QWidget *ID)
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	914 {
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	915 if (ID != this)
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	916 return;
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	917
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	918 do_comment_selected_text (false);
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	919 }
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	920
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	921 void
18303 106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	922 file_editor_tab::indent_selected_text (const QWidget *ID)
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	923 {
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	924 if (ID != this)
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	925 return;
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	926
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	927 do_indent_selected_text (true);
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	928 }
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	929
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	930 void
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	931 file_editor_tab::unindent_selected_text (const QWidget *ID)
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	932 {
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	933 if (ID != this)
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	934 return;
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	935
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	936 do_indent_selected_text (false);
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	937 }
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	938
19281 9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19279 diff changeset	939 void
9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19279 diff changeset	940 file_editor_tab::convert_eol (const QWidget *ID, QsciScintilla::EolMode eol_mode)
9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19279 diff changeset	941 {
9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19279 diff changeset	942 if (ID != this)
9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19279 diff changeset	943 return;
9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19279 diff changeset	944
9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19279 diff changeset	945 _edit_area->convertEols (eol_mode);
9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19279 diff changeset	946 _edit_area->setEolMode (eol_mode);
9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19279 diff changeset	947 update_eol_indicator ();
9582fad68730 add actions for converting the eol characters of the editor file Torsten <ttl@justmail.de> parents: 19279 diff changeset	948 }
18303 106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	949
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	950 void
18573 26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	951 file_editor_tab::zoom_in (const QWidget *ID)
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	952 {
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	953 if (ID != this)
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	954 return;
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	955
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	956 _edit_area->zoomIn (1);
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	957 auto_margin_width ();
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	958 }
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	959
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	960 void
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	961 file_editor_tab::zoom_out (const QWidget *ID)
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	962 {
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	963 if (ID != this)
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	964 return;
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	965
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	966 _edit_area->zoomOut (1);
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	967 auto_margin_width ();
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	968 }
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	969
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	970 void
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	971 file_editor_tab::zoom_normal (const QWidget *ID)
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	972 {
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	973 if (ID != this)
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	974 return;
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	975
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	976 _edit_area->zoomTo (0);
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	977 auto_margin_width ();
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	978 }
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	979
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	980
26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18568 diff changeset	981 void
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	982 file_editor_tab::handle_find_dialog_finished (int)
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	983 {
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	984 // Find dialog is going to hide. Save location of window for
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	985 // when it is reshown.
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	986 _find_dialog_geometry = _find_dialog->geometry ();
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	987 _find_dialog_is_visible = false;
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	988 }
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	989
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	990 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	991 file_editor_tab::find (const QWidget *ID)
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	992 {
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	993 if (ID != this)
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	994 return;
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	995
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	996 // The find_dialog feature doesn't need a slot for return info.
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	997 // Rather than Qt::DeleteOnClose, let the find feature hang about
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	998 // in case it contains useful information like previous searches
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	999 // and so on. Perhaps one find dialog for the whole editor is
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	1000 // better, but individual find dialogs has the nice feature of
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	1001 // retaining position per file editor tabs, which can be undocked.
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	1002
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	1003 if (!_find_dialog)
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	1004 {
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	1005 _find_dialog = new find_dialog (_edit_area,
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1006 qobject_cast<QWidget *> (sender ()));
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	1007 connect (_find_dialog, SIGNAL (finished (int)),
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	1008 this, SLOT (handle_find_dialog_finished (int)));
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	1009 _find_dialog->setWindowModality (Qt::NonModal);
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	1010 _find_dialog_geometry = _find_dialog->geometry ();
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	1011 }
19475 521d4959fc42 fix positioning issues of editor find dialog (bug #43174) Torsten <ttl@justmail.de> parents: 19464 diff changeset	1012 else if (!_find_dialog->isVisible ())
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	1013 {
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	1014 _find_dialog->setGeometry (_find_dialog_geometry);
19475 521d4959fc42 fix positioning issues of editor find dialog (bug #43174) Torsten <ttl@justmail.de> parents: 19464 diff changeset	1015 QPoint p = _find_dialog->pos ();
521d4959fc42 fix positioning issues of editor find dialog (bug #43174) Torsten <ttl@justmail.de> parents: 19464 diff changeset	1016 _find_dialog->move(p.x ()+10, p.y ()+10);
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	1017 }
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	1018
19475 521d4959fc42 fix positioning issues of editor find dialog (bug #43174) Torsten <ttl@justmail.de> parents: 19464 diff changeset	1019 _find_dialog->show ();
521d4959fc42 fix positioning issues of editor find dialog (bug #43174) Torsten <ttl@justmail.de> parents: 19464 diff changeset	1020 _find_dialog_is_visible = true;
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	1021 _find_dialog->activateWindow ();
15988 38348a6c3db0 gui: initialize search text in the find dialog with selected text in editor file Torsten <ttl@justmail.de> parents: 15984 diff changeset	1022 _find_dialog->init_search_text ();
38348a6c3db0 gui: initialize search text in the find dialog with selected text in editor file Torsten <ttl@justmail.de> parents: 15984 diff changeset	1023
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	1024 }
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	1025
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	1026 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1027 file_editor_tab::goto_line (const QWidget *ID, int line)
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	1028 {
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	1029 if (ID != this)
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	1030 return;
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	1031
16389 f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	1032 if (line <= 0) // ask for desired line
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1033 {
16389 f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	1034 bool ok = false;
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1035 int index;
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1036 _edit_area->getCursorPosition (&line, &index);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1037 line = QInputDialog::getInt (_edit_area, tr ("Goto line"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1038 tr ("Line number"), line+1, 1,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1039 _edit_area->lines (), 1, &ok);
16389 f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	1040 if (ok)
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	1041 {
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	1042 _edit_area->setCursorPosition (line-1, 0);
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	1043 center_current_line ();
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	1044 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1045 }
16389 f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	1046 else // go to given line without dialog
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1047 _edit_area->setCursorPosition (line-1, 0);
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	1048 }
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	1049
18303 106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1050 void
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1051 file_editor_tab::show_auto_completion (const QWidget *ID)
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1052 {
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1053 if (ID != this)
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1054 return;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1055
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1056 QsciScintilla::AutoCompletionSource s = _edit_area->autoCompletionSource ();
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1057 switch (s)
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1058 {
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1059 case QsciScintilla::AcsAll:
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1060 _edit_area->autoCompleteFromAll ();
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1061 break;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1062
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1063 case QsciScintilla::AcsAPIs:
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1064 _edit_area->autoCompleteFromAPIs ();
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1065 break;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1066
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1067 case QsciScintilla::AcsDocument:
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1068 _edit_area->autoCompleteFromDocument ();
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1069 break;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1070
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1071 case QsciScintilla::AcsNone:
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1072 break;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1073 }
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1074 }
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1075
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1076 void
18303 106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1077 file_editor_tab::do_indent_selected_text (bool indent)
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1078 {
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1079 // TODO
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1080 _edit_area->beginUndoAction ();
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1081
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1082 if (_edit_area->hasSelectedText ())
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1083 {
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1084 int lineFrom, lineTo, colFrom, colTo;
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1085 _edit_area->getSelection (&lineFrom, &colFrom, &lineTo, &colTo);
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1086
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1087 if (colTo == 0) // the beginning of last line is not selected
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1088 lineTo--; // stop at line above
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1089
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1090 for (int i = lineFrom; i <= lineTo; i++)
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1091 {
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1092 if (indent)
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1093 _edit_area->indent (i);
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1094 else
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1095 _edit_area->unindent (i);
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1096 }
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1097 //set selection on (un)indented section
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1098 _edit_area->setSelection (lineFrom, 0, lineTo,
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1099 _edit_area->text (lineTo).length ());
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1100 }
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1101 else
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1102 {
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1103 int cpline, col;
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1104 _edit_area->getCursorPosition (&cpline, &col);
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1105 if (indent)
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1106 _edit_area->indent (cpline);
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1107 else
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1108 _edit_area->unindent (cpline);
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1109 }
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1110
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1111 _edit_area->endUndoAction ();
106da7544504 gui: Add indent/unindent edit menu to editor (Bug #41223) John Donoghue <john.donoghue@ieee.org> parents: 18299 diff changeset	1112 }
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	1113
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	1114 void
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	1115 file_editor_tab::do_comment_selected_text (bool comment)
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	1116 {
16737 e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1117 QString comment_str = comment_string (_edit_area->lexer ()->lexer ());
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1118 _edit_area->beginUndoAction ();
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1119
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1120 if (_edit_area->hasSelectedText ())
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	1121 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1122 int lineFrom, lineTo, colFrom, colTo;
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1123 _edit_area->getSelection (&lineFrom, &colFrom, &lineTo, &colTo);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1124
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1125 if (colTo == 0) // the beginning of last line is not selected
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	1126 lineTo--; // stop at line above
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1127
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1128 for (int i = lineFrom; i <= lineTo; i++)
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	1129 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1130 if (comment)
16719 0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	1131 _edit_area->insertAt (comment_str, i, 0);
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	1132 else
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	1133 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1134 QString line (_edit_area->text (i));
16719 0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	1135 if (line.startsWith (comment_str))
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	1136 {
16719 0f6f14e3ac6a commenting selected lines in the editor uses comment string depending on lexer Torsten <ttl@justmail.de> parents: 16717 diff changeset	1137 _edit_area->setSelection (i, 0, i, comment_str.length ());
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1138 _edit_area->removeSelectedText ();
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	1139 }
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	1140 }
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	1141 }
16737 e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1142 //set selection on (un)commented section
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	1143 _edit_area->setSelection (lineFrom, 0, lineTo,
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	1144 _edit_area->text (lineTo).length ());
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	1145 }
16737 e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1146 else
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1147 {
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1148 int cpline, col;
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1149 _edit_area->getCursorPosition (&cpline, &col);
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1150 if (comment)
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1151 _edit_area->insertAt (comment_str, cpline, 0);
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1152 else
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1153 {
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1154 QString line (_edit_area->text (cpline));
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1155 if (line.startsWith (comment_str))
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1156 {
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1157 _edit_area->setSelection (cpline, 0, cpline, comment_str.length ());
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1158 _edit_area->removeSelectedText ();
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1159 }
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1160 }
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1161 }
e81084a745a9 GUI: change (un)comment handling of selection, allow (un)comment of current line Thorsten Liebig <thorsten.liebig@gmx.de> parents: 16731 diff changeset	1162 _edit_area->endUndoAction ();
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	1163 }
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	1164
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	1165 void
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	1166 file_editor_tab::update_window_title (bool modified)
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	1167 {
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	1168 QString title ("");
15984 1eb3c67139f6 Add full-length-name tool tip to editor file tab when name is not full length. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15982 diff changeset	1169 QString tooltip ("");
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1170
17979 a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	1171 if (! valid_file_name ())
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1172 title = tr ("<unnamed>");
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	1173 else
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	1174 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1175 if (_long_title)
15981 e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	1176 title = _file_name;
e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	1177 else
e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	1178 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1179 QFileInfo file (_file_name);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1180 title = file.fileName ();
15984 1eb3c67139f6 Add full-length-name tool tip to editor file tab when name is not full length. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15982 diff changeset	1181 tooltip = _file_name;
15981 e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	1182 }
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	1183 }
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	1184
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1185 if (modified)
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1186 emit file_name_changed (title.prepend ("* "), tooltip);
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	1187 else
15984 1eb3c67139f6 Add full-length-name tool tip to editor file tab when name is not full length. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15982 diff changeset	1188 emit file_name_changed (title, tooltip);
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	1189 }
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	1190
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	1191 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1192 file_editor_tab::handle_copy_available (bool enableCopy)
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	1193 {
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	1194 _copy_available = enableCopy;
18801 095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	1195 emit editor_state_changed (_copy_available, QDir::cleanPath (_file_name),
095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	1196 _is_octave_file);
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	1197 }
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	1198
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1199 // show_dialog: shows a modal or non modal dialog depeding on the closing
18871 08d7dbd728bc save a new file before trying to run it from the editor (bug #42571) Torsten <ttl@justmail.de> parents: 18868 diff changeset	1200 // of the app and the flag _modal_dialog
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1201 void
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1202 file_editor_tab::show_dialog (QDialog *dlg)
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1203 {
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1204 dlg->setAttribute (Qt::WA_DeleteOnClose);
18871 08d7dbd728bc save a new file before trying to run it from the editor (bug #42571) Torsten <ttl@justmail.de> parents: 18868 diff changeset	1205 if (_app_closing \| _modal_dialog)
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1206 dlg->exec ();
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1207 else
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1208 {
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1209 dlg->setWindowModality (Qt::WindowModal);
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1210 dlg->show ();
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1211 }
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1212 }
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1213
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	1214 int
16018 e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	1215 file_editor_tab::check_file_modified ()
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	1216 {
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	1217 int decision = QMessageBox::Yes;
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	1218 if (_edit_area->isModified ())
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	1219 {
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1220 activateWindow ();
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1221 raise ();
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	1222 // File is modified but not saved, ask user what to do. The file
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	1223 // editor tab can't be made parent because it may be deleted depending
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	1224 // upon the response. Instead, change the _edit_area to read only.
16638 3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1225 QMessageBox::StandardButtons buttons = QMessageBox::Save \|
3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1226 QMessageBox::Discard;
3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1227 QString available_actions;
3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1228
19445 ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1229 switch (_app_closing)
16638 3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1230 {
19445 ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1231 case -1: // octave is exiting and so does the gui
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1232 available_actions =
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1233 tr ("Do you want to save or discard the changes?");
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1234 break;
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1235
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1236 case 1: // gui is exiting
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1237 available_actions =
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1238 tr ("Do you want to cancel exiting octave, save or discard the changes?");
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1239 buttons = buttons \| QMessageBox::Cancel;
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1240 break;
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1241
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1242 case 0: // tab is closing
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1243 available_actions =
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1244 tr ("Do you want to cancel closing, save or discard the changes?");
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1245 buttons = buttons \| QMessageBox::Cancel;
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1246 break;
16638 3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1247 }
3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1248
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1249 QString file;
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1250 if (valid_file_name ())
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1251 file = _file_name;
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1252 else
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1253 file = tr ("<unnamed>");
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1254
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1255 QMessageBox* msgBox
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1256 = new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1257 tr ("The file\n"
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1258 "%1\n"
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1259 "is about to be closed but has been modified.\n"
16638 3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1260 "%2").
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1261 arg (file). arg (available_actions),
16638 3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1262 buttons, qobject_cast<QWidget *> (parent ()));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1263
16018 e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	1264 msgBox->setDefaultButton (QMessageBox::Save);
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	1265 _edit_area->setReadOnly (true);
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	1266 connect (msgBox, SIGNAL (finished (int)),
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	1267 this, SLOT (handle_file_modified_answer (int)));
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1268
6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1269 show_dialog (msgBox);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1270
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1271 return QMessageBox::Cancel;
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	1272 }
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	1273 else
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	1274 {
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	1275 // Nothing was modified, just remove from editor.
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	1276 emit tab_remove_request ();
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	1277 }
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	1278
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1279 return decision;
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	1280 }
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	1281
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	1282 void
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	1283 file_editor_tab::handle_file_modified_answer (int decision)
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	1284 {
16018 e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	1285 if (decision == QMessageBox::Save)
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	1286 {
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	1287 // Save file, then remove from editor.
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	1288 save_file (_file_name, true);
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	1289 }
16018 e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	1290 else if (decision == QMessageBox::Discard)
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	1291 {
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	1292 // User doesn't want to save, just remove from editor.
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	1293 emit tab_remove_request ();
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	1294 }
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	1295 else
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	1296 {
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	1297 // User canceled, allow editing again.
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	1298 _edit_area->setReadOnly (false);
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	1299 }
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	1300 }
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	1301
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	1302 void
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	1303 file_editor_tab::set_modified (bool modified)
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	1304 {
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	1305 _edit_area->setModified (modified);
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	1306 }
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	1307
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	1308 QString
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1309 file_editor_tab::load_file (const QString& fileName)
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	1310 {
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1311 // get the absolute path
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1312 QFileInfo file_info = QFileInfo (fileName);
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1313 QString file_to_load;
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1314 if (file_info.exists ())
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1315 file_to_load = file_info.canonicalFilePath ();
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1316 else
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1317 file_to_load = fileName;
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1318 QFile file (file_to_load);
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	1319 if (!file.open (QFile::ReadOnly))
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1320 return file.errorString ();
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	1321
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	1322 QTextStream in (&file);
18299 6736fc9bce24 Set codec when loading/saving files in editor (Bug #41226) John Donoghue <john.donoghue@ieee.org> parents: 18275 diff changeset	1323 in.setCodec("UTF-8");
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	1324 QApplication::setOverrideCursor (Qt::WaitCursor);
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	1325 _edit_area->setText (in.readAll ());
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1326 _edit_area->setEolMode (detect_eol_mode ());
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	1327 QApplication::restoreOverrideCursor ();
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	1328
17636 230ffaf80ac9 fix enabling copy, cut and run selection actions depending on selected text Torsten <ttl@justmail.de> parents: 17635 diff changeset	1329 _copy_available = false; // no selection yet available
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1330 set_file_name (file_to_load);
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	1331 update_window_title (false); // window title (no modification)
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	1332 _edit_area->setModified (false); // loaded file is not modified yet
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	1333
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1334 update_eol_indicator ();
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1335
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	1336 return QString ();
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	1337 }
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	1338
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1339 QsciScintilla::EolMode
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1340 file_editor_tab::detect_eol_mode ()
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1341 {
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1342 char *text = _edit_area->text ().toAscii ().data ();
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1343 int text_size = _edit_area->text ().length ();
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1344
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1345 char eol_lf = 0x0a;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1346 char eol_cr = 0x0d;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1347
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1348 int count_lf = 0;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1349 int count_cr = 0;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1350 int count_crlf = 0;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1351
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1352 for (int i = 0; i < text_size; i++)
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1353 {
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1354 if (text[i] == eol_lf)
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1355 {
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1356 count_lf++;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1357 }
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1358 else
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1359 {
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1360 if (text[i] == eol_cr)
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1361 {
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1362 if ((i < text_size -1) && text[i+1] == eol_lf)
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1363 {
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1364 count_crlf++;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1365 i++;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1366 }
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1367 else
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1368 count_cr++;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1369 }
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1370 }
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1371 }
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1372
19282 54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1373 // get default from OS or from settings
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1374 #if defined (Q_OS_WIN32)
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1375 int os_eol_mode = QsciScintilla::EolWindows;
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1376 #elif defined (Q_OS_MAC)
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1377 int os_eol_mode = QsciScintilla::EolMac;
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1378 #else
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1379 int os_eol_mode = QsciScintilla::EolUnix;
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1380 #endif
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1381 QSettings *settings = resource_manager::get_settings ();
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1382 QsciScintilla::EolMode eol_mode = static_cast<QsciScintilla::EolMode> (
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1383 settings->value("editor/default_eol_mode",os_eol_mode).toInt ());
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1384
19282 54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1385 int count_max = 0;
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1386
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1387 if (count_crlf > count_max)
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1388 {
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1389 eol_mode = QsciScintilla::EolWindows;
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1390 count_max = count_crlf;
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1391 }
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1392 if (count_cr > count_max)
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1393 {
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1394 eol_mode = QsciScintilla::EolMac;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1395 count_max = count_cr;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1396 }
19282 54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1397 if (count_lf > count_max)
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1398 {
19282 54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1399 eol_mode = QsciScintilla::EolUnix;
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1400 count_max = count_lf;
19271 c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1401 }
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1402
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1403 return eol_mode;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1404 }
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1405
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1406 void
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1407 file_editor_tab::update_eol_indicator ()
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1408 {
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1409 switch (_edit_area->eolMode ())
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1410 {
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1411 case QsciScintilla::EolWindows:
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1412 _eol_indicator->setText ("CRLF");
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1413 break;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1414 case QsciScintilla::EolMac:
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1415 _eol_indicator->setText ("CR");
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1416 break;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1417 case QsciScintilla::EolUnix:
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1418 _eol_indicator->setText ("LF");
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1419 break;
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1420 }
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1421 }
c766a1f63c40 detect eol mode when opening a file in the editor of the gui (#bug 43334) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1422
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	1423 void
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16443 diff changeset	1424 file_editor_tab::new_file (const QString &commands)
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	1425 {
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	1426 update_window_title (false); // window title (no modification)
19279 f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1427
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1428 QSettings *settings = resource_manager::get_settings ();
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1429
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1430 // set the eol mode from the settings or depending on the OS if the entry is
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1431 // missing in the settings
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1432 #if defined (Q_OS_WIN32)
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1433 int eol_mode = QsciScintilla::EolWindows;
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1434 #elif defined (Q_OS_MAC)
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1435 int eol_mode = QsciScintilla::EolMac;
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1436 #else
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1437 int eol_mode = QsciScintilla::EolUnix;
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1438 #endif
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1439 _edit_area->setEolMode (
19282 54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1440 static_cast<QsciScintilla::EolMode> (
54943eb0ce37 reorder eol modes in the editor settings Torsten <ttl@justmail.de> parents: 19281 diff changeset	1441 settings->value("editor/default_eol_mode",eol_mode).toInt ()));
19279 f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1442
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1443 update_eol_indicator ();
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1444
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16443 diff changeset	1445 _edit_area->setText (commands);
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	1446 _edit_area->setModified (false); // new file is not modified yet
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	1447 }
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	1448
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	1449 void
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	1450 file_editor_tab::save_file (const QString& saveFileName, bool remove_on_success)
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	1451 {
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	1452 // If it is a new file with no name, signal that saveFileAs
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	1453 // should be performed.
17979 a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	1454 if (! valid_file_name (saveFileName))
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	1455 {
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	1456 save_file_as (remove_on_success);
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	1457 return;
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	1458 }
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1459 // get the absolute path (if existing)
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1460 QFileInfo file_info = QFileInfo (saveFileName);
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1461 QString file_to_save;
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1462 if (file_info.exists ())
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1463 file_to_save = file_info.canonicalFilePath ();
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1464 else
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1465 file_to_save = saveFileName;
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1466 QFile file (file_to_save);
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	1467
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	1468 // stop watching file
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	1469 QStringList trackedFiles = _file_system_watcher.files ();
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1470 if (trackedFiles.contains (file_to_save))
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1471 _file_system_watcher.removePath (file_to_save);
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	1472
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	1473 // open the file for writing
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	1474 if (!file.open (QIODevice::WriteOnly))
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	1475 {
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	1476 // Unsuccessful, begin watching file again if it was being
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	1477 // watched previously.
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1478 if (trackedFiles.contains (file_to_save))
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1479 _file_system_watcher.addPath (file_to_save);
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	1480
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	1481 // Create a NonModal message about error.
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1482 QMessageBox* msgBox
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1483 = new QMessageBox (QMessageBox::Critical,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1484 tr ("Octave Editor"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1485 tr ("Could not open file %1 for write:\n%2.").
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1486 arg (file_to_save).arg (file.errorString ()),
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1487 QMessageBox::Ok, 0);
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1488 show_dialog (msgBox);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1489
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	1490 return;
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	1491 }
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	1492
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	1493 // save the contents into the file
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	1494 QTextStream out (&file);
18299 6736fc9bce24 Set codec when loading/saving files in editor (Bug #41226) John Donoghue <john.donoghue@ieee.org> parents: 18275 diff changeset	1495 out.setCodec("UTF-8");
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	1496 QApplication::setOverrideCursor (Qt::WaitCursor);
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	1497 out << _edit_area->text ();
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1498 out.flush ();
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	1499 QApplication::restoreOverrideCursor ();
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1500 file.flush ();
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1501 file.close ();
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	1502
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1503 // file exists now
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1504 file_info = QFileInfo (file);
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1505 file_to_save = file_info.canonicalFilePath ();
97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1506
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	1507 // save file name after closing file as set_file_name starts watching again
17706 97ed9dd479ab make sure all entries in the editor's mru-menu have an absolute path Torsten <ttl@justmail.de> parents: 17699 diff changeset	1508 set_file_name (file_to_save); // make absolute
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1509
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	1510 // set the window title to actual file name (not modified)
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	1511 update_window_title (false);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1512
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	1513 // files is save -> not modified
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	1514 _edit_area->setModified (false);
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	1515
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	1516 if (remove_on_success)
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	1517 {
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	1518 emit tab_remove_request ();
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	1519 return; // Don't touch member variables after removal
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	1520 }
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	1521 }
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	1522
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	1523 void
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	1524 file_editor_tab::save_file_as (bool remove_on_success)
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	1525 {
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	1526 // Simply put up the file chooser dialog box with a slot connection
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	1527 // then return control to the system waiting for a file selection.
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	1528
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	1529 // If the tab is removed in response to a QFileDialog signal, the tab
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	1530 // can't be a parent.
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	1531 QFileDialog* fileDialog;
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	1532 if (remove_on_success)
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	1533 {
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	1534 // If tab is closed, "this" cannot be parent in which case modality
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	1535 // has no effect. Disable editing instead.
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	1536 _edit_area->setReadOnly (true);
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	1537 fileDialog = new QFileDialog ();
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	1538 }
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	1539 else
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	1540 fileDialog = new QFileDialog (this);
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	1541
16912 6bd74153c3ae no native dialogs to prevent hangs in KDE (patch #7948 by Andre da Costa Barros) Torsten <ttl@justmail.de> parents: 16757 diff changeset	1542 // Giving trouble under KDE (problem is related to Qt signal handling on unix,
6bd74153c3ae no native dialogs to prevent hangs in KDE (patch #7948 by Andre da Costa Barros) Torsten <ttl@justmail.de> parents: 16757 diff changeset	1543 // see https://bugs.kde.org/show_bug.cgi?id=260719 ,
6bd74153c3ae no native dialogs to prevent hangs in KDE (patch #7948 by Andre da Costa Barros) Torsten <ttl@justmail.de> parents: 16757 diff changeset	1544 // it had/has no effect on Windows, though)
6bd74153c3ae no native dialogs to prevent hangs in KDE (patch #7948 by Andre da Costa Barros) Torsten <ttl@justmail.de> parents: 16757 diff changeset	1545 fileDialog->setOption(QFileDialog::DontUseNativeDialog, true);
6bd74153c3ae no native dialogs to prevent hangs in KDE (patch #7948 by Andre da Costa Barros) Torsten <ttl@justmail.de> parents: 16757 diff changeset	1546
19283 d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1547 // get the dialog's layout for adding extra elements
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1548 QGridLayout dialog_layout = dynamic_cast<QGridLayout> (fileDialog->layout ());
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1549 int rows = dialog_layout->rowCount ();
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1550
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1551 // define a new grid layout with the extra elements
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1552 QGridLayout *extra = new QGridLayout (fileDialog);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1553 QSpacerItem *spacer = new QSpacerItem (1,1,QSizePolicy::Expanding,
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1554 QSizePolicy::Fixed);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1555 QFrame *separator = new QFrame (fileDialog);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1556 separator->setFrameShape (QFrame::HLine); // horizontal line as separator
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1557 separator->setFrameStyle (QFrame::Sunken);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1558
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1559 // combo box for choosing new line ending chars
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1560 QLabel *label_eol = new QLabel (tr ("Line Endings:"));
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1561 QComboBox *combo_eol = new QComboBox ();
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1562 combo_eol->addItem ("Windows (CRLF)"); // ensure the same order as in
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1563 combo_eol->addItem ("Mac (CR)"); // the settings dialog
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1564 combo_eol->addItem ("Unix (LF)");
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1565 _save_as_desired_eol = _edit_area->eolMode (); // init with current eol
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1566 combo_eol->setCurrentIndex (_save_as_desired_eol);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1567
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1568 // track changes in the combo box
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1569 connect (combo_eol, SIGNAL (currentIndexChanged (int)),
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1570 this, SLOT (handle_combo_eol_current_index (int)));
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1571
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1572 // build the extra grid layout
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1573 extra->addWidget (separator,0,0,1,3);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1574 extra->addWidget (label_eol,1,0);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1575 extra->addWidget (combo_eol,1,1);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1576 extra->addItem (spacer, 1,2);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1577
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1578 // and add the extra grid layout to the dialog's layout
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1579 dialog_layout->addLayout (extra,rows,0,1,dialog_layout->columnCount ());
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1580
19290 ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1581 // add the possible filters and the default suffix
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1582 QStringList filters;
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1583 filters << tr ("Octave Files (*.m)")
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1584 << tr ("All Files (*)");
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1585 fileDialog->setNameFilters (filters);
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1586 fileDialog->setDefaultSuffix ("m");
19283 d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1587
17979 a761ba02a52f some code cleanup in file_editor_tab Torsten <ttl@justmail.de> parents: 17973 diff changeset	1588 if (valid_file_name ())
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	1589 {
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	1590 fileDialog->selectFile (_file_name);
19290 ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1591 QFileInfo file_info (_file_name);
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1592 if (file_info.suffix () != "m")
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1593 { // it is not an octave file
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1594 fileDialog->selectNameFilter (filters.at (1)); // "All Files"
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1595 fileDialog->setDefaultSuffix (""); // no default suffix
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1596 }
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	1597 }
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	1598 else
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	1599 {
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	1600 fileDialog->selectFile ("");
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1601
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	1602 if (_file_name.isEmpty ())
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1603 fileDialog->setDirectory (QDir::currentPath ());
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1604 else
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	1605 {
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	1606 // The file name is actually the directory name from the
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	1607 // constructor argument.
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	1608 fileDialog->setDirectory (_file_name);
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	1609 }
18868 0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	1610
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	1611 // propose a name corresponding to the function name
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	1612 QString fname = get_function_name ();
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	1613 if (! fname.isEmpty ())
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	1614 fileDialog->selectFile (fname + ".m");
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	1615 }
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1616
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	1617 fileDialog->setAcceptMode (QFileDialog::AcceptSave);
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	1618 fileDialog->setViewMode (QFileDialog::Detail);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1619
19290 ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1620 connect (fileDialog, SIGNAL (filterSelected (const QString&)),
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1621 this, SLOT (handle_save_as_filter_selected (const QString&)));
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1622
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	1623 if (remove_on_success)
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	1624 {
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	1625 connect (fileDialog, SIGNAL (fileSelected (const QString&)),
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	1626 this, SLOT (handle_save_file_as_answer_close (const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1627
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	1628 connect (fileDialog, SIGNAL (rejected ()),
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	1629 this, SLOT (handle_save_file_as_answer_cancel ()));
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	1630 }
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	1631 else
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	1632 {
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	1633 connect (fileDialog, SIGNAL (fileSelected (const QString&)),
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	1634 this, SLOT (handle_save_file_as_answer (const QString&)));
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	1635 }
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1636
17973 6925dca34807 fix saving unnamed editor files when closing octave (bug #40637) Torsten <ttl@justmail.de> parents: 17962 diff changeset	1637 show_dialog (fileDialog);
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	1638 }
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	1639
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	1640 void
19283 d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1641 file_editor_tab::handle_combo_eol_current_index (int index)
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1642 {
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1643 _save_as_desired_eol = static_cast<QsciScintilla::EolMode> (index);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1644 }
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1645
19290 ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1646 void
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1647 file_editor_tab::handle_save_as_filter_selected (const QString& filter)
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1648 {
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1649 QFileDialog file_dialog = qobject_cast<QFileDialog > (sender ());
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1650
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1651 QRegExp rx ("\\\\.([^ ^\\)])[ \\)]"); // regexp for suffix in filter
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1652 int index = rx.indexIn (filter,0); // get first suffix in filter
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1653
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1654 if (index > -1)
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1655 file_dialog->setDefaultSuffix (rx.cap (1)); // found a suffix, set default
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1656 else
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1657 file_dialog->setDefaultSuffix (""); // not found, clear default
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1658 }
ce9bd5ed44d2 usage of default suffix depending on filter in save as dialog (bug #43335) Torsten <ttl@justmail.de> parents: 19283 diff changeset	1659
18275 3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1660 bool
18318 770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1661 file_editor_tab::check_valid_identifier (QString file_name)
18275 3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1662 {
18318 770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1663 QFileInfo file = QFileInfo (file_name);
770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1664 QString base_name = file.baseName ();
18275 3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1665
18318 770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1666 if ((file.suffix () == "m")
770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1667 && (! valid_identifier (base_name.toStdString ())))
18275 3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1668 {
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1669 int ans = QMessageBox::question (0, tr ("Octave Editor"),
18318 770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1670 tr ("\"%1\"\n"
770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1671 "is not a valid identifier.\n\n"
770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1672 "If you keep this file name, you will not be able to\n"
770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1673 "call your script using its name as an Octave command.\n\n"
770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1674 "Do you want to choose another name?").arg (base_name),
18275 3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1675 QMessageBox::Yes \| QMessageBox::No, QMessageBox::Yes);
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1676
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1677 if (ans == QMessageBox::Yes)
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1678 return true;
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1679 }
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1680
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1681 return false;
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1682 }
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1683
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	1684 void
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	1685 file_editor_tab::handle_save_file_as_answer (const QString& saveFileName)
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	1686 {
19283 d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1687 if (_save_as_desired_eol != _edit_area->eolMode ())
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1688 convert_eol (this,_save_as_desired_eol);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1689
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	1690 if (saveFileName == _file_name)
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	1691 {
18082 c3e7da9836bd allow saving an editor file as the current one (bug #40759) Torsten <ttl@justmail.de> parents: 17979 diff changeset	1692 // same name as actual file, save it as "save" would do
c3e7da9836bd allow saving an editor file as the current one (bug #40759) Torsten <ttl@justmail.de> parents: 17979 diff changeset	1693 save_file (saveFileName);
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	1694 }
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	1695 else
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	1696 {
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	1697 // Have editor check for conflict, do not delete tab after save.
18318 770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1698 if (check_valid_identifier (saveFileName))
18275 3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1699 save_file_as (false);
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1700 else
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1701 emit editor_check_conflict_save (saveFileName, false);
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	1702 }
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	1703 }
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	1704
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	1705 void
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	1706 file_editor_tab::handle_save_file_as_answer_close (const QString& saveFileName)
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	1707 {
19283 d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1708 if (_save_as_desired_eol != _edit_area->eolMode ())
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1709 {
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1710 _edit_area->setReadOnly (false); // was set to read-only in save_file_as
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1711 convert_eol (this,_save_as_desired_eol);
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1712 _edit_area->setReadOnly (true); // restore read-only mode
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1713 }
d10c711a08d8 add a drop down menu with the eol mode in the save-file-as-dialog Torsten <ttl@justmail.de> parents: 19282 diff changeset	1714
18082 c3e7da9836bd allow saving an editor file as the current one (bug #40759) Torsten <ttl@justmail.de> parents: 17979 diff changeset	1715 // saveFileName == _file_name can not happen, because we only can get here
c3e7da9836bd allow saving an editor file as the current one (bug #40759) Torsten <ttl@justmail.de> parents: 17979 diff changeset	1716 // when we close a tab and _file_name is not a valid file name yet
c3e7da9836bd allow saving an editor file as the current one (bug #40759) Torsten <ttl@justmail.de> parents: 17979 diff changeset	1717
c3e7da9836bd allow saving an editor file as the current one (bug #40759) Torsten <ttl@justmail.de> parents: 17979 diff changeset	1718 // Have editor check for conflict, delete tab after save.
18318 770c525a1a2b Warn when saving/running a script whose name is not a valid identifier. Julien Bect <julien.bect@supelec.fr> parents: 18315 diff changeset	1719 if (check_valid_identifier (saveFileName))
18275 3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1720 save_file_as (true);
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1721 else
3a26bb54655e warn when saving or executing a file with spaces in its name (bug #41136) Torsten <ttl@justmail.de> parents: 18236 diff changeset	1722 emit editor_check_conflict_save (saveFileName, true);
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	1723 }
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	1724
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	1725 void
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	1726 file_editor_tab::handle_save_file_as_answer_cancel ()
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	1727 {
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	1728 // User canceled, allow editing again.
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	1729 _edit_area->setReadOnly (false);
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	1730 }
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	1731
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	1732 void
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	1733 file_editor_tab::file_has_changed (const QString&)
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	1734 {
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	1735 // Prevent popping up multiple message boxes when the file has
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	1736 // been changed multiple times by temporarily removing from the
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	1737 // file watcher.
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	1738 QStringList trackedFiles = _file_system_watcher.files ();
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	1739 if (!trackedFiles.isEmpty ())
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	1740 _file_system_watcher.removePath (_file_name);
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	1741
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	1742 if (QFile::exists (_file_name))
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	1743 {
18980 0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1744 if (_always_reload_changed_files)
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1745
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1746 load_file (_file_name);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1747
18980 0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1748 else
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1749 {
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1750 // Create a WindowModal message that blocks the edit area
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1751 // by making _edit_area parent.
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1752 QMessageBox* msgBox
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1753 = new QMessageBox (QMessageBox::Warning,
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1754 tr ("Octave Editor"),
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1755 tr ("It seems that \'%1\' has been modified by another application. Do you want to reload it?").
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1756 arg (_file_name),
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1757 QMessageBox::Yes \| QMessageBox::No, this);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1758
18980 0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1759 connect (msgBox, SIGNAL (finished (int)),
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1760 this, SLOT (handle_file_reload_answer (int)));
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1761
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1762 msgBox->setWindowModality (Qt::WindowModal);
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1763 msgBox->setAttribute (Qt::WA_DeleteOnClose);
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1764 msgBox->show ();
0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1765 }
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	1766 }
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	1767 else
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	1768 {
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1769 QString modified = "";
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1770 if (_edit_area->isModified ())
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1771 modified = tr ("\n\nWarning: The contents in the editor is modified!");
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1772
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1773 // Create a WindowModal message. The file editor tab can't be made
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1774 // parent because it may be deleted depending upon the response.
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1775 // Instead, change the _edit_area to read only.
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1776 QMessageBox* msgBox
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1777 = new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1778 tr ("It seems that the file\n"
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1779 "%1\n"
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1780 "has been deleted or renamed. Do you want to save it now?%2").
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1781 arg (_file_name).arg (modified),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1782 QMessageBox::Save \| QMessageBox::Close, 0);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1783
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1784 _edit_area->setReadOnly (true);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1785
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	1786 connect (msgBox, SIGNAL (finished (int)),
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	1787 this, SLOT (handle_file_resave_answer (int)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1788
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	1789 msgBox->setWindowModality (Qt::WindowModal);
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	1790 msgBox->setAttribute (Qt::WA_DeleteOnClose);
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	1791 msgBox->show ();
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	1792 }
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	1793 }
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	1794
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	1795 void
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16402 diff changeset	1796 file_editor_tab::notice_settings (const QSettings *settings)
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	1797 {
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16402 diff changeset	1798 // QSettings pointer is checked before emitting.
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16402 diff changeset	1799
16720 973fd2367d44 select octave lexer for unnamed files and bash lexer for files without extension Torsten <ttl@justmail.de> parents: 16719 diff changeset	1800 update_lexer ();
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	1801
18767 f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1802 // code folding
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1803 if (settings->value ("editor/code_folding",true).toBool ())
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1804 {
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1805 _edit_area->setMarginType (3, QsciScintilla::SymbolMargin);
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1806 _edit_area->setFolding (QsciScintilla::BoxedTreeFoldStyle , 3);
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1807 }
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1808 else
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1809 {
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1810 _edit_area->setFolding (QsciScintilla::NoFoldStyle, 3);
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1811 }
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1812
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1813 // status bar
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1814 if (settings->value ("editor/show_edit_status_bar",true).toBool ())
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1815 _status_bar->show ();
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1816 else
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1817 _status_bar->hide ();
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18721 diff changeset	1818
16693 e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	1819 //highlight current line color
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	1820 QVariant default_var = QColor (240, 240, 240);
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	1821 QColor setting_color = settings->value ("editor/highlight_current_line_color",
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	1822 default_var).value<QColor> ();
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	1823 _edit_area->setCaretLineBackgroundColor (setting_color);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1824 _edit_area->setCaretLineVisible
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1825 (settings->value ("editor/highlightCurrentLine", true).toBool ());
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	1826
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1827 bool match_keywords = settings->value
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	1828 ("editor/codeCompletion_keywords",true).toBool ();
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1829 bool match_document = settings->value
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	1830 ("editor/codeCompletion_document",true).toBool ();
16679 cf939872811c options for auto completion threshold, source and word replacement in settings Torsten <ttl@justmail.de> parents: 16678 diff changeset	1831
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1832 QsciScintilla::AutoCompletionSource source = QsciScintilla::AcsNone;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1833 if (match_keywords)
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1834 if (match_document)
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1835 source = QsciScintilla::AcsAll;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1836 else
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1837 source = QsciScintilla::AcsAPIs;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1838 else if (match_document)
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1839 source = QsciScintilla::AcsDocument;
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1840 _edit_area->setAutoCompletionSource (source);
16679 cf939872811c options for auto completion threshold, source and word replacement in settings Torsten <ttl@justmail.de> parents: 16678 diff changeset	1841
18482 3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1842 _edit_area->setAutoCompletionReplaceWord
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1843 (settings->value ("editor/codeCompletion_replace",false).toBool ());
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1844 _edit_area->setAutoCompletionCaseSensitivity
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1845 (settings->value ("editor/codeCompletion_case",true).toBool ());
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1846
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1847 if (settings->value ("editor/codeCompletion", true).toBool ())
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1848 _edit_area->setAutoCompletionThreshold
3a509de8e791 automatic completion list as user preference (bug #41469) Torsten <ttl@justmail.de> parents: 18460 diff changeset	1849 (settings->value ("editor/codeCompletion_threshold",2).toInt ());
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	1850 else
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	1851 _edit_area->setAutoCompletionThreshold (-1);
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	1852
16702 553cfdd5d660 make white space visibility in the editor configurable Torsten <ttl@justmail.de> parents: 16701 diff changeset	1853 if (settings->value ("editor/show_white_space",false).toBool ())
553cfdd5d660 make white space visibility in the editor configurable Torsten <ttl@justmail.de> parents: 16701 diff changeset	1854 if (settings->value ("editor/show_white_space_indent",false).toBool ())
553cfdd5d660 make white space visibility in the editor configurable Torsten <ttl@justmail.de> parents: 16701 diff changeset	1855 _edit_area->setWhitespaceVisibility (QsciScintilla::WsVisibleAfterIndent);
553cfdd5d660 make white space visibility in the editor configurable Torsten <ttl@justmail.de> parents: 16701 diff changeset	1856 else
553cfdd5d660 make white space visibility in the editor configurable Torsten <ttl@justmail.de> parents: 16701 diff changeset	1857 _edit_area->setWhitespaceVisibility (QsciScintilla::WsVisible);
553cfdd5d660 make white space visibility in the editor configurable Torsten <ttl@justmail.de> parents: 16701 diff changeset	1858 else
553cfdd5d660 make white space visibility in the editor configurable Torsten <ttl@justmail.de> parents: 16701 diff changeset	1859 _edit_area->setWhitespaceVisibility (QsciScintilla::WsInvisible);
553cfdd5d660 make white space visibility in the editor configurable Torsten <ttl@justmail.de> parents: 16701 diff changeset	1860
19279 f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1861 _edit_area->setEolVisibility (
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1862 settings->value("editor/show_eol_chars",false).toBool ());
f3c4b48f3c53 add a preference for the default eol mode of new files (bug #43334) Torsten <ttl@justmail.de> parents: 19278 diff changeset	1863
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1864 if (settings->value ("editor/showLineNumbers", true).toBool ())
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	1865 {
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	1866 _edit_area->setMarginLineNumbers (2, true);
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	1867 auto_margin_width ();
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	1868 connect (_edit_area, SIGNAL (linesChanged ()),
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	1869 this, SLOT (auto_margin_width ()));
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	1870 }
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	1871 else
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	1872 {
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	1873 _edit_area->setMarginLineNumbers (2, false);
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	1874 disconnect (_edit_area, SIGNAL (linesChanged ()), 0, 0);
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	1875 }
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	1876
16703 5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1877 _edit_area->setAutoIndent
5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1878 (settings->value ("editor/auto_indent",true).toBool ());
5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1879 _edit_area->setTabIndents
5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1880 (settings->value ("editor/tab_indents_line",false).toBool ());
5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1881 _edit_area->setBackspaceUnindents
5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1882 (settings->value ("editor/backspace_unindents_line",false).toBool ());
5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1883 _edit_area->setIndentationGuides
5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1884 (settings->value ("editor/show_indent_guides",false).toBool ());
19358 5fb4505b84ff provide option for using tabs for indentations in the editor Torsten <ttl@justmail.de> parents: 19290 diff changeset	1885 _edit_area->setIndentationsUseTabs
5fb4505b84ff provide option for using tabs for indentations in the editor Torsten <ttl@justmail.de> parents: 19290 diff changeset	1886 (settings->value ("editor/indent_uses_tabs",false).toBool ());
19366 cd2a75e5cd6e use indentation width for the editor from the settings (bug #43592) Torsten <ttl@justmail.de> parents: 19358 diff changeset	1887 _edit_area->setIndentationWidth
cd2a75e5cd6e use indentation width for the editor from the settings (bug #43592) Torsten <ttl@justmail.de> parents: 19358 diff changeset	1888 (settings->value ("editor/indent_width",2).toInt ());
16703 5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1889
5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1890 _edit_area->setTabWidth
5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1891 (settings->value ("editor/tab_width",2).toInt ());
5cf19370011d add more settings concerning tabs and indentation to the editor settings Torsten <ttl@justmail.de> parents: 16702 diff changeset	1892
19464 472a5572849c hiding horizontal scroll bar in editor when not needed (bug #41592) Torsten <ttl@justmail.de> parents: 19460 diff changeset	1893 _edit_area->SendScintilla (QsciScintillaBase::SCI_SETHSCROLLBAR,
472a5572849c hiding horizontal scroll bar in editor when not needed (bug #41592) Torsten <ttl@justmail.de> parents: 19460 diff changeset	1894 settings->value ("editor/show_hscroll_bar",true).toBool ());
472a5572849c hiding horizontal scroll bar in editor when not needed (bug #41592) Torsten <ttl@justmail.de> parents: 19460 diff changeset	1895 _edit_area->SendScintilla (QsciScintillaBase::SCI_SETSCROLLWIDTH,-1);
19624 6d75f1683ce8 fix scroll width of horizontal scroll bar (bug #44040) Torsten <ttl@justmail.de> parents: 19475 diff changeset	1896 _edit_area->SendScintilla (QsciScintillaBase::SCI_SETSCROLLWIDTHTRACKING,true);
19464 472a5572849c hiding horizontal scroll bar in editor when not needed (bug #41592) Torsten <ttl@justmail.de> parents: 19460 diff changeset	1897
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1898 _long_title = settings->value ("editor/longWindowTitle", false).toBool ();
16757 35d9f1f79f06 update editor tab titles due to changed settings regarding the modifed state Torsten <ttl@justmail.de> parents: 16737 diff changeset	1899 update_window_title (_edit_area->isModified ());
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	1900
18489 6eae8ba32e62 provide a long line marker in the editor Torsten <ttl@justmail.de> parents: 18483 diff changeset	1901 _edit_area->setEdgeColumn (
6eae8ba32e62 provide a long line marker in the editor Torsten <ttl@justmail.de> parents: 18483 diff changeset	1902 settings->value ("editor/long_line_column",80).toInt ());
6eae8ba32e62 provide a long line marker in the editor Torsten <ttl@justmail.de> parents: 18483 diff changeset	1903 if (settings->value ("editor/long_line_marker",true).toBool ())
6eae8ba32e62 provide a long line marker in the editor Torsten <ttl@justmail.de> parents: 18483 diff changeset	1904 _edit_area->setEdgeMode (QsciScintilla::EdgeLine);
6eae8ba32e62 provide a long line marker in the editor Torsten <ttl@justmail.de> parents: 18483 diff changeset	1905 else
6eae8ba32e62 provide a long line marker in the editor Torsten <ttl@justmail.de> parents: 18483 diff changeset	1906 _edit_area->setEdgeMode (QsciScintilla::EdgeNone);
6eae8ba32e62 provide a long line marker in the editor Torsten <ttl@justmail.de> parents: 18483 diff changeset	1907
18980 0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1908 // reload changed files
19629 be7ac98fab43 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19628 diff changeset	1909 _always_reload_changed_files =
18980 0be65bd7f369 add an user preference for loading changed files without a prompt (bug #42678) Torsten <ttl@justmail.de> parents: 18872 diff changeset	1910 settings->value ("editor/always_reload_changed_files",false).toBool ();
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	1911 }
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	1912
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	1913 void
16716 23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	1914 file_editor_tab::auto_margin_width ()
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	1915 {
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	1916 _edit_area->setMarginWidth (2, "1"+QString::number (_edit_area->lines ()));
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	1917 }
23b5dde25367 make octave lexer the default and dynamically set margin width for line numbers Torsten <ttl@justmail.de> parents: 16715 diff changeset	1918
19445 ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1919 // the following close request was changed from a signal slot into a
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1920 // normal function because we need the return value from close whether
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1921 // the tab really was closed (for canceling exiting octave).
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1922 // When emitting a signal, only the return value from the last slot
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1923 // goes back to the sender
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1924 bool
ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1925 file_editor_tab::conditional_close (int app_closing)
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	1926 {
16638 3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	1927 _app_closing = app_closing;
19445 ed0df431631b allow to cancel exiting if editor tabs are modified and exit is requested in gui Torsten <ttl@justmail.de> parents: 19382 diff changeset	1928 return close ();
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	1929 }
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	1930
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	1931 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1932 file_editor_tab::change_editor_state (const QWidget *ID)
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	1933 {
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	1934 if (ID != this)
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	1935 {
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	1936 // Widget may be going out of focus. If so, record location.
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	1937 if (_find_dialog)
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	1938 {
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	1939 if (_find_dialog->isVisible ())
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	1940 {
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	1941 _find_dialog_geometry = _find_dialog->geometry ();
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	1942 _find_dialog->hide ();
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	1943 }
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	1944 }
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	1945 return;
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	1946 }
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	1947
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	1948 if (_find_dialog && _find_dialog_is_visible)
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	1949 {
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	1950 _find_dialog->setGeometry (_find_dialog_geometry);
19475 521d4959fc42 fix positioning issues of editor find dialog (bug #43174) Torsten <ttl@justmail.de> parents: 19464 diff changeset	1951 QPoint p = _find_dialog->pos ();
521d4959fc42 fix positioning issues of editor find dialog (bug #43174) Torsten <ttl@justmail.de> parents: 19464 diff changeset	1952 _find_dialog->move(p.x ()+10, p.y ()+10);
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	1953 _find_dialog->show ();
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	1954 }
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1955
18801 095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	1956 emit editor_state_changed (_copy_available, QDir::cleanPath (_file_name),
095fdef3d67c use editors run selection action for the context menu Torsten <ttl@justmail.de> parents: 18767 diff changeset	1957 _is_octave_file);
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	1958 }
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	1959
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	1960 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1961 file_editor_tab::file_name_query (const QWidget *ID)
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	1962 {
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	1963 // A zero (null pointer) means that all file editor tabs
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	1964 // should respond, otherwise just the desired file editor tab.
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	1965 if (ID != this && ID != 0)
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	1966 return;
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	1967
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	1968 // Unnamed files shouldn't be transmitted.
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	1969 if (!_file_name.isEmpty ())
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1970 emit add_filename_to_list (_file_name, this);
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	1971 }
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	1972
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	1973 void
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	1974 file_editor_tab::handle_file_reload_answer (int decision)
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	1975 {
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	1976 if (decision == QMessageBox::Yes)
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1977 {
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1978 // reload: file is readded to the file watcher in set_file_name ()
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	1979 load_file (_file_name);
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	1980 }
15849 e55a64f49346 editor: prevent reloaded file from being added twice to the file watcher Torsten <ttl@justmail.de> parents: 15848 diff changeset	1981 else
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1982 {
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1983 // do not reload: readd to the file watche
15849 e55a64f49346 editor: prevent reloaded file from being added twice to the file watcher Torsten <ttl@justmail.de> parents: 15848 diff changeset	1984 _file_system_watcher.addPath (_file_name);
e55a64f49346 editor: prevent reloaded file from being added twice to the file watcher Torsten <ttl@justmail.de> parents: 15848 diff changeset	1985 }
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	1986 }
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	1987
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	1988 void
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	1989 file_editor_tab::handle_file_resave_answer (int decision)
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	1990 {
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1991 // check decision of user in dialog
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	1992 if (decision == QMessageBox::Save)
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	1993 {
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1994 save_file (_file_name); // readds file to watcher in set_file_name ()
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1995 _edit_area->setReadOnly (false); // delete read only flag
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	1996 }
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	1997 else
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	1998 {
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1999 // Definitely close the file.
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	2000 // Set modified to false to prevent the dialog box when the close event
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	2001 // is posted. If the user cancels the close in this dialog the tab is
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	2002 // left open with a non-existing file.
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	2003 _edit_area->setModified (false);
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	2004 close ();
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	2005 }
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	2006 }
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	2007
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	2008 void
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	2009 file_editor_tab::insert_debugger_pointer (const QWidget *ID, int line)
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	2010 {
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	2011 if (ID != this \|\| ID == 0)
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	2012 return;
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	2013
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	2014 if (line > 0)
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	2015 {
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	2016 _edit_area->markerAdd (line-1, debugger_position);
16389 f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2017 center_current_line ();
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	2018 }
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	2019 }
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15860 diff changeset	2020
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2021 void
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	2022 file_editor_tab::delete_debugger_pointer (const QWidget *ID, int line)
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	2023 {
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	2024 if (ID != this \|\| ID == 0)
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	2025 return;
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	2026
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	2027 if (line > 0)
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	2028 _edit_area->markerDelete (line-1, debugger_position);
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	2029 }
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	2030
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	2031 void
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	2032 file_editor_tab::do_breakpoint_marker (bool insert, const QWidget *ID, int line)
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2033 {
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2034 if (ID != this \|\| ID == 0)
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2035 return;
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2036
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2037 if (line > 0)
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2038 {
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2039 if (insert)
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	2040 _edit_area->markerAdd (line-1, breakpoint);
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2041 else
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16520 diff changeset	2042 _edit_area->markerDelete (line-1, breakpoint);
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2043 }
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2044 }
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16379 diff changeset	2045
16389 f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2046
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2047 void
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2048 file_editor_tab::center_current_line ()
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2049 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2050 long int visible_lines
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2051 = _edit_area->SendScintilla (QsciScintillaBase::SCI_LINESONSCREEN);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2052
16389 f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2053 if (visible_lines > 2)
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2054 {
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2055 int line, index;
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2056 _edit_area->getCursorPosition (&line, &index);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2057
16389 f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2058 int first_line = _edit_area->firstVisibleLine ();
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2059 first_line = first_line + (line - first_line - (visible_lines-1)/2);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	2060
16591 2931e9282190 * file-editor-tab.cc: replace setFirstVisibleLine for older Qscintilla-versions Torsten <ttl@justmail.de> parents: 16570 diff changeset	2061 _edit_area->SendScintilla (2613,first_line); // SCI_SETFIRSTVISIBLELINE
16389 f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2062 }
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2063 }
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16388 diff changeset	2064
19627 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19271 diff changeset	2065 void
17962 4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	2066 file_editor_tab::handle_cursor_moved (int line, int col)
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	2067 {
18483 0f3bc7ccb875 update the completion list of the editor while typing Torsten <ttl@justmail.de> parents: 18482 diff changeset	2068 if (_edit_area->SendScintilla (QsciScintillaBase::SCI_AUTOCACTIVE))
0f3bc7ccb875 update the completion list of the editor while typing Torsten <ttl@justmail.de> parents: 18482 diff changeset	2069 show_auto_completion (this);
0f3bc7ccb875 update the completion list of the editor while typing Torsten <ttl@justmail.de> parents: 18482 diff changeset	2070
17962 4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	2071 _row_indicator->setNum (line+1);
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	2072 _col_indicator->setNum (col+1);
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	2073 }
4a53bcc1a4ae GUI: Add statusbar with line/col indicator to editor window (Bug #40626) John Donoghue <john.donoghue@ieee.org> parents: 17790 diff changeset	2074
18868 0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2075 QString
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2076 file_editor_tab::get_function_name ()
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2077 {
19039 bf7c5d96d1ff improved regexp for file name suggestion when saving a new editor file Torsten <ttl@justmail.de> parents: 19038 diff changeset	2078 QRegExp rxfun1 ("^[\t ]function[^=]+=([^\$]+)\\([^\$]\\)[\t ]*$");
bf7c5d96d1ff improved regexp for file name suggestion when saving a new editor file Torsten <ttl@justmail.de> parents: 19038 diff changeset	2079 QRegExp rxfun2 ("^[\t ]function[\t ]+([^\$]+)\\([^\$]\\)[\t ]*$");
19077 2e6b34324d50 fix compile warning in gui editor tab Torsten <ttl@justmail.de> parents: 19039 diff changeset	2080 QRegExp rxfun3 ("^[\t ]function[^=]+=[\t ]([^\\s]+)[\t ]*$");
2e6b34324d50 fix compile warning in gui editor tab Torsten <ttl@justmail.de> parents: 19039 diff changeset	2081 QRegExp rxfun4 ("^[\t ]function[\t ]+([^\\s]+)[\t ]$");
18868 0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2082
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2083 QStringList lines = _edit_area->text ().split ("\n");
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2084
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2085 for (int i = 0; i < lines.count (); i++)
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2086 {
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2087 if (rxfun1.indexIn (lines.at (i)) != -1)
19039 bf7c5d96d1ff improved regexp for file name suggestion when saving a new editor file Torsten <ttl@justmail.de> parents: 19038 diff changeset	2088 return rxfun1.cap (1).remove (QRegExp("[ \t]*"));
18868 0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2089 else if (rxfun2.indexIn (lines.at (i)) != -1)
19039 bf7c5d96d1ff improved regexp for file name suggestion when saving a new editor file Torsten <ttl@justmail.de> parents: 19038 diff changeset	2090 return rxfun2.cap (1).remove (QRegExp("[ \t]*"));
18868 0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2091 else if (rxfun3.indexIn (lines.at (i)) != -1)
19039 bf7c5d96d1ff improved regexp for file name suggestion when saving a new editor file Torsten <ttl@justmail.de> parents: 19038 diff changeset	2092 return rxfun3.cap (1).remove (QRegExp("[ \t]*"));
bf7c5d96d1ff improved regexp for file name suggestion when saving a new editor file Torsten <ttl@justmail.de> parents: 19038 diff changeset	2093 else if (rxfun4.indexIn (lines.at (i)) != -1)
bf7c5d96d1ff improved regexp for file name suggestion when saving a new editor file Torsten <ttl@justmail.de> parents: 19038 diff changeset	2094 return rxfun4.cap (1).remove (QRegExp("[ \t]*"));
18868 0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2095 }
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2096
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2097 return QString ();
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2098 }
0e6f7b5f6556 propose function name as file name when saving a new file (bug #42568) Torsten <ttl@justmail.de> parents: 18867 diff changeset	2099
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15860 diff changeset	2100 #endif

Mercurial > octave-nkf

annotate libgui/src/m-editor/file-editor-tab.cc @ 19642:4b980842edba gui-release