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

annotate libgui/src/m-editor/octave-qscintilla.cc @ 25617:44d638d5eea5

reorganize constants for preferences keys and default values * editor-settings.h: rename into gui-preferences.h * gui-preferences.h: define a structure for key string and default value, reorganize existing constants using the new structure, renaming constants reflecting the main widget they are used in * file-editor-tab.cc: include gui-preferences.h; (do_comment_selected_text): use const structure with new names for preferences keys and default values file-editor-tab.cc Wed Jul 11 07:56:05 2018 +0200 * octave-qscintilla.cc: include gui-preferences.h; (comment_string): use const structure with new names for preferences keys and default values * module.mk: rename editor-settings.h into gui-preferences.h * settings-dialog.cc: include gui-preferences.h; (settings_dialog, write_changed_settings): use const structure with new names for preferences keys and default values * settings-dialog.h: include gui-preferences.h, use const structure with new names for preferences keys and default values

author	Torsten <mttl@mailbox.org>
date	Fri, 13 Jul 2018 22:58:56 +0200
parents	d7aafcb1dc1a
children	94b8dc8292af

rev	line source
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	1 /*
01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	2
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24716 diff changeset	3 Copyright (C) 2013-2018 Torsten
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	4
01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	5 This file is part of Octave.
01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24475 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24475 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	10 (at your option) any later version.
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	15 GNU General Public License for more details.
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	16
01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	17 You should have received a copy of the GNU General Public License
01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24475 diff changeset	19 <https://www.gnu.org/licenses/>.
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	20
01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	21 */
01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	22
16768 e2de3c8882be copyright notice fixes John W. Eaton <jwe@octave.org> parents: 16735 diff changeset	23 // Author: Torsten <ttl@justmail.de>
e2de3c8882be copyright notice fixes John W. Eaton <jwe@octave.org> parents: 16735 diff changeset	24
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	25 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	26 # include "config.h"
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	27 #endif
01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	28
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	29 #if defined (HAVE_QSCINTILLA)
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	30
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	31 #include <Qsci/qscilexer.h>
4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	32
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	33 #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	34 # define HAVE_LEXER_OCTAVE 1
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	35 # include <Qsci/qscilexeroctave.h>
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	36 #elif defined (HAVE_QSCI_QSCILEXERMATLAB_H)
aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	37 # define HAVE_LEXER_MATLAB 1
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	38 # include <Qsci/qscilexermatlab.h>
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	39 #endif
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	40 #include <Qsci/qscilexercpp.h>
4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	41 #include <Qsci/qscilexerbash.h>
4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	42 #include <Qsci/qscilexerperl.h>
4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	43 #include <Qsci/qscilexerbatch.h>
4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	44 #include <Qsci/qscilexerdiff.h>
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	45
18656 1b289f45187f add some qscintilla actions to the menu and to the shortcut manager Torsten <ttl@justmail.de> parents: 18560 diff changeset	46 #include <Qsci/qscicommandset.h>
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	47
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	48 #include <QKeySequence>
18560 26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18460 diff changeset	49 #include <QShortcut>
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	50 #include <QToolTip>
ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	51 #include <QVBoxLayout>
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	52
25617 44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	53 #include "gui-preferences.h"
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	54 #include "resource-manager.h"
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	55 #include "shortcut-manager.h"
16735 cee305c91e91 show help menu in editors context menu only for octave files Torsten <ttl@justmail.de> parents: 16733 diff changeset	56
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	57 #include "octave-qscintilla.h"
01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	58 #include "file-editor-tab.h"
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	59 // FIXME: hardwired marker numbers?
2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	60 #include "marker.h"
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	61
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	62 // Return true if CANDIDATE is a "closing" that matches OPENING,
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	63 // such as "end" or "endif" for "if", or "catch" for "try".
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	64 // Used for testing the last word of an "if" etc. line,
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	65 // or the first word of the following line.
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	66
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	67 static bool
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	68 is_end (const QString& candidate, const QString& opening)
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	69 {
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	70 bool retval = false;
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	71
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	72 if (opening == "do") // The only one that can't be ended by "end"
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	73 {
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	74 if (candidate == "until")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	75 retval = true;
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	76 }
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	77 else
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	78 {
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	79 if (candidate == "end")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	80 retval = true;
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	81 else
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	82 {
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	83 if (opening == "try")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	84 {
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	85 if (candidate == "catch" \|\| candidate == "end_try_catch")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	86 retval = true;
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	87 }
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	88 else if (opening == "unwind_protect")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	89 {
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	90 if (candidate == "unwind_protect_cleanup"
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	91 \|\| candidate == "end_unwind_protect")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	92 retval = true;
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	93 }
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	94 else if (candidate == "end" + opening)
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	95 retval = true;
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	96 else if (opening == "if" && candidate == "else")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	97 retval = true;
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	98 }
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	99 }
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	100
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	101 return retval;
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	102 }
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	103
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	104 namespace octave
18560 26d15a57f45b add menu entries and shortcuts for zoom functions in the editor (bug #41516) Torsten <ttl@justmail.de> parents: 18460 diff changeset	105 {
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	106 octave_qscintilla::octave_qscintilla (QWidget *p)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	107 : QsciScintilla (p), m_word_at_cursor (), m_selection (),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	108 m_selection_replacement (), m_selection_line (-1),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	109 m_selection_col (-1), m_indicator_id (1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	110 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	111 connect (this, SIGNAL (textChanged (void)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	112 this, SLOT (text_changed (void)));
18689 fac35875f6eb update enabled status of undo/redo actions in the editor Torsten <ttl@justmail.de> parents: 18687 diff changeset	113
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	114 connect (this, SIGNAL (cursorPositionChanged (int, int)),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	115 this, SLOT (cursor_position_changed (int, int)));
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	116
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	117 // clear scintilla edit shortcuts that are handled by the editor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	118 QsciCommandSet *cmd_set = standardCommands ();
18675 c199304dfb2a handling qscintilla internal shortcuts and commands depending on qsci version Torsten <ttl@justmail.de> parents: 18656 diff changeset	119
25523 5daeb4049088 gui: fix editor rendering on some displays, disable QScintilla buffered drawing Mike Miller <mtmiller@octave.org> parents: 25103 diff changeset	120 // Disable buffered drawing on all systems
5daeb4049088 gui: fix editor rendering on some displays, disable QScintilla buffered drawing Mike Miller <mtmiller@octave.org> parents: 25103 diff changeset	121 SendScintilla (SCI_SETBUFFEREDDRAW, false);
5daeb4049088 gui: fix editor rendering on some displays, disable QScintilla buffered drawing Mike Miller <mtmiller@octave.org> parents: 25103 diff changeset	122
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	123 #if defined (HAVE_QSCI_VERSION_2_6_0)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	124 // find () was added in QScintilla 2.6
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	125 cmd_set->find (QsciCommand::SelectionCopy)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	126 cmd_set->find (QsciCommand::SelectionCut)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	127 cmd_set->find (QsciCommand::Paste)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	128 cmd_set->find (QsciCommand::SelectAll)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	129 cmd_set->find (QsciCommand::SelectionDuplicate)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	130 cmd_set->find (QsciCommand::LineTranspose)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	131 cmd_set->find (QsciCommand::Undo)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	132 cmd_set->find (QsciCommand::Redo)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	133 cmd_set->find (QsciCommand::SelectionUpperCase)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	134 cmd_set->find (QsciCommand::SelectionLowerCase)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	135 cmd_set->find (QsciCommand::ZoomIn)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	136 cmd_set->find (QsciCommand::ZoomOut)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	137 cmd_set->find (QsciCommand::DeleteWordLeft)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	138 cmd_set->find (QsciCommand::DeleteWordRight)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	139 cmd_set->find (QsciCommand::DeleteLineLeft)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	140 cmd_set->find (QsciCommand::DeleteLineRight)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	141 cmd_set->find (QsciCommand::LineDelete)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	142 cmd_set->find (QsciCommand::LineCut)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	143 cmd_set->find (QsciCommand::LineCopy)->setKey (0);
18675 c199304dfb2a handling qscintilla internal shortcuts and commands depending on qsci version Torsten <ttl@justmail.de> parents: 18656 diff changeset	144 #else
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	145 // find commands via its default key (tricky way without find ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	146 QList< QsciCommand * > cmd_list = cmd_set->commands ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	147 for (int i = 0; i < cmd_list.length (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	148 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	149 int cmd_key = cmd_list.at (i)->key ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	150 switch (cmd_key)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	151 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	152 case Qt::Key_C \| Qt::CTRL : // SelectionCopy
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	153 case Qt::Key_X \| Qt::CTRL : // SelectionCut
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	154 case Qt::Key_V \| Qt::CTRL : // Paste
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	155 case Qt::Key_A \| Qt::CTRL : // SelectAll
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	156 case Qt::Key_D \| Qt::CTRL : // SelectionDuplicate
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	157 case Qt::Key_T \| Qt::CTRL : // LineTranspose
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	158 case Qt::Key_Z \| Qt::CTRL : // Undo
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	159 case Qt::Key_Y \| Qt::CTRL : // Redo
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	160 case Qt::Key_Z \| Qt::CTRL \| Qt::SHIFT : // Redo
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	161 case Qt::Key_U \| Qt::CTRL : // SelectionLowerCase
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	162 case Qt::Key_U \| Qt::CTRL \| Qt::SHIFT : // SelectionUpperCase
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	163 case Qt::Key_Plus \| Qt::CTRL : // ZoomIn
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	164 case Qt::Key_Minus \| Qt::CTRL : // ZoomOut
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	165 case Qt::Key_Backspace \| Qt::CTRL \| Qt::SHIFT : // DeleteLineLeft
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	166 case Qt::Key_Delete \| Qt::CTRL \| Qt::SHIFT : // DeleteLineRight
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	167 case Qt::Key_K \| Qt::META : // DeleteLineRight
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	168 case Qt::Key_Backspace \| Qt::CTRL : // DeleteWordLeft
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	169 case Qt::Key_Delete \| Qt::CTRL : // DeleteWordRight
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	170 case Qt::Key_L \| Qt::CTRL \| Qt::SHIFT : // LineDelete
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	171 case Qt::Key_L \| Qt::CTRL : // LineCut
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	172 case Qt::Key_T \| Qt::CTRL \| Qt::SHIFT : // LineCopy
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	173 cmd_list.at (i)->setKey (0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	174 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	175 }
18675 c199304dfb2a handling qscintilla internal shortcuts and commands depending on qsci version Torsten <ttl@justmail.de> parents: 18656 diff changeset	176 #endif
18954 c6b89c4a9e63 Swap Ctrl and Meta in Qscintilla shortcut list for mac (bug #41217) pantxo <pantxo.diribarne@gmail.com> parents: 18767 diff changeset	177
c6b89c4a9e63 Swap Ctrl and Meta in Qscintilla shortcut list for mac (bug #41217) pantxo <pantxo.diribarne@gmail.com> parents: 18767 diff changeset	178 #if defined (Q_OS_MAC)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	179 // Octave interprets Cmd key as Meta whereas Qscintilla interprets it
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	180 // as Ctrl. We thus invert Meta/Ctrl in Qscintilla's shortcuts list.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	181 QList< QsciCommand * > cmd_list_mac = cmd_set->commands ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	182 for (int i = 0; i < cmd_list_mac.length (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	183 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	184 // Primary key
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	185 int key = cmd_list_mac.at (i)->key ();
18954 c6b89c4a9e63 Swap Ctrl and Meta in Qscintilla shortcut list for mac (bug #41217) pantxo <pantxo.diribarne@gmail.com> parents: 18767 diff changeset	186
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	187 if (static_cast<int> (key \| Qt::META) == key &&
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	188 static_cast<int> (key \| Qt::CTRL) != key)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	189 key = (key ^ Qt::META) \| Qt::CTRL;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	190 else if (static_cast<int> (key \| Qt::CTRL) == key)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	191 key = (key ^ Qt::CTRL) \| Qt::META;
18954 c6b89c4a9e63 Swap Ctrl and Meta in Qscintilla shortcut list for mac (bug #41217) pantxo <pantxo.diribarne@gmail.com> parents: 18767 diff changeset	192
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	193 cmd_list_mac.at (i)->setKey (key);
18954 c6b89c4a9e63 Swap Ctrl and Meta in Qscintilla shortcut list for mac (bug #41217) pantxo <pantxo.diribarne@gmail.com> parents: 18767 diff changeset	194
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	195 // Alternate key
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	196 key = cmd_list_mac.at (i)->alternateKey ();
18954 c6b89c4a9e63 Swap Ctrl and Meta in Qscintilla shortcut list for mac (bug #41217) pantxo <pantxo.diribarne@gmail.com> parents: 18767 diff changeset	197
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	198 if (static_cast<int> (key \| Qt::META) == key &&
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	199 static_cast<int> (key \| Qt::CTRL) != key)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	200 key = (key ^ Qt::META) \| Qt::CTRL;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	201 else if (static_cast<int> (key \| Qt::CTRL) == key)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	202 key = (key ^ Qt::CTRL) \| Qt::META;
18954 c6b89c4a9e63 Swap Ctrl and Meta in Qscintilla shortcut list for mac (bug #41217) pantxo <pantxo.diribarne@gmail.com> parents: 18767 diff changeset	203
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	204 cmd_list_mac.at (i)->setAlternateKey (key);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	205 }
18954 c6b89c4a9e63 Swap Ctrl and Meta in Qscintilla shortcut list for mac (bug #41217) pantxo <pantxo.diribarne@gmail.com> parents: 18767 diff changeset	206 #endif
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	207
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	208 // selection markers
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	209
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	210 m_indicator_id = indicatorDefine (QsciScintilla::StraightBoxIndicator);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	211 if (m_indicator_id == -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	212 m_indicator_id = 1;
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	213
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	214 setIndicatorDrawUnder (true, m_indicator_id);
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	215
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	216 markerDefine (QsciScintilla::Minus, marker::selection);
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	217
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	218 // init state of undo/redo action for this tab
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	219 emit status_update (isUndoAvailable (), isRedoAvailable ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	220 }
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	221
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	222 void octave_qscintilla::set_selection_marker_color (const QColor& c)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	223 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	224 QColor ic = c;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	225 ic.setAlphaF (0.25);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	226 setIndicatorForegroundColor (ic, m_indicator_id);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	227 setIndicatorOutlineColor (ic, m_indicator_id);
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	228
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	229 setMarkerForegroundColor (c, marker::selection);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	230 setMarkerBackgroundColor (c, marker::selection);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	231 }
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	232
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	233 // context menu requested
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	234 void octave_qscintilla::contextMenuEvent (QContextMenuEvent *e)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	235 {
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	236 #if defined (HAVE_QSCI_VERSION_2_6_0)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	237 QPoint global_pos, local_pos; // the menu's position
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	238 QMenu *context_menu = createStandardContextMenu (); // standard menu
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	239
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	240 bool in_left_margin = false;
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	241
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	242 // determine position depending on mouse or keyboard event
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	243 if (e->reason () == QContextMenuEvent::Mouse)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	244 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	245 // context menu by mouse
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	246 global_pos = e->globalPos (); // global mouse position
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	247 local_pos = e->pos (); // local mouse position
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	248 if (e->x () < marginWidth (1) + marginWidth (2))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	249 in_left_margin = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	250 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	251 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	252 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	253 // context menu by keyboard or other: get point of text cursor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	254 get_global_textcursor_pos (&global_pos, &local_pos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	255 QRect editor_rect = geometry (); // editor rect mapped to global
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	256 editor_rect.moveTopLeft
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	257 (parentWidget ()->mapToGlobal (editor_rect.topLeft ()));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	258 if (! editor_rect.contains (global_pos)) // is cursor outside editor?
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	259 global_pos = editor_rect.topLeft (); // yes, take top left corner
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	260 }
16735 cee305c91e91 show help menu in editors context menu only for octave files Torsten <ttl@justmail.de> parents: 16733 diff changeset	261
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	262 #if defined (HAVE_QSCI_VERSION_2_6_0)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	263 if (! in_left_margin)
21371 dc3252099232 Allow GUI build with QScintilla 2.4 (bug #47226). Lachlan Andrew <lachlanbis@gmail.com> parents: 21301 diff changeset	264 #endif
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	265 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	266 // fill context menu with editor's standard actions
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	267 emit create_context_menu_signal (context_menu);
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 20986 diff changeset	268
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	269 // additional custom entries of the context menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	270 context_menu->addSeparator (); // separator before custom entries
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 20986 diff changeset	271
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	272 // help menu: get the position of the mouse or the text cursor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	273 // (only for octave files)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	274 QString lexer_name = lexer ()->lexer ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	275 if (lexer_name == "octave" \|\| lexer_name == "matlab")
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	276 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	277 m_word_at_cursor = wordAtPoint (local_pos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	278 if (! m_word_at_cursor.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	279 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	280 context_menu->addAction (tr ("Help on") + ' ' + m_word_at_cursor,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	281 this, SLOT (contextmenu_help (bool)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	282 context_menu->addAction (tr ("Documentation on")
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	283 + ' ' + m_word_at_cursor,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	284 this, SLOT (contextmenu_doc (bool)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	285 context_menu->addAction (tr ("Edit") + ' ' + m_word_at_cursor,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	286 this, SLOT (contextmenu_edit (bool)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	287 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	288 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	289 }
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21578 diff changeset	290 #if defined (HAVE_QSCI_VERSION_2_6_0)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	291 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	292 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	293 // remove all standard actions from scintilla
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	294 QList<QAction *> all_actions = context_menu->actions ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	295 QAction *a;
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 20986 diff changeset	296
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	297 foreach (a, all_actions)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	298 context_menu->removeAction (a);
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 20986 diff changeset	299
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	300 a = context_menu->addAction (tr ("dbstop if ..."), this,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	301 SLOT (contextmenu_break_condition (bool)));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	302 a->setData (local_pos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	303 }
21371 dc3252099232 Allow GUI build with QScintilla 2.4 (bug #47226). Lachlan Andrew <lachlanbis@gmail.com> parents: 21301 diff changeset	304 #endif
16735 cee305c91e91 show help menu in editors context menu only for octave files Torsten <ttl@justmail.de> parents: 16733 diff changeset	305
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	306 // finaly show the menu
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	307 context_menu->exec (global_pos);
20277 48d9001bdee3 Avoid HAVE_ macros in header file. John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	308 #endif
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	309 }
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	310
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	311 // common function with flag for documentation
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	312 void octave_qscintilla::contextmenu_help_doc (bool documentation)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	313 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	314 if (documentation)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	315 emit show_doc_signal (m_word_at_cursor);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	316 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	317 emit execute_command_in_terminal_signal ("help " + m_word_at_cursor);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	318 }
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	319
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	320 // call edit the function related to the current word
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	321 void octave_qscintilla::context_edit (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	322 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	323 if (get_actual_word ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	324 contextmenu_edit (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	325 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	326
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	327 // call edit the function related to the current word
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	328 void octave_qscintilla::context_run (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	329 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	330 if (hasSelectedText ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	331 contextmenu_run (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	332 }
17628 99ffa521ecec Add possibility to edit the function related to the actual keyword in editor Torsten <ttl@justmail.de> parents: 17627 diff changeset	333
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	334 void octave_qscintilla::get_global_textcursor_pos (QPoint *global_pos,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	335 QPoint *local_pos)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	336 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	337 long position = SendScintilla (SCI_GETCURRENTPOS);
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	338 long point_x = SendScintilla (SCI_POINTXFROMPOSITION,0,position);
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	339 long point_y = SendScintilla (SCI_POINTYFROMPOSITION,0,position);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	340 *local_pos = QPoint (point_x,point_y); // local cursor position
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	341 global_pos = mapToGlobal (local_pos); // global position of cursor
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	342 }
17635 7945344506ae Add possibility to run selected text of the editor in the terminal Torsten <ttl@justmail.de> parents: 17628 diff changeset	343
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	344 // determine the actual word and whether we are in an octave or matlab script
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	345 bool octave_qscintilla::get_actual_word (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	346 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	347 QPoint global_pos, local_pos;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	348 get_global_textcursor_pos (&global_pos, &local_pos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	349 m_word_at_cursor = wordAtPoint (local_pos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	350 QString lexer_name = lexer ()->lexer ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	351 return ((lexer_name == "octave" \|\| lexer_name == "matlab")
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	352 && ! m_word_at_cursor.isEmpty ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	353 }
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 20986 diff changeset	354
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	355 // helper function for clearing all indicators of a specific style
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	356 void octave_qscintilla::clear_selection_markers (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	357 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	358 int end_pos = text ().length ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	359 int end_line, end_col;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	360 lineIndexFromPosition (end_pos, &end_line, &end_col);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	361 clearIndicatorRange (0, 0, end_line, end_col, m_indicator_id);
24171 1680d425bb38 also place marker in editor margin for lines matching selected word John W. Eaton <jwe@octave.org> parents: 24166 diff changeset	362
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	363 markerDeleteAll (marker::selection);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	364 }
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 20986 diff changeset	365
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	366 // Function returning the true cursor position where the tab length
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	367 // is taken into account.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	368 void octave_qscintilla::get_current_position (int pos, int line, int *col)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	369 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	370 *pos = SendScintilla (QsciScintillaBase::SCI_GETCURRENTPOS);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	371 line = SendScintilla (QsciScintillaBase::SCI_LINEFROMPOSITION, pos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	372 col = SendScintilla (QsciScintillaBase::SCI_GETCOLUMN, pos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	373 }
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	374
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	375 // Function returning the comment string of the current lexer
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	376 QStringList octave_qscintilla::comment_string (bool comment)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	377 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	378 int lexer = SendScintilla (SCI_GETLEXER);
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	379
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	380 switch (lexer)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	381 {
24222 7d1561c9ee48 prevent ignoring octave lexer when determining comment string (bug #52364) Torsten <mttl@mailbox.org> parents: 24190 diff changeset	382 #if defined (HAVE_LEXER_OCTAVE) \|\| defined (HAVE_LEXER_MATLAB)
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	383 #if defined (HAVE_LEXER_OCTAVE)
aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	384 case SCLEX_OCTAVE:
24222 7d1561c9ee48 prevent ignoring octave lexer when determining comment string (bug #52364) Torsten <mttl@mailbox.org> parents: 24190 diff changeset	385 #else
7d1561c9ee48 prevent ignoring octave lexer when determining comment string (bug #52364) Torsten <mttl@mailbox.org> parents: 24190 diff changeset	386 case SCLEX_MATLAB:
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	387 #endif
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	388 {
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	389 QSettings *settings = resource_manager::get_settings ();
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	390 int comment_string;
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	391
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	392 if (comment)
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	393 {
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	394 // The commenting string is requested
25617 44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	395 if (settings->contains (ed_comment_str.key))
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	396 // new version (radio buttons)
25617 44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	397 comment_string = settings->value (ed_comment_str.key,
44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	398 ed_comment_str.def).toInt ();
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	399 else
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	400 // old version (combo box)
25617 44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	401 comment_string = settings->value (ed_comment_str_old.key,
44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	402 ed_comment_str.def).toInt ();
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	403
25617 44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	404 return (QStringList (ed_comment_strings.at (comment_string)));
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	405 }
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	406 else
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	407 {
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	408 QStringList c_str;
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	409
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	410 // The possible uncommenting string(s) are requested
25617 44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	411 comment_string = settings->value (ed_uncomment_str.key,
44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	412 ed_uncomment_str.def).toInt ();
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	413
25617 44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	414 for (int i = 0; i < ed_comment_strings_count; i++)
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	415 {
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	416 if (1 << i & comment_string)
25617 44d638d5eea5 reorganize constants for preferences keys and default values Torsten <mttl@mailbox.org> parents: 25527 diff changeset	417 c_str.append (ed_comment_strings.at (i));
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	418 }
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	419
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	420 return c_str;
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	421 }
8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	422
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	423 }
aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	424 #endif
aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	425
aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	426 case SCLEX_PERL:
aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	427 case SCLEX_BASH:
aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	428 case SCLEX_DIFF:
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	429 return QStringList ("#");
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	430
aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	431 case SCLEX_CPP:
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	432 return QStringList ("//");
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	433
aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	434 case SCLEX_BATCH:
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	435 return QStringList ("REM ");
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	436 }
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	437
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	438 return QStringList ("%"); // should never happen
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	439 }
23234 aaf20024db6f function providing comment strings uses lexer number and not lexer names Torsten <mttl@mailbox.org> parents: 23230 diff changeset	440
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24232 diff changeset	441
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	442 // provide the style at a specific position
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	443 int octave_qscintilla::get_style (int pos)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	444 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	445 int position;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	446 if (pos < 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	447 // The positition has to be reduced by 2 for getting the real style (?)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	448 position = SendScintilla (QsciScintillaBase::SCI_GETCURRENTPOS) - 2;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	449 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	450 position = pos;
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	451
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	452 return SendScintilla (QsciScintillaBase::SCI_GETSTYLEAT, position);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	453 }
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	454
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	455 // Is a specific cursor position in a line or block comment?
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	456 int octave_qscintilla::is_style_comment (int pos)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	457 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	458 int lexer = SendScintilla (QsciScintillaBase::SCI_GETLEXER);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	459 int style = get_style (pos);
23688 cb36684b7a33 In the GUI editor, automatically add "endif" for "if" etc. Lachlan Andrew <lachlanbis@gmail.com> parents: 23449 diff changeset	460
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	461 switch (lexer)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	462 {
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	463 case SCLEX_CPP:
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	464 return (ST_LINE_COMMENT * (
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	465 style == QsciLexerCPP::CommentLine
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	466 \|\| style == QsciLexerCPP::CommentLineDoc)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	467 + ST_BLOCK_COMMENT * (
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	468 style == QsciLexerCPP::Comment
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	469 \|\| style == QsciLexerCPP::CommentDoc
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	470 \|\| style == QsciLexerCPP::CommentDocKeyword
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	471 \|\| style == QsciLexerCPP::CommentDocKeywordError)
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	472 );
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	473
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	474 #if defined (HAVE_LEXER_MATLAB)
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	475 case SCLEX_MATLAB:
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	476 return (ST_LINE_COMMENT * (style == QsciLexerMatlab::Comment));
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	477 #endif
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	478 #if defined (HAVE_LEXER_OCTAVE)
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	479 case SCLEX_OCTAVE:
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	480 return (ST_LINE_COMMENT * (style == QsciLexerOctave::Comment));
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	481 #endif
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	482
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	483 case SCLEX_PERL:
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	484 return (ST_LINE_COMMENT * (style == QsciLexerPerl::Comment));
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	485
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	486 case SCLEX_BATCH:
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	487 return (ST_LINE_COMMENT * (style == QsciLexerBatch::Comment));
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	488
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	489 case SCLEX_DIFF:
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	490 return (ST_LINE_COMMENT * (style == QsciLexerDiff::Comment));
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	491
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	492 case SCLEX_BASH:
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	493 return (ST_LINE_COMMENT * (style == QsciLexerBash::Comment));
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	494
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	495 }
23688 cb36684b7a33 In the GUI editor, automatically add "endif" for "if" etc. Lachlan Andrew <lachlanbis@gmail.com> parents: 23449 diff changeset	496
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	497 return ST_NONE;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	498 }
23689 b729e97aa8d1 move smart indendation from file_editor_tab to octave_qscintilla Torsten <mttl@mailbox.org> parents: 23688 diff changeset	499
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	500 // Do smart indendation after if, for, ...
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	501 void octave_qscintilla::smart_indent (bool do_smart_indent,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	502 int do_auto_close, int line)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	503 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	504 QString prevline = text (line);
23771 ed492a5a47fd eliminate duplicate code in editor smart indentation and auto close Torsten <mttl@mailbox.org> parents: 23735 diff changeset	505
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	506 QRegExp bkey = QRegExp ("^[\t ]*(if\|for\|while\|switch\|case\|otherwise"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	507 "\|do\|function\|properties\|events\|classdef"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	508 "\|unwind_protect\|unwind_protect_cleanup\|try"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	509 "\|parfor\|methods)"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	510 "[\r]?[\n\t #%]");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	511 // last word except for comments, assuming no ' or " in comment.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	512 // rx_end = QRegExp ("(\\w+)[ \t;\r\n]([%#][^\"'])?$");
23771 ed492a5a47fd eliminate duplicate code in editor smart indentation and auto close Torsten <mttl@mailbox.org> parents: 23735 diff changeset	513
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	514 // last word except for comments,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	515 // allowing % and # in single or double quoted strings
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	516 // FIXME This will get confused by transpose.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	517 QRegExp ekey = QRegExp ("(?:(?:['\"][^'\"]['\"])?[^%#])*"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	518 "(\\w+)[ \t;\r\n]([%#].)?$");
23771 ed492a5a47fd eliminate duplicate code in editor smart indentation and auto close Torsten <mttl@mailbox.org> parents: 23735 diff changeset	519
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	520 int bpos = bkey.indexIn (prevline, 0);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	521 int epos;
23771 ed492a5a47fd eliminate duplicate code in editor smart indentation and auto close Torsten <mttl@mailbox.org> parents: 23735 diff changeset	522
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	523 if (bpos > -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	524 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	525 // Found keyword after that indentation should be added
23771 ed492a5a47fd eliminate duplicate code in editor smart indentation and auto close Torsten <mttl@mailbox.org> parents: 23735 diff changeset	526
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	527 // Check for existing end statement in the same line
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	528 epos = ekey.indexIn (prevline, bpos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	529 QString first_word = bkey.cap(1);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	530 bool inline_end = (epos > -1) && is_end (ekey.cap(1), first_word);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	531
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	532 if (do_smart_indent && ! inline_end)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	533 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	534 // Do smart indent in the current line (line+1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	535 indent (line+1);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	536 setCursorPosition (line+1, indentation (line) + indentationWidth ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	537 }
23771 ed492a5a47fd eliminate duplicate code in editor smart indentation and auto close Torsten <mttl@mailbox.org> parents: 23735 diff changeset	538
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	539 if (do_auto_close
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	540 && ! inline_end
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	541 && ! first_word.contains (
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	542 QRegExp ("(case\|otherwise\|unwind_protect_cleanup)")))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	543 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	544 // Do auto close
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	545 auto_close (do_auto_close, line, prevline, first_word);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	546 }
23689 b729e97aa8d1 move smart indendation from file_editor_tab to octave_qscintilla Torsten <mttl@mailbox.org> parents: 23688 diff changeset	547
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	548 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	549 }
23689 b729e97aa8d1 move smart indendation from file_editor_tab to octave_qscintilla Torsten <mttl@mailbox.org> parents: 23688 diff changeset	550
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	551 QRegExp mkey = QRegExp ("^[\t ]*(else\|elseif\|catch)[\r]?[\t #%\n]");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	552 if (prevline.contains (mkey))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	553 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	554 int prev_ind = indentation (line-1);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	555 int act_ind = indentation (line);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	556
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	557 if (prev_ind == act_ind)
23689 b729e97aa8d1 move smart indendation from file_editor_tab to octave_qscintilla Torsten <mttl@mailbox.org> parents: 23688 diff changeset	558 unindent (line);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	559 else if (prev_ind > act_ind)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	560 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	561 setIndentation (line+1, prev_ind);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	562 setCursorPosition (line+1, prev_ind);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	563 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	564 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	565 }
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	566
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	567 ekey = QRegExp ("^[\t ]*(end\|endif\|endfor\|endwhile\|until\|endfunction"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	568 "\|end_try_catch\|end_unwind_protext)[\r]?[\t #%\n(;]");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	569 if (prevline.contains (ekey))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	570 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	571 if (indentation (line-1) <= indentation (line))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	572 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	573 unindent (line+1);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	574 unindent (line);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	575 setCursorPosition (line+1,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	576 indentation (line));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	577 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	578 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	579 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	580 }
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	581
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	582 // Do smart indendation of current selection or line.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	583 void octave_qscintilla::smart_indent_line_or_selected_text (int lineFrom,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	584 int lineTo)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	585 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	586 QRegExp blank_line_regexp = QRegExp ("^[\t ]*$");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	587
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	588 QRegExp begin_block_regexp
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	589 = QRegExp ("^([\t ]*)(if\|elseif\|else"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	590 "\|for\|while\|do\|parfor"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	591 "\|switch\|case\|otherwise"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	592 "\|function"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	593 "\|classdef\|properties\|events\|enumeration\|methods"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	594 "\|unwind_protect\|unwind_protect_cleanup\|try\|catch)"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	595 "[\r\n\t #%]");
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	596
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	597 QRegExp end_block_regexp
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	598 = QRegExp ("^([\t ]*)(end"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	599 "\|end(for\|function\|if\|parfor\|switch\|while"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	600 "\|classdef\|enumeration\|events\|methods\|properties)"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	601 "\|end_(try_catch\|unwind_protect)"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	602 "\|until)"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	603 "[\r\n\t #%]");
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	604
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	605 int indent_column = -1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	606 int indent_increment = indentationWidth ();
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	607
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	608 for (int line = lineFrom-1; line >= 0; line--)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	609 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	610 QString line_text = text (line);
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	611
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	612 if (blank_line_regexp.indexIn (line_text) < 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	613 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	614 // Found first non-blank line above beginning of region or
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	615 // current line. Base indentation from this line, increasing
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	616 // indentation by indentationWidth if it looks like the
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	617 // beginning of a code block.
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	618
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	619 indent_column = indentation (line);
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	620
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	621 if (begin_block_regexp.indexIn (line_text) > -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	622 indent_column += indent_increment;
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	623
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	624 break;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	625 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	626 }
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	627
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	628 if (indent_column < 0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	629 indent_column = indentation (lineFrom);
24232 e0bcd17ac070 smart indentation for selections or current line in code editor John W. Eaton <jwe@octave.org> parents: 24222 diff changeset	630
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	631 for (int line = lineFrom; line <= lineTo; line++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	632 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	633 QString line_text = text (line);
23689 b729e97aa8d1 move smart indendation from file_editor_tab to octave_qscintilla Torsten <mttl@mailbox.org> parents: 23688 diff changeset	634
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	635 if (end_block_regexp.indexIn (line_text) > -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	636 indent_column -= indent_increment;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	637
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	638 setIndentation (line, indent_column);
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	639
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	640 if (begin_block_regexp.indexIn (line_text) > -1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	641 indent_column += indent_increment;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	642 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	643 }
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	644
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	645 void octave_qscintilla::set_word_selection (const QString& word)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	646 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	647 m_selection = word;
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	648
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	649 if (word.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	650 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	651 m_selection_line = -1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	652 m_selection_col = -1;
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	653
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	654 m_selection_replacement = "";
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	655
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	656 clear_selection_markers ();
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	657
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	658 QToolTip::hideText ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	659 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	660 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	661 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	662 int pos;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	663 get_current_position (&pos, &m_selection_line, &m_selection_col);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	664 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	665 }
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	666
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	667 void octave_qscintilla::show_selection_markers (int line, int col, int len)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	668 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	669 fillIndicatorRange (line, col - len, line, col, m_indicator_id);
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	670
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	671 markerAdd (line, marker::selection);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	672 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	673
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	674 void octave_qscintilla::contextmenu_help (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	675 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	676 contextmenu_help_doc (false);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	677 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	678
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	679 void octave_qscintilla::contextmenu_doc (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	680 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	681 contextmenu_help_doc (true);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	682 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	683
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	684 void octave_qscintilla::context_help_doc (bool documentation)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	685 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	686 if (get_actual_word ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	687 contextmenu_help_doc (documentation);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	688 }
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	689
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	690 void octave_qscintilla::contextmenu_edit (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	691 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	692 emit context_menu_edit_signal (m_word_at_cursor);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	693 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	694
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	695 void octave_qscintilla::contextmenu_run (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	696 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	697 QStringList commands = selectedText ().split (QRegExp ("[\r\n]"),
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	698 QString::SkipEmptyParts);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	699 for (int i = 0; i < commands.size (); i++)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	700 emit execute_command_in_terminal_signal (commands.at (i));
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	701 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	702
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	703 // wrappers for dbstop related context menu items
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	704
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	705 // FIXME: Why can't the data be sent as the argument to the function???
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	706 void octave_qscintilla::contextmenu_break_condition (bool)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	707 {
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	708 #if defined (HAVE_QSCI_VERSION_2_6_0)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	709 QAction action = qobject_cast<QAction >(sender ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	710 QPoint local_pos = action->data ().value<QPoint> ();
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	711
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	712 // pick point just right of margins, so lineAt doesn't give -1
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	713 int margins = marginWidth (1) + marginWidth (2) + marginWidth (3);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	714 local_pos = QPoint (margins + 1, local_pos.y ());
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	715
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	716 emit context_menu_break_condition_signal (lineAt (local_pos));
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	717 #endif
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	718 }
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	719
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	720 void octave_qscintilla::contextmenu_break_once (const QPoint& local_pos)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	721 {
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	722 #if defined (HAVE_QSCI_VERSION_2_6_0)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	723 emit context_menu_break_once (lineAt (local_pos));
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	724 #endif
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	725 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	726
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	727 void octave_qscintilla::text_changed (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	728 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	729 emit status_update (isUndoAvailable (), isRedoAvailable ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	730 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	731
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	732 void octave_qscintilla::cursor_position_changed (int line, int col)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	733 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	734 // Clear the selection if we move away from it. We have to check the
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	735 // position, because we allow entering text at the point of the
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	736 // selection to trigger a search and replace that does not clear the
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	737 // selection until it is complete.
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	738
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	739 if (! m_selection.isEmpty ()
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	740 && (line != m_selection_line \|\| col != m_selection_col))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	741 set_word_selection ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	742 }
24172 90903d915625 improve handling of selection markers in editor John W. Eaton <jwe@octave.org> parents: 24171 diff changeset	743
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	744 // when edit area gets focus update information on undo/redo actions
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	745 void octave_qscintilla::focusInEvent (QFocusEvent *focusEvent)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	746 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	747 emit status_update (isUndoAvailable (), isRedoAvailable ());
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	748
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	749 QsciScintilla::focusInEvent (focusEvent);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	750 }
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	751
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	752 void octave_qscintilla::show_replace_action_tooltip (void)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	753 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	754 int pos;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	755 get_current_position (&pos, &m_selection_line, &m_selection_col);
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	756
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	757 // Offer to replace other instances.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	758
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	759 QKeySequence keyseq = Qt::SHIFT + Qt::Key_Return;
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	760
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	761 QString msg = (tr ("Press '%1' to replace all occurrences of '%2' with '%3'.")
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	762 . arg (keyseq.toString ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	763 . arg (m_selection)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	764 . arg (m_selection_replacement));
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	765
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	766 QPoint global_pos;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	767 QPoint local_pos;
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	768
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	769 get_global_textcursor_pos (&global_pos, &local_pos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	770
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	771 QFontMetrics ttfm (QToolTip::font ());
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	772
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	773 // Try to avoid overlapping with the text completion dialog
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	774 // and the text that is currently being edited.
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	775
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	776 global_pos += QPoint (2ttfm.maxWidth (), -3ttfm.height ());
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	777
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	778 QToolTip::showText (global_pos, msg);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	779 }
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	780
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	781 void octave_qscintilla::keyPressEvent (QKeyEvent *key_event)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	782 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	783 if (m_selection.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	784 QsciScintilla::keyPressEvent (key_event);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	785 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	786 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	787 int key = key_event->key ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	788 Qt::KeyboardModifiers modifiers = key_event->modifiers ();
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	789
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	790 if (key == Qt::Key_Return && modifiers == Qt::ShiftModifier)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	791 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	792 // get the resulting cursor position
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	793 // (required if click was beyond a line ending)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	794 int pos, line, col;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	795 get_current_position (&pos, &line, &col);
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	796
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	797 // remember first visible line for restoring the view afterwards
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	798 int first_line = firstVisibleLine ();
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	799
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	800 // search for first occurrence of the detected word
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	801 bool find_result_available
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	802 = findFirst (m_selection,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	803 false, // no regexp
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	804 true, // case sensitive
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	805 true, // whole words only
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	806 false, // do not wrap
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	807 true, // forward
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	808 0, 0, // from the beginning
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	809 false
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	810 #if defined (HAVE_QSCI_VERSION_2_6_0)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	811 , true
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	812 #endif
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	813 );
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	814
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	815 while (find_result_available)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	816 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	817 replace (m_selection_replacement);
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	818
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	819 // FIXME: is this the right thing to do? findNext doesn't
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	820 // work properly if the length of the replacement text is
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	821 // different from the original.
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	822
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	823 int new_line, new_col;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	824 get_current_position (&pos, &new_line, &new_col);
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	825
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	826 find_result_available
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	827 = findFirst (m_selection,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	828 false, // no regexp
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	829 true, // case sensitive
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	830 true, // whole words only
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	831 false, // do not wrap
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	832 true, // forward
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	833 new_line, new_col, // from new pos
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	834 false
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	835 #if defined (HAVE_QSCI_VERSION_2_6_0)
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	836 , true
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	837 #endif
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	838 );
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	839 }
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	840
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	841 // restore the visible area of the file, the cursor position,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	842 // and the selection
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	843 setFirstVisibleLine (first_line);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	844 setCursorPosition (line, col);
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	845
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	846 // Clear the selection.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	847 set_word_selection ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	848 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	849 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	850 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	851 // The idea here is to allow backspace to remove the last
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	852 // character of the replacement text to allow minimal editing
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	853 // and to also end the selection replacement action if text is
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	854 // not valid as a word constituent (control characters,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	855 // etc.). Is there a better way than having special cases for
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	856 // DEL and ESC here?
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	857
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	858 QString text = key_event->text ();
24190 90fe16a3a5a1 improve selection replacement in editor John W. Eaton <jwe@octave.org> parents: 24187 diff changeset	859
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	860 bool cancel_replacement = false;
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	861
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	862 if (key == Qt::Key_Backspace)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	863 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	864 if (m_selection_replacement.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	865 cancel_replacement = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	866 else
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	867 m_selection_replacement.chop (1);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	868 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	869 else if (key == Qt::Key_Delete \|\| key == Qt::Key_Escape)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	870 cancel_replacement = true;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	871 else if (! text.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	872 m_selection_replacement += text;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	873 else if (modifiers != Qt::ShiftModifier)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	874 cancel_replacement = true;
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	875
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	876 // Perform default action.
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	877
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	878 QsciScintilla::keyPressEvent (key_event);
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	879
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	880 if (cancel_replacement)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	881 set_word_selection ();
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	882
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	883 if (! m_selection_replacement.isEmpty ())
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	884 show_replace_action_tooltip ();
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	885 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	886 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	887 }
24187 ff9bd559799b pop up tooltip message for changing selected words in editor John W. Eaton <jwe@octave.org> parents: 24172 diff changeset	888
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	889 void octave_qscintilla::auto_close (int auto_endif, int linenr,
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	890 const QString& line, QString& first_word)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	891 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	892 // Insert and "end" for an "if" etc., if needed.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	893 // (Use of "while" allows "return" to skip the rest.
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	894 // It may be clearer to use "if" and "goto",
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	895 // but that violates the coding standards.)
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	896
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	897 bool autofill_simple_end = (auto_endif == 2);
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	898
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	899 size_t start = line.toStdString ().find_first_not_of (" \t");
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	900
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	901 // Check if following line has the same or less indentation
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	902 // Check if the following line does not start with
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	903 // end* (until) (catch)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	904 if (linenr < lines () - 1)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	905 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	906 int offset = 1;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	907 size_t next_start;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	908 QString next_line;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	909 do // find next non-blank line
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	910 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	911 next_line = text (linenr + offset++);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	912 next_start = next_line.toStdString ().find_first_not_of (" \t\n");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	913 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	914 while (linenr + offset < lines ()
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	915 && next_start == std::string::npos);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	916 if (next_start == std::string::npos)
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	917 next_start = 0;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	918 if (next_start > start) // more indented => don't add "end"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	919 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	920 if (next_start == start) // same => check if already is "end"
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	921 {
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	922 QRegExp rx_start = QRegExp (R"((\w+))");
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	923 int tmp = rx_start.indexIn (next_line, start);
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	924 if (tmp != -1 && is_end (rx_start.cap(1), first_word))
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	925 return;
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	926 }
2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	927 }
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	928
24020 387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	929 // If all of the above, insert a new line, with matching indent
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	930 // and either 'end' or 'end...', depending on a flag.
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	931
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	932 // If we insert directly after the last line, the "end" is autoindented,
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	933 // so add a dummy line.
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	934 if (linenr + 2 == lines ())
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	935 insertAt (QString ("\n"), linenr + 2, 0);
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	936
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	937 // For try/catch/end, fill "end" first, so "catch" is top of undo stack
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	938 if (first_word == "try")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	939 insertAt (QString (start, ' ')
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	940 + (autofill_simple_end ? "end\n" : "end_try_catch\n"),
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	941 linenr + 2, 0);
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	942 else if (first_word == "unwind_protect")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	943 insertAt (QString (start, ' ')
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	944 + (autofill_simple_end ? "end\n" : "end_unwind_protect\n"),
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	945 linenr + 2, 0);
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	946
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	947 QString next_line;
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	948 if (first_word == "do")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	949 next_line = "until\n";
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	950 else if (first_word == "try")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	951 next_line = "catch\n";
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	952 else if (first_word == "unwind_protect")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	953 next_line = "unwind_protect_cleanup\n";
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	954 else if (autofill_simple_end)
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	955 next_line = "end\n";
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	956 else
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	957 {
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	958 if (first_word == "unwind_protect")
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	959 first_word = '_' + first_word;
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	960 next_line = "end" + first_word + "\n";
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	961 }
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	962
387be1a6c3dc style fixes for GUI editor John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	963 insertAt (QString (start, ' ') + next_line, linenr + 2, 0);
24716 2b3e0b570e77 move GUI file editor classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24593 diff changeset	964 }
23236 4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	965 }
4cd5f975d26c automatically add a comment string when line breaking in line comments Torsten <mttl@mailbox.org> parents: 23234 diff changeset	966
16731 01d523d5f796 add help for word at mouse or text cursor to the editors context menu Torsten <ttl@justmail.de> parents: diff changeset	967 #endif

Mercurial > octave

annotate libgui/src/m-editor/octave-qscintilla.cc @ 25617:44d638d5eea5