Mercurial > octave
annotate libgui/src/m-editor/file-editor-tab.cc @ 21213:f7d1050b9b53
maint: Clean up various usages of #ifdef.
* randmtzig.c: Use #ifdef rather than just #if.
* EditControl.h : Use '#if ! defined' rather than '#ifndef' in
guard block to match Octave style.
* dialog.cc, settings-dialog.cc: Add FIXME notes about questionable use of #if
mechanism.
* file-editor-tab.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc,
Array-i.cc, Array-s.cc, MatrixType.h, quit.h, lo-sysdep.cc, lo-cutils.c,
oct-alloc.h, oct-shlib.cc, sparse-sort.h: #define HAVE_XXX macros to 1, not
just empty but defined.
* octave-txt-lexer.h, octave-cmd.h, octave-preserve-stream-state.h, txt-eng.h,
zfstream.h, oct-conf-features.h, oct-conf.h: Use octave_ namespace prefix on
name of #define used to prevent multiple inclusion of headers.
* parser.h, webinfo.h, ov-oncleanup.h, op-int.h, display-available.h,
shared-fcns.h: Add #define guard to prevent multiple inclusion.
* quadcc.cc: use all capitals for #define MIN_CQUAD_HEAPSIZE.
* ov-intx.h: Add note that this file must not use guard #define.
* eigs-base.h, randmtzig.h: Write '! defined' rather than '!defined'.
* file-ops.cc, oct-sparse.h: Use parentheses around complex #if tests.
* oct-syscalls.cc, oct-base64.cc, statdefs.h: Indent #ifdef blocks correctly.
* oct-conf-post.in.h: Use "! defined". Define macros to 1, not just empty but
defined.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 06 Feb 2016 18:22:32 -0800 |
parents | 710e700cdd7f |
children | 40de9f8f23a6 |
rev | line source |
---|---|
18315
6e8188effddf
file-editor-tab.cc: Fix a typo.
Julien Bect <julien.bect@supelec.fr>
parents:
18303
diff
changeset
|
1 |
15204
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
2 /* |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
3 |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19629
diff
changeset
|
4 Copyright (C) 2011-2015 Jacob Dawid |
15204
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
5 |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
6 This file is part of Octave. |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
7 |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
8 Octave is free software; you can redistribute it and/or modify it |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
9 under the terms of the GNU General Public License as published by the |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
10 Free Software Foundation; either version 3 of the License, or (at your |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
11 option) any later version. |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
12 |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
13 Octave is distributed in the hope that it will be useful, but WITHOUT |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
16 for more details. |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
17 |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
18 You should have received a copy of the GNU General Public License |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
19 along with Octave; see the file COPYING. If not, see |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
20 <http://www.gnu.org/licenses/>. |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
21 |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
22 */ |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
23 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
24 /** |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
25 @file A single GUI file tab. |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
26 This interfaces QSciScintilla with the rest of Octave. |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
27 */ |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
28 |
15286
ae9079bbc627
Add '#include <config.h>' to C++ files in libgui/src
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
29 #ifdef HAVE_CONFIG_H |
21203
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21158
diff
changeset
|
30 # include <config.h> |
15286
ae9079bbc627
Add '#include <config.h>' to C++ files in libgui/src
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
31 #endif |
ae9079bbc627
Add '#include <config.h>' to C++ files in libgui/src
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
32 |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15860
diff
changeset
|
33 #ifdef HAVE_QSCINTILLA |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15860
diff
changeset
|
34 |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
35 #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H) |
21213
f7d1050b9b53
maint: Clean up various usages of #ifdef.
Rik <rik@octave.org>
parents:
21203
diff
changeset
|
36 # define HAVE_LEXER_OCTAVE 1 |
21203
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21158
diff
changeset
|
37 # include <Qsci/qscilexeroctave.h> |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
38 #elif defined (HAVE_QSCI_QSCILEXERMATLAB_H) |
21213
f7d1050b9b53
maint: Clean up various usages of #ifdef.
Rik <rik@octave.org>
parents:
21203
diff
changeset
|
39 # define HAVE_LEXER_MATLAB 1 |
21203
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21158
diff
changeset
|
40 # include <Qsci/qscilexermatlab.h> |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
41 #endif |
14873
355d6c165df0
Added syntax highlighting support for .sh/.bat/.pl and .diff-files.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14869
diff
changeset
|
42 #include <Qsci/qscilexercpp.h> |
355d6c165df0
Added syntax highlighting support for .sh/.bat/.pl and .diff-files.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14869
diff
changeset
|
43 #include <Qsci/qscilexerbash.h> |
355d6c165df0
Added syntax highlighting support for .sh/.bat/.pl and .diff-files.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14869
diff
changeset
|
44 #include <Qsci/qscilexerperl.h> |
355d6c165df0
Added syntax highlighting support for .sh/.bat/.pl and .diff-files.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14869
diff
changeset
|
45 #include <Qsci/qscilexerbatch.h> |
355d6c165df0
Added syntax highlighting support for .sh/.bat/.pl and .diff-files.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14869
diff
changeset
|
46 #include <Qsci/qscilexerdiff.h> |
16440
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
47 #include <Qsci/qsciprinter.h> |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15204
diff
changeset
|
48 #include <QApplication> |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15204
diff
changeset
|
49 #include <QFileDialog> |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
50 #include <QMessageBox> |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15204
diff
changeset
|
51 #include <QTextStream> |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
52 #include <QVBoxLayout> |
16375
f482302d81c9
editor goto line menu item (bug #38590)
John Donoghue <john.donoghue@ieee.org>
parents:
16018
diff
changeset
|
53 #include <QInputDialog> |
16440
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
54 #include <QPrintDialog> |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
55 #include <QDateTime> |
20731
83611b387bc5
provide a user preference for the encoding used by the editor (bug #45597)
Torsten <ttl@justmail.de>
parents:
20713
diff
changeset
|
56 #include <QTextCodec> |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
57 #include <QStyle> |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
58 #include <QTextBlock> |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
59 #include <QLabel> |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
60 #include <QCheckBox> |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
61 #include <QDialogButtonBox> |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
62 #include <QPushButton> |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
63 |
21148
e8c3590da9ff
update directory in gui after add-path/change-dir dialog
Torsten <ttl@justmail.de>
parents:
21058
diff
changeset
|
64 #include "file-ops.h" |
e8c3590da9ff
update directory in gui after add-path/change-dir dialog
Torsten <ttl@justmail.de>
parents:
21058
diff
changeset
|
65 |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
66 #include "resource-manager.h" |
15402
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
67 #include "file-editor-tab.h" |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
68 #include "file-editor.h" |
19348
c364b9a44580
provide an editor lexer for text or unknown files (bug #43572)
Torsten <ttl@justmail.de>
parents:
19328
diff
changeset
|
69 #include "octave-txt-lexer.h" |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
70 #include "marker.h" |
16547
3cd80afc3509
improve debugging with the GUI
John W. Eaton <jwe@octave.org>
parents:
16520
diff
changeset
|
71 |
3cd80afc3509
improve debugging with the GUI
John W. Eaton <jwe@octave.org>
parents:
16520
diff
changeset
|
72 #include "debug.h" |
16635
25e418d23a4b
fix running files from file browser's context menu
Torsten <ttl@justmail.de>
parents:
16591
diff
changeset
|
73 #include "octave-qt-link.h" |
16715
96ed7ab44e2e
save prepared apis info for qscintilla into a path depending on octave version
Torsten <ttl@justmail.de>
parents:
16704
diff
changeset
|
74 #include "version.h" |
18318
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
75 #include "utils.h" |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
76 #include "defaults.h" |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
77 #include "unwind-prot.h" |
19004
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
78 #include <oct-map.h> |
15402
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
79 |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
80 bool file_editor_tab::_cancelled = false; |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
81 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
82 /** |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
83 A file_editor_tab object consists of a text area and three left margins. |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
84 The first holds breakpoints, bookmarks, and the debug program counter. |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
85 The second holds line numbers. |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
86 The third holds "fold" marks, to hide sections of text. |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
87 */ |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
88 // Make parent null for the file editor tab so that warning |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
89 // WindowModal messages don't affect grandparents. |
21148
e8c3590da9ff
update directory in gui after add-path/change-dir dialog
Torsten <ttl@justmail.de>
parents:
21058
diff
changeset
|
90 file_editor_tab::file_editor_tab (octave_dock_widget *editor, |
e8c3590da9ff
update directory in gui after add-path/change-dir dialog
Torsten <ttl@justmail.de>
parents:
21058
diff
changeset
|
91 const QString& directory_arg) |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
92 { |
16704
e38a0fa08368
fix restoring editor files from previous session and speedup lexer preparation
Torsten <ttl@justmail.de>
parents:
16703
diff
changeset
|
93 _lexer_apis = 0; |
18767
095fdef3d67c
use editors run selection action for the context menu
Torsten <ttl@justmail.de>
parents:
18733
diff
changeset
|
94 _is_octave_file = true; |
20414
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
95 _lines_changed = false; |
16638
3c2e457eeb72
ask for saving modified editor files if octave is closed (bug #38689)
Torsten <ttl@justmail.de>
parents:
16635
diff
changeset
|
96 |
19803
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
97 _ced = directory_arg; |
21148
e8c3590da9ff
update directory in gui after add-path/change-dir dialog
Torsten <ttl@justmail.de>
parents:
21058
diff
changeset
|
98 _main_win = static_cast<main_window*> (editor->parent ()); |
16558 | 99 |
19803
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
100 _file_name = ""; |
17737
d3bb7f1e3971
prevent the editor's file watcher from signaling fasle alarms (bug #40312)
Torsten <ttl@justmail.de>
parents:
17706
diff
changeset
|
101 _file_system_watcher.setObjectName ("_qt_autotest_force_engine_poller"); |
16558 | 102 |
16731
01d523d5f796
add help for word at mouse or text cursor to the editors context menu
Torsten <ttl@justmail.de>
parents:
16721
diff
changeset
|
103 _edit_area = new octave_qscintilla (this); |
20414
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
104 _line = 0; |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
105 _col = 0; |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
106 |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
107 _bp_lines.clear (); // start with empty lists of breakpoints |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
108 _bp_conditions.clear (); |
21054
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
109 |
19608
4b980842edba
clean up some signal-slot combinations in the editor
Torsten <ttl@justmail.de>
parents:
19605
diff
changeset
|
110 connect (_edit_area, SIGNAL (cursorPositionChanged (int, int)), |
4b980842edba
clean up some signal-slot combinations in the editor
Torsten <ttl@justmail.de>
parents:
19605
diff
changeset
|
111 this, SLOT (handle_cursor_moved (int,int))); |
17962
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
112 |
20414
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
113 connect (_edit_area, SIGNAL (linesChanged ()), |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
114 this, SLOT (handle_lines_changed ())); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
115 |
19004
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
116 connect (_edit_area, SIGNAL (context_menu_edit_signal (const QString&)), |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
117 this, SLOT (handle_context_menu_edit (const QString&))); |
18687
99e26cb0f87f
use the actions from the editor for the context menu
Torsten <ttl@justmail.de>
parents:
18686
diff
changeset
|
118 |
19237
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
119 // create statusbar for row/col indicator and eol mode |
17962
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
120 _status_bar = new QStatusBar (this); |
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
121 |
19237
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
122 // row- and col-indicator |
17962
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
123 _row_indicator = new QLabel ("", this); |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
124 QFontMetrics fm = _row_indicator->fontMetrics (); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
125 _row_indicator->setMinimumSize (4.5*fm.averageCharWidth (),0); |
19244
05d8e71d20cb
add a label to the eol indicator in the editors status bar
Torsten <ttl@justmail.de>
parents:
19240
diff
changeset
|
126 QLabel *row_label = new QLabel (tr ("line:"), this); |
17962
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
127 _col_indicator = new QLabel ("", this); |
19846
72fe9df87fe8
improve scalability of gui objects (as discussed in bug #41938)
Torsten <ttl@justmail.de>
parents:
19844
diff
changeset
|
128 _col_indicator->setMinimumSize (4*fm.averageCharWidth (),0); |
19244
05d8e71d20cb
add a label to the eol indicator in the editors status bar
Torsten <ttl@justmail.de>
parents:
19240
diff
changeset
|
129 QLabel *col_label = new QLabel (tr ("col:"), this); |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
130 _status_bar->addWidget (row_label, 0); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
131 _status_bar->addWidget (_row_indicator, 0); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
132 _status_bar->addWidget (col_label, 0); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
133 _status_bar->addWidget (_col_indicator, 0); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
134 |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
135 // status bar: encoding |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
136 QLabel *enc_label = new QLabel (tr ("encoding:"), this); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
137 _enc_indicator = new QLabel ("",this); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
138 _status_bar->addWidget (enc_label, 0); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
139 _status_bar->addWidget (_enc_indicator, 0); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
140 _status_bar->addWidget (new QLabel (" ", this), 0); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
141 |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
142 // status bar: eol mode |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
143 QLabel *eol_label = new QLabel (tr ("eol:"), this); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
144 _eol_indicator = new QLabel ("",this); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
145 _status_bar->addWidget (eol_label, 0); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
146 _status_bar->addWidget (_eol_indicator, 0); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
147 _status_bar->addWidget (new QLabel (" ", this), 0); |
17962
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
148 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
149 // Leave the find dialog box out of memory until requested. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
150 _find_dialog = 0; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
151 _find_dialog_is_visible = false; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
152 |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
153 // symbols |
14709
f50591409306
Started to rename class names and methods from camel case to underscore-
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14707
diff
changeset
|
154 _edit_area->setMarginType (1, QsciScintilla::SymbolMargin); |
f50591409306
Started to rename class names and methods from camel case to underscore-
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14707
diff
changeset
|
155 _edit_area->setMarginSensitivity (1, true); |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
156 _edit_area->markerDefine (QsciScintilla::RightTriangle, marker::bookmark); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
157 _edit_area->setMarkerBackgroundColor (QColor (0,0,232), marker::bookmark); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
158 _edit_area->markerDefine (QsciScintilla::Circle, marker::breakpoint); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
159 _edit_area->setMarkerBackgroundColor (QColor (192,0,0), marker::breakpoint); |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
160 _edit_area->markerDefine (QsciScintilla::Circle, marker::cond_break); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
161 _edit_area->setMarkerBackgroundColor (QColor (255,127,0), marker::cond_break); |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
162 _edit_area->markerDefine (QsciScintilla::RightTriangle, marker::debugger_position); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
163 _edit_area->setMarkerBackgroundColor (QColor (255,255,0), marker::debugger_position); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
164 _edit_area->markerDefine (QsciScintilla::RightTriangle, |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
165 marker::unsure_debugger_position); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
166 _edit_area->setMarkerBackgroundColor (QColor (192,192,192), marker::unsure_debugger_position); |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
167 |
15045
1ffaad442161
Source code formatting (80-column lines, mostly whitespace changes)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14890
diff
changeset
|
168 connect (_edit_area, SIGNAL (marginClicked (int, int, |
1ffaad442161
Source code formatting (80-column lines, mostly whitespace changes)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14890
diff
changeset
|
169 Qt::KeyboardModifiers)), |
1ffaad442161
Source code formatting (80-column lines, mostly whitespace changes)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14890
diff
changeset
|
170 this, SLOT (handle_margin_clicked (int, int, |
1ffaad442161
Source code formatting (80-column lines, mostly whitespace changes)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14890
diff
changeset
|
171 Qt::KeyboardModifiers))); |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
172 |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
173 connect (_edit_area, SIGNAL (context_menu_break_condition_signal (int)), |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
174 this, SLOT (handle_context_menu_break_condition (int))); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
175 |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
176 // line numbers |
16558 | 177 _edit_area->setMarginsForegroundColor (QColor (96, 96, 96)); |
178 _edit_area->setMarginsBackgroundColor (QColor (232, 232, 220)); | |
15365
b4c32f245da7
GUI: Settings take immediate effect on the m-editor
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
15356
diff
changeset
|
179 _edit_area->setMarginType (2, QsciScintilla::TextMargin); |
15367
501a9cc2c68f
maint: whitespace cleanup in GUI code
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15365
diff
changeset
|
180 |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
181 // other features |
14709
f50591409306
Started to rename class names and methods from camel case to underscore-
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14707
diff
changeset
|
182 _edit_area->setBraceMatching (QsciScintilla::StrictBraceMatch); |
f50591409306
Started to rename class names and methods from camel case to underscore-
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14707
diff
changeset
|
183 _edit_area->setAutoIndent (true); |
f50591409306
Started to rename class names and methods from camel case to underscore-
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14707
diff
changeset
|
184 _edit_area->setIndentationWidth (2); |
f50591409306
Started to rename class names and methods from camel case to underscore-
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14707
diff
changeset
|
185 _edit_area->setIndentationsUseTabs (false); |
15365
b4c32f245da7
GUI: Settings take immediate effect on the m-editor
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
15356
diff
changeset
|
186 |
14709
f50591409306
Started to rename class names and methods from camel case to underscore-
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14707
diff
changeset
|
187 _edit_area->setUtf8 (true); |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
188 |
15365
b4c32f245da7
GUI: Settings take immediate effect on the m-editor
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
15356
diff
changeset
|
189 // auto completion |
18483
0f3bc7ccb875
update the completion list of the editor while typing
Torsten <ttl@justmail.de>
parents:
18482
diff
changeset
|
190 _edit_area->SendScintilla (QsciScintillaBase::SCI_AUTOCSETCANCELATSTART, false); |
15367
501a9cc2c68f
maint: whitespace cleanup in GUI code
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15365
diff
changeset
|
191 |
15368
36ececf69385
avoid some GCC warnings in the libgui code
John W. Eaton <jwe@octave.org>
parents:
15367
diff
changeset
|
192 QVBoxLayout *edit_area_layout = new QVBoxLayout (); |
36ececf69385
avoid some GCC warnings in the libgui code
John W. Eaton <jwe@octave.org>
parents:
15367
diff
changeset
|
193 edit_area_layout->addWidget (_edit_area); |
17962
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
194 edit_area_layout->addWidget (_status_bar); |
15368
36ececf69385
avoid some GCC warnings in the libgui code
John W. Eaton <jwe@octave.org>
parents:
15367
diff
changeset
|
195 edit_area_layout->setMargin (0); |
36ececf69385
avoid some GCC warnings in the libgui code
John W. Eaton <jwe@octave.org>
parents:
15367
diff
changeset
|
196 setLayout (edit_area_layout); |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
197 |
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
198 // connect modified signal |
14709
f50591409306
Started to rename class names and methods from camel case to underscore-
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14707
diff
changeset
|
199 connect (_edit_area, SIGNAL (modificationChanged (bool)), |
14788
85daba52b2d4
Fixed bug with editor complaining that a file has been modified by another application when saving.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14715
diff
changeset
|
200 this, SLOT (update_window_title (bool))); |
16558 | 201 |
14715
b4db843b1f26
Done some extra method renaming to fit the overall octave coding style.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14712
diff
changeset
|
202 connect (_edit_area, SIGNAL (copyAvailable (bool)), |
14709
f50591409306
Started to rename class names and methods from camel case to underscore-
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14707
diff
changeset
|
203 this, SLOT (handle_copy_available (bool))); |
16558 | 204 |
205 connect (&_file_system_watcher, SIGNAL (fileChanged (const QString&)), | |
206 this, SLOT (file_has_changed (const QString&))); | |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
207 |
16413
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16402
diff
changeset
|
208 QSettings *settings = resource_manager::get_settings (); |
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16402
diff
changeset
|
209 if (settings) |
19770
35a8e1beac8d
fix some oddities updating lexer and api-files for auto completion
Torsten <ttl@justmail.de>
parents:
19768
diff
changeset
|
210 notice_settings (settings, true); |
20630
802dc52d4d46
improve focus detection of gui (bug #45306)
Torsten <ttl@justmail.de>
parents:
19910
diff
changeset
|
211 |
802dc52d4d46
improve focus detection of gui (bug #45306)
Torsten <ttl@justmail.de>
parents:
19910
diff
changeset
|
212 setFocusProxy (_edit_area); |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
213 |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
214 // encoding, not updated with the settings |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
215 #if defined (Q_OS_WIN32) |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
216 _encoding = settings->value ("editor/default_encoding","SYSTEM") |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
217 .toString (); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
218 #else |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
219 _encoding = settings->value ("editor/default_encoding","UTF-8") |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
220 .toString (); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
221 #endif |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
222 _enc_indicator->setText (_encoding); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
223 // no changes in encoding yet |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
224 _new_encoding = _encoding; |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
225 } |
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
226 |
16558 | 227 file_editor_tab::~file_editor_tab (void) |
14680
628eeaf879f7
Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14676
diff
changeset
|
228 { |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
229 // Tell all connected markers to self-destruct. |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
230 emit remove_all_breakpoints (); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
231 emit remove_all_positions (); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
232 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
233 // Destroy items attached to _edit_area. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
234 QsciLexer *lexer = _edit_area->lexer (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
235 if (lexer) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
236 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
237 delete lexer; |
16558 | 238 _edit_area->setLexer (0); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
239 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
240 if (_find_dialog) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
241 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
242 delete _find_dialog; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
243 _find_dialog = 0; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
244 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
245 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
246 // Destroy _edit_area. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
247 delete _edit_area; |
14680
628eeaf879f7
Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14676
diff
changeset
|
248 } |
628eeaf879f7
Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14676
diff
changeset
|
249 |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
250 void |
20793
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
251 file_editor_tab::set_encoding (const QString& new_encoding) |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
252 { |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
253 if (new_encoding.isEmpty ()) |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
254 return; |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
255 |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
256 _encoding = new_encoding; |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
257 _enc_indicator->setText (_encoding); |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
258 if (! _edit_area->text ().isEmpty ()) |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
259 set_modified (true); |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
260 } |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
261 |
f7b0572fff6e
allow to select an encoding when opening a file
Torsten <ttl@justmail.de>
parents:
20783
diff
changeset
|
262 void |
15368
36ececf69385
avoid some GCC warnings in the libgui code
John W. Eaton <jwe@octave.org>
parents:
15367
diff
changeset
|
263 file_editor_tab::closeEvent (QCloseEvent *e) |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
264 { |
19844
a09471d938a5
fix closing a tab with modification
Torsten <ttl@justmail.de>
parents:
19804
diff
changeset
|
265 _cancelled = false; // prevent unwanted interaction of previous |
a09471d938a5
fix closing a tab with modification
Torsten <ttl@justmail.de>
parents:
19804
diff
changeset
|
266 // exits of octave which were canceled by the user |
a09471d938a5
fix closing a tab with modification
Torsten <ttl@justmail.de>
parents:
19804
diff
changeset
|
267 |
16018
e0df71fbe39b
gui: clearer message box with cancel button when closing an unsaved editor file
Torsten <ttl@justmail.de>
parents:
16017
diff
changeset
|
268 if (check_file_modified () == QMessageBox::Cancel) |
19844
a09471d938a5
fix closing a tab with modification
Torsten <ttl@justmail.de>
parents:
19804
diff
changeset
|
269 { // ignore close event if file is not saved and user cancels |
a09471d938a5
fix closing a tab with modification
Torsten <ttl@justmail.de>
parents:
19804
diff
changeset
|
270 // closing this window |
a09471d938a5
fix closing a tab with modification
Torsten <ttl@justmail.de>
parents:
19804
diff
changeset
|
271 e->ignore (); |
a09471d938a5
fix closing a tab with modification
Torsten <ttl@justmail.de>
parents:
19804
diff
changeset
|
272 } |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
273 else |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
274 { |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
275 e->accept (); |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
276 emit tab_remove_request (); |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
277 } |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
278 } |
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
279 |
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
280 void |
19803
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
281 file_editor_tab::set_current_directory (const QString& dir) |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
282 { |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
283 _ced = dir; |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
284 } |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
285 |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
286 void |
19004
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
287 file_editor_tab::handle_context_menu_edit (const QString& word_at_cursor) |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
288 { |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
289 // search for a subfunction in actual file (this is done at first because |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
290 // octave finds this function before other with same name in the search path |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
291 QRegExp rxfun1 ("^[\t ]*function[^=]+=[\t ]*" |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
292 + word_at_cursor + "[\t ]*\\([^\\)]*\\)[\t ]*$"); |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
293 QRegExp rxfun2 ("^[\t ]*function[\t ]+" |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
294 + word_at_cursor + "[\t ]*\\([^\\)]*\\)[\t ]*$"); |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
295 QRegExp rxfun3 ("^[\t ]*function[\t ]+" |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
296 + word_at_cursor + "[\t ]*$"); |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
297 QRegExp rxfun4 ("^[\t ]*function[^=]+=[\t ]*" |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
298 + word_at_cursor + "[\t ]*$"); |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
299 |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
300 int pos_fct = -1; |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
301 QStringList lines = _edit_area->text ().split ("\n"); |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
302 |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
303 int line; |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
304 for (line = 0; line < lines.count (); line++) |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
305 { |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
306 if ((pos_fct = rxfun1.indexIn (lines.at (line))) != -1) |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
307 break; |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
308 if ((pos_fct = rxfun2.indexIn (lines.at (line))) != -1) |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
309 break; |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
310 if ((pos_fct = rxfun3.indexIn (lines.at (line))) != -1) |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
311 break; |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
312 if ((pos_fct = rxfun4.indexIn (lines.at (line))) != -1) |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
313 break; |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
314 } |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
315 |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
316 if (pos_fct > -1) |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
317 { // reg expr. found: it is an internal function |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
318 _edit_area->setCursorPosition (line, pos_fct); |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
319 _edit_area->SendScintilla (2613, line); // SCI_SETFIRSTVISIBLELINE |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
320 return; |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
321 } |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
322 |
20995
aab7a3c7168e
edit a file from an error message in the terminal (bug #35619)
Torsten <ttl@justmail.de>
parents:
20993
diff
changeset
|
323 emit edit_mfile_request (word_at_cursor, _file_name, _ced, -1); |
aab7a3c7168e
edit a file from an error message in the terminal (bug #35619)
Torsten <ttl@justmail.de>
parents:
20993
diff
changeset
|
324 } |
19004
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
325 |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
326 // If "dbstop if ..." selected from context menu, create a conditional |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
327 // breakpoint. The default condition is (a) the existing condition if there |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
328 // is already a breakpoint (b) any selected text, or (c) empty |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
329 void |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
330 file_editor_tab::handle_context_menu_break_condition (int linenr) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
331 { |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
332 QString cond; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
333 bp_info info (_file_name, linenr); // Get function name & dir from filename. |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
334 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
335 // Ensure editor line numbers match Octave core's line numbers. |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
336 // Give users the option to save modifications if necessary. |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
337 if (! unchanged_or_saved () |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
338 || !(_main_win->get_octave_qt_link ()->file_in_path (info.file, info.dir))) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
339 return; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
340 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
341 // Search for previous condition. FIXME -- is there a more direct way? |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
342 if (_edit_area->markersAtLine (linenr) & (1 << marker::cond_break)) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
343 { |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
344 emit report_marker_linenr (_bp_lines, _bp_conditions); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
345 for (int i = 0; i < _bp_lines.length (); i++) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
346 if (_bp_lines.value (i) == linenr) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
347 { |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
348 cond = _bp_conditions.value (i); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
349 break; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
350 } |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
351 _bp_lines.clear (); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
352 } |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
353 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
354 // If text selected by the mouse, default to that instead |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
355 // If both present, use the OR of them, to avoid accidental overwriting |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
356 // FIXME If both are present, show old condition unselected and |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
357 // the selection (in edit area) selected (in the dialog). |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
358 if (_edit_area->hasSelectedText ()) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
359 { |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
360 if (cond == "") |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
361 cond = _edit_area->selectedText (); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
362 else |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
363 cond = "(" + cond + ") || (" + _edit_area->selectedText () + ")"; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
364 } |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
365 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
366 bool valid = false; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
367 std::string prompt = "dbstop if"; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
368 while (!valid) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
369 { |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
370 bool ok; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
371 QString new_condition |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
372 = QInputDialog::getText (this, tr ("Breakpoint condition"), |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
373 tr (prompt.c_str ()), QLineEdit::Normal, cond, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
374 &ok); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
375 if (ok) // If cancel, don't change breakpoint condition. |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
376 { |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
377 bp_table::intmap line; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
378 line[0] = linenr + 1; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
379 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
380 try |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
381 { |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
382 // Suppress error messages on the console. |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
383 unwind_protect frame; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
384 frame.protect_var (buffer_error_messages); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
385 buffer_error_messages++; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
386 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
387 bp_table::add_breakpoint (info.function_name, line, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
388 new_condition.toStdString ()); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
389 valid = true; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
390 } |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
391 catch (const octave_interrupt_exception&) { valid = true; } |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
392 catch (const index_exception& e) { } |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
393 catch (const octave_execution_exception& e) { } |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
394 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
395 // In case we repeat, set new prompt. |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
396 prompt = "ERROR: " + last_error_message () + "\n\ndbstop if"; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
397 cond = new_condition; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
398 } |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
399 else |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
400 valid = true; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
401 } |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
402 } |
19004
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
403 |
e87e65bc71ae
improved finding a function file for editing in gui (bug #41509)
Torsten <ttl@justmail.de>
parents:
18946
diff
changeset
|
404 void |
15300
fd27e10b9b05
pass QString by const reference instead of value
John W. Eaton <jwe@octave.org>
parents:
15286
diff
changeset
|
405 file_editor_tab::set_file_name (const QString& fileName) |
14690
ca733a66be7a
Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14680
diff
changeset
|
406 { |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
407 // update tracked file if we really have a file on disk |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
408 QStringList trackedFiles = _file_system_watcher.files (); |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20814
diff
changeset
|
409 if (! trackedFiles.isEmpty ()) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
410 _file_system_watcher.removePath (_file_name); |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20814
diff
changeset
|
411 if (! fileName.isEmpty ()) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
412 _file_system_watcher.addPath (fileName); |
14709
f50591409306
Started to rename class names and methods from camel case to underscore-
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14707
diff
changeset
|
413 _file_name = fileName; |
15425
8ae34ffe5c1b
Retain QsciAPIs lexer_api as part of lexer_octave_gui object (bug #37359)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15402
diff
changeset
|
414 |
8ae34ffe5c1b
Retain QsciAPIs lexer_api as part of lexer_octave_gui object (bug #37359)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15402
diff
changeset
|
415 // update lexer after _file_name change |
14869
db3c84d38345
Now supporting c/cc/cpp syntax highlighting.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14833
diff
changeset
|
416 update_lexer (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
417 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
418 // update the file editor with current editing directory |
19803
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
419 emit editor_state_changed (_copy_available, _is_octave_file); |
18767
095fdef3d67c
use editors run selection action for the context menu
Torsten <ttl@justmail.de>
parents:
18733
diff
changeset
|
420 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
421 // add the new file to the most-recently-used list |
20814
2da4058d65c7
store the encoding of recent editor files in the mru list
Torsten <ttl@justmail.de>
parents:
20796
diff
changeset
|
422 emit mru_add_file (_file_name, _encoding); |
14690
ca733a66be7a
Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14680
diff
changeset
|
423 } |
ca733a66be7a
Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14680
diff
changeset
|
424 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
425 // valid_file_name (file): checks whether "file" names a file. |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
426 // By default, "file" is empty; then _file_name is checked |
17973
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
427 bool |
17979
a761ba02a52f
some code cleanup in file_editor_tab
Torsten <ttl@justmail.de>
parents:
17973
diff
changeset
|
428 file_editor_tab::valid_file_name (const QString& file) |
17973
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
429 { |
17979
a761ba02a52f
some code cleanup in file_editor_tab
Torsten <ttl@justmail.de>
parents:
17973
diff
changeset
|
430 if (file.isEmpty ()) |
19803
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
431 { |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
432 if (_file_name.isEmpty ()) |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
433 return false; |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
434 else |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
435 return true; |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
436 } |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
437 |
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
438 return true; |
17973
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
439 } |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
440 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
441 // We cannot create a breakpoint when the file is modified |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
442 // because the line number the editor is providing might |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
443 // not match what Octave core is interpreting in the |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
444 // file on disk. This function gives the user the option |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
445 // to save before creating the breakpoint. |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
446 bool |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
447 file_editor_tab::unchanged_or_saved (void) |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
448 { |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
449 bool retval = true; |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
450 if (_edit_area->isModified ()) |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
451 { |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
452 int ans = QMessageBox::question (0, tr ("Octave Editor"), |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
453 tr ("Cannot add breakpoint to modified file.\n" |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
454 "Save and add breakpoint, or canel?"), |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
455 QMessageBox::Save | QMessageBox::Cancel, QMessageBox::Save); |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
456 |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
457 if (ans == QMessageBox::Save) |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
458 save_file (_file_name, false); |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
459 else |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
460 retval = false; |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
461 } |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
462 |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
463 return retval; |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
464 } |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
465 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
466 // Toggle a breakpoint at the editor_linenr or, if this was called by |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
467 // a click with CTRL pressed, toggle a bookmark at that point. |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
468 void |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
469 file_editor_tab::handle_margin_clicked (int margin, int editor_linenr, |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
470 Qt::KeyboardModifiers state) |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
471 { |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
472 if (margin == 1) |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
473 { |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
474 unsigned int markers_mask = _edit_area->markersAtLine (editor_linenr); |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
475 |
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
476 if (state & Qt::ControlModifier) |
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
477 { |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
478 if (markers_mask & (1 << marker::bookmark)) |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
479 _edit_area->markerDelete (editor_linenr, marker::bookmark); |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
480 else |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
481 _edit_area->markerAdd (editor_linenr, marker::bookmark); |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
482 } |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
483 else |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
484 { |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
485 if (markers_mask & ((1 << marker::breakpoint) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
486 | (1 << marker::cond_break))) |
21010
9b21039bf63b
fix line number when removing a breakpoint via the gui (bug #46779)
Torsten <ttl@justmail.de>
parents:
21007
diff
changeset
|
487 handle_request_remove_breakpoint (editor_linenr + 1); |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
488 else |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
489 { |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
490 if (unchanged_or_saved ()) |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
491 handle_request_add_breakpoint (editor_linenr + 1, ""); |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
492 } |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
493 } |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
494 } |
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
495 } |
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
496 |
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
497 void |
14869
db3c84d38345
Now supporting c/cc/cpp syntax highlighting.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14833
diff
changeset
|
498 file_editor_tab::update_lexer () |
db3c84d38345
Now supporting c/cc/cpp syntax highlighting.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14833
diff
changeset
|
499 { |
16704
e38a0fa08368
fix restoring editor files from previous session and speedup lexer preparation
Torsten <ttl@justmail.de>
parents:
16703
diff
changeset
|
500 if (_lexer_apis) |
e38a0fa08368
fix restoring editor files from previous session and speedup lexer preparation
Torsten <ttl@justmail.de>
parents:
16703
diff
changeset
|
501 _lexer_apis->cancelPreparation (); // stop preparing if apis exists |
e38a0fa08368
fix restoring editor files from previous session and speedup lexer preparation
Torsten <ttl@justmail.de>
parents:
16703
diff
changeset
|
502 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
503 QsciLexer *lexer = _edit_area->lexer (); |
14869
db3c84d38345
Now supporting c/cc/cpp syntax highlighting.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14833
diff
changeset
|
504 delete lexer; |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
505 lexer = 0; |
14869
db3c84d38345
Now supporting c/cc/cpp syntax highlighting.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14833
diff
changeset
|
506 |
18767
095fdef3d67c
use editors run selection action for the context menu
Torsten <ttl@justmail.de>
parents:
18733
diff
changeset
|
507 _is_octave_file = false; |
095fdef3d67c
use editors run selection action for the context menu
Torsten <ttl@justmail.de>
parents:
18733
diff
changeset
|
508 |
16559
78765ae325fd
gui: handle octaverc files with the octave lexer
Mike Miller <mtmiller@ieee.org>
parents:
16558
diff
changeset
|
509 if (_file_name.endsWith (".m") |
78765ae325fd
gui: handle octaverc files with the octave lexer
Mike Miller <mtmiller@ieee.org>
parents:
16558
diff
changeset
|
510 || _file_name.endsWith ("octaverc")) |
14869
db3c84d38345
Now supporting c/cc/cpp syntax highlighting.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14833
diff
changeset
|
511 { |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
512 #if defined (HAVE_LEXER_OCTAVE) |
16646
025bc6b5080e
use QScintilla's lexer for highlighting Octave programs
John W. Eaton <jwe@octave.org>
parents:
16638
diff
changeset
|
513 lexer = new QsciLexerOctave (); |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
514 #elif defined (HAVE_LEXER_MATLAB) |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
515 lexer = new QsciLexerMatlab (); |
19348
c364b9a44580
provide an editor lexer for text or unknown files (bug #43572)
Torsten <ttl@justmail.de>
parents:
19328
diff
changeset
|
516 #else |
c364b9a44580
provide an editor lexer for text or unknown files (bug #43572)
Torsten <ttl@justmail.de>
parents:
19328
diff
changeset
|
517 lexer = new octave_txt_lexer (); |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
518 #endif |
18767
095fdef3d67c
use editors run selection action for the context menu
Torsten <ttl@justmail.de>
parents:
18733
diff
changeset
|
519 _is_octave_file = true; |
14869
db3c84d38345
Now supporting c/cc/cpp syntax highlighting.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14833
diff
changeset
|
520 } |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
521 |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
522 if (! lexer) |
14873
355d6c165df0
Added syntax highlighting support for .sh/.bat/.pl and .diff-files.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14869
diff
changeset
|
523 { |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
524 if (_file_name.endsWith (".c") |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
525 || _file_name.endsWith (".cc") |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
526 || _file_name.endsWith (".cpp") |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
527 || _file_name.endsWith (".cxx") |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
528 || _file_name.endsWith (".c++") |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
529 || _file_name.endsWith (".h") |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
530 || _file_name.endsWith (".hh") |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
531 || _file_name.endsWith (".hpp") |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
532 || _file_name.endsWith (".h++")) |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
533 { |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
534 lexer = new QsciLexerCPP (); |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
535 } |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
536 else if (_file_name.endsWith (".pl")) |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
537 { |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
538 lexer = new QsciLexerPerl (); |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
539 } |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
540 else if (_file_name.endsWith (".bat")) |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
541 { |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
542 lexer = new QsciLexerBatch (); |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
543 } |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
544 else if (_file_name.endsWith (".diff")) |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
545 { |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
546 lexer = new QsciLexerDiff (); |
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
547 } |
19348
c364b9a44580
provide an editor lexer for text or unknown files (bug #43572)
Torsten <ttl@justmail.de>
parents:
19328
diff
changeset
|
548 else if (_file_name.endsWith (".sh")) |
c364b9a44580
provide an editor lexer for text or unknown files (bug #43572)
Torsten <ttl@justmail.de>
parents:
19328
diff
changeset
|
549 { |
c364b9a44580
provide an editor lexer for text or unknown files (bug #43572)
Torsten <ttl@justmail.de>
parents:
19328
diff
changeset
|
550 lexer = new QsciLexerBash (); |
c364b9a44580
provide an editor lexer for text or unknown files (bug #43572)
Torsten <ttl@justmail.de>
parents:
19328
diff
changeset
|
551 } |
17979
a761ba02a52f
some code cleanup in file_editor_tab
Torsten <ttl@justmail.de>
parents:
17973
diff
changeset
|
552 else if (! valid_file_name ()) |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
553 { |
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
554 // new, no yet named file: let us assume it is octave |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
555 #if defined (HAVE_LEXER_OCTAVE) |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
556 lexer = new QsciLexerOctave (); |
18767
095fdef3d67c
use editors run selection action for the context menu
Torsten <ttl@justmail.de>
parents:
18733
diff
changeset
|
557 _is_octave_file = true; |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
558 #elif defined (HAVE_LEXER_MATLAB) |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
559 lexer = new QsciLexerMatlab (); |
18767
095fdef3d67c
use editors run selection action for the context menu
Torsten <ttl@justmail.de>
parents:
18733
diff
changeset
|
560 _is_octave_file = true; |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
561 #else |
19348
c364b9a44580
provide an editor lexer for text or unknown files (bug #43572)
Torsten <ttl@justmail.de>
parents:
19328
diff
changeset
|
562 lexer = new octave_txt_lexer (); |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
563 #endif |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
564 } |
16720
973fd2367d44
select octave lexer for unnamed files and bash lexer for files without extension
Torsten <ttl@justmail.de>
parents:
16719
diff
changeset
|
565 else |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
566 { |
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
567 // other or no extension |
19348
c364b9a44580
provide an editor lexer for text or unknown files (bug #43572)
Torsten <ttl@justmail.de>
parents:
19328
diff
changeset
|
568 lexer = new octave_txt_lexer (); |
16720
973fd2367d44
select octave lexer for unnamed files and bash lexer for files without extension
Torsten <ttl@justmail.de>
parents:
16719
diff
changeset
|
569 } |
14874
5d74d8b982a5
Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14873
diff
changeset
|
570 } |
15367
501a9cc2c68f
maint: whitespace cleanup in GUI code
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15365
diff
changeset
|
571 |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
572 QSettings *settings = resource_manager::get_settings (); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
573 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
574 // build information for auto completion (APIs) |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
575 _lexer_apis = new QsciAPIs(lexer); |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
576 |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
577 if (_lexer_apis) |
16678
518dbe0ae857
fix auto completion for octave files in editor
Torsten <ttl@justmail.de>
parents:
16662
diff
changeset
|
578 { |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
579 bool update_apis_file = false; // flag, whether update of apis files |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
580 |
16717
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
581 // get path to prepared api info |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
582 QDesktopServices desktopServices; |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
583 QString prep_apis_path |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
584 = desktopServices.storageLocation (QDesktopServices::HomeLocation) |
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
585 + "/.config/octave/" + QString(OCTAVE_VERSION) + "/qsci/"; |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
586 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
587 // get settings which infos are used for octave |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
588 bool octave_builtins = settings->value ( |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
589 "editor/codeCompletion_octave_builtins", true).toBool (); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
590 bool octave_functions = settings->value ( |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
591 "editor/codeCompletion_octave_functions", true).toBool (); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
592 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
593 if (_is_octave_file) |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
594 { |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
595 // octave file: keywords are always used |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
596 _prep_apis_file = prep_apis_path + lexer->lexer () + "_k"; |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
597 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
598 if (octave_builtins) |
20230
e914b5399c67
Use in-place operators in C++ code where possible.
Rik <rik@octave.org>
parents:
19910
diff
changeset
|
599 _prep_apis_file += "b"; // use builtins, too |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
600 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
601 if (octave_functions) |
20230
e914b5399c67
Use in-place operators in C++ code where possible.
Rik <rik@octave.org>
parents:
19910
diff
changeset
|
602 _prep_apis_file += "f"; // use keywords, too |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
603 |
20230
e914b5399c67
Use in-place operators in C++ code where possible.
Rik <rik@octave.org>
parents:
19910
diff
changeset
|
604 _prep_apis_file += ".pap"; // final name of apis file |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
605 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
606 // check whether the APIs info needs to be prepared and saved |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
607 QFileInfo apis_file = QFileInfo (_prep_apis_file); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
608 update_apis_file = ! apis_file.exists (); // flag whether apis file needs update |
16715
96ed7ab44e2e
save prepared apis info for qscintilla into a path depending on octave version
Torsten <ttl@justmail.de>
parents:
16704
diff
changeset
|
609 |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
610 // function list depends on installed packages: check mod. date |
19770
35a8e1beac8d
fix some oddities updating lexer and api-files for auto completion
Torsten <ttl@justmail.de>
parents:
19768
diff
changeset
|
611 if (! update_apis_file && octave_functions) |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
612 { |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
613 // check whether package file is newer than apis_file |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
614 QDateTime apis_date = apis_file.lastModified (); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
615 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
616 // compare to local package list |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
617 // FIXME: How to get user chosen location? |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
618 QFileInfo local_pkg_list = QFileInfo ( |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
619 desktopServices.storageLocation (QDesktopServices::HomeLocation) |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
620 + "/.octave_packages"); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
621 if (local_pkg_list.exists () |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
622 & (apis_date < local_pkg_list.lastModified ()) ) |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
623 update_apis_file = true; |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
624 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
625 // compare to global package list |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
626 // FIXME: How to get user chosen location? |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
627 QFileInfo global_pkg_list = QFileInfo ( |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
628 QString::fromStdString (Voctave_home) |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
629 + "/share/octave/octave_packages"); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
630 if (global_pkg_list.exists () |
19770
35a8e1beac8d
fix some oddities updating lexer and api-files for auto completion
Torsten <ttl@justmail.de>
parents:
19768
diff
changeset
|
631 && (apis_date < global_pkg_list.lastModified ()) ) |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
632 update_apis_file = true; |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
633 } |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
634 } |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
635 else // no octave file, just add extension |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
636 { |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
637 _prep_apis_file = prep_apis_path + lexer->lexer () + ".pap"; |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
638 } |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
639 |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20814
diff
changeset
|
640 if (update_apis_file || ! _lexer_apis->loadPrepared (_prep_apis_file)) |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
641 { |
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
642 // no prepared info loaded, prepare and save if possible |
16717
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
643 |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
644 // create raw apis info |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
645 QString keyword; |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
646 QStringList keyword_list; |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
647 int i,j; |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
648 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
649 if (_is_octave_file) |
16717
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
650 { |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
651 // octave: get keywords from internal informations depending on |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
652 // user preferences |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
653 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
654 // keywords are always used |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
655 add_octave_apis (F__keywords__ ()); // add new entries |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
656 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
657 if (octave_builtins) |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
658 add_octave_apis (F__builtins__ ()); // add new entries |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
659 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
660 if (octave_functions) |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
661 add_octave_apis (F__list_functions__ ()); // add new entries |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
662 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
663 } |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
664 else |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
665 { |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
666 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
667 _prep_apis_file = prep_apis_path + lexer->lexer () + ".pap"; |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
668 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
669 for (i=1; i<=3; i++) // test the first 5 keyword sets |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
670 { |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
671 keyword = QString(lexer->keywords (i)); // get list |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
672 keyword_list = keyword.split (QRegExp ("\\s+")); // split |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
673 for (j = 0; j < keyword_list.size (); j++) // add to API |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
674 _lexer_apis->add (keyword_list.at (j)); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
675 } |
16717
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
676 } |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
677 |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
678 // dsiconnect slot for saving prepared info if already connected |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
679 disconnect (_lexer_apis, SIGNAL (apiPreparationFinished ()), 0, 0); |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
680 // check whether path for prepared info exists or can be created |
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
681 if (QDir("/").mkpath (prep_apis_path)) |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
682 { |
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
683 // path exists, apis info can be saved there |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
684 connect (_lexer_apis, SIGNAL (apiPreparationFinished ()), |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
685 this, SLOT (save_apis_info ())); |
16704
e38a0fa08368
fix restoring editor files from previous session and speedup lexer preparation
Torsten <ttl@justmail.de>
parents:
16703
diff
changeset
|
686 } |
16721
a71a784c7611
* file-editor-tab.cc(update_lexer): redundant code removed
Torsten <ttl@justmail.de>
parents:
16720
diff
changeset
|
687 _lexer_apis->prepare (); // prepare apis info |
16678
518dbe0ae857
fix auto completion for octave files in editor
Torsten <ttl@justmail.de>
parents:
16662
diff
changeset
|
688 } |
518dbe0ae857
fix auto completion for octave files in editor
Torsten <ttl@justmail.de>
parents:
16662
diff
changeset
|
689 } |
518dbe0ae857
fix auto completion for octave files in editor
Torsten <ttl@justmail.de>
parents:
16662
diff
changeset
|
690 |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
691 lexer->readSettings (*settings); |
16662
72665c4ae25b
allow build to continue without QScintilla lexer for Octave
John W. Eaton <jwe@octave.org>
parents:
16646
diff
changeset
|
692 |
16402
7fa90eb41240
gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
16395
diff
changeset
|
693 _edit_area->setLexer (lexer); |
20993
31a12af0aaaf
color of editor margins adapted to currently chosen style (bug #46706)
Torsten <ttl@justmail.de>
parents:
20955
diff
changeset
|
694 |
19181
e85203f41402
set cursor color of the editor to color of default text (bug #43314)
Torsten <ttl@justmail.de>
parents:
19043
diff
changeset
|
695 _edit_area->setCaretForegroundColor (lexer->color (0)); |
e85203f41402
set cursor color of the editor to color of default text (bug #43314)
Torsten <ttl@justmail.de>
parents:
19043
diff
changeset
|
696 _edit_area->setIndentationGuidesForegroundColor (lexer->color (0)); |
15367
501a9cc2c68f
maint: whitespace cleanup in GUI code
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15365
diff
changeset
|
697 |
21011
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
698 // set some colors depending on selected background color of the lexer |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
699 QColor bg = lexer->paper (0); |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
700 QColor fg = lexer->color (0); |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
701 |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
702 int bh, bs, bv, fh, fs, fv, h, s, v; |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
703 bg.getHsv (&bh,&bs,&bv); |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
704 fg.getHsv (&fh,&fs,&fv); |
20993
31a12af0aaaf
color of editor margins adapted to currently chosen style (bug #46706)
Torsten <ttl@justmail.de>
parents:
20955
diff
changeset
|
705 |
21011
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
706 // margin colors |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
707 h = bh; |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
708 s = bs/2; |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
709 v = bv + (fv - bv)/8; |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
710 bg.setHsv (h,s,v); |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
711 v = bv + (fv - bv)/4; |
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
712 fg.setHsv (h,s,v); |
20993
31a12af0aaaf
color of editor margins adapted to currently chosen style (bug #46706)
Torsten <ttl@justmail.de>
parents:
20955
diff
changeset
|
713 |
21011
d9f4e4961e09
improved margin and marker colors in the editor
Torsten <ttl@justmail.de>
parents:
21010
diff
changeset
|
714 _edit_area->setMarkerForegroundColor (lexer->color (0)); |
20993
31a12af0aaaf
color of editor margins adapted to currently chosen style (bug #46706)
Torsten <ttl@justmail.de>
parents:
20955
diff
changeset
|
715 _edit_area->setMarginsForegroundColor (lexer->color (0)); |
31a12af0aaaf
color of editor margins adapted to currently chosen style (bug #46706)
Torsten <ttl@justmail.de>
parents:
20955
diff
changeset
|
716 _edit_area->setMarginsBackgroundColor (bg); |
31a12af0aaaf
color of editor margins adapted to currently chosen style (bug #46706)
Torsten <ttl@justmail.de>
parents:
20955
diff
changeset
|
717 _edit_area->setFoldMarginColors (bg,fg); |
31a12af0aaaf
color of editor margins adapted to currently chosen style (bug #46706)
Torsten <ttl@justmail.de>
parents:
20955
diff
changeset
|
718 |
16717
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
719 // fix line number width with respect to the font size of the lexer |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
720 if (settings->value ("editor/showLineNumbers", true).toBool ()) |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
721 auto_margin_width (); |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
722 else |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
723 _edit_area->setMarginWidth (2,0); |
16717
9ad6e7d4fa42
fix bug concerning preparing the apis info for code completion
Torsten <ttl@justmail.de>
parents:
16716
diff
changeset
|
724 |
14869
db3c84d38345
Now supporting c/cc/cpp syntax highlighting.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14833
diff
changeset
|
725 } |
db3c84d38345
Now supporting c/cc/cpp syntax highlighting.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14833
diff
changeset
|
726 |
18833
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
727 // function for adding entries to the octave lexer's APIs |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
728 void |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
729 file_editor_tab::add_octave_apis (octave_value_list key_ovl) |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
730 { |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
731 octave_value keys = key_ovl(0); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
732 Cell key_list = keys.cell_value (); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
733 |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
734 for (int idx = 0; idx < key_list.numel (); idx++) |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
735 _lexer_apis->add (QString (key_list.elem (idx).string_value ().data ())); |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
736 } |
6504a1932637
auto completion offers builtins and file functions for octave (bug #41371)
Torsten <ttl@justmail.de>
parents:
18767
diff
changeset
|
737 |
16704
e38a0fa08368
fix restoring editor files from previous session and speedup lexer preparation
Torsten <ttl@justmail.de>
parents:
16703
diff
changeset
|
738 void |
e38a0fa08368
fix restoring editor files from previous session and speedup lexer preparation
Torsten <ttl@justmail.de>
parents:
16703
diff
changeset
|
739 file_editor_tab::save_apis_info () |
e38a0fa08368
fix restoring editor files from previous session and speedup lexer preparation
Torsten <ttl@justmail.de>
parents:
16703
diff
changeset
|
740 { |
16715
96ed7ab44e2e
save prepared apis info for qscintilla into a path depending on octave version
Torsten <ttl@justmail.de>
parents:
16704
diff
changeset
|
741 _lexer_apis->savePrepared (_prep_apis_file); |
16704
e38a0fa08368
fix restoring editor files from previous session and speedup lexer preparation
Torsten <ttl@justmail.de>
parents:
16703
diff
changeset
|
742 } |
e38a0fa08368
fix restoring editor files from previous session and speedup lexer preparation
Torsten <ttl@justmail.de>
parents:
16703
diff
changeset
|
743 |
16719
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
744 QString |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
745 file_editor_tab::comment_string (const QString& lexer) |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
746 { |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
747 if (lexer == "octave" || lexer == "matlab") |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
748 return QString("%"); |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
749 else if (lexer == "perl" || lexer == "bash" || lexer == "diff") |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
750 return QString("#"); |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
751 else if (lexer == "cpp") |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
752 return ("//"); |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
753 else if (lexer == "batch") |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
754 return ("REM "); |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
755 else |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
756 return ("%"); // should never happen |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
757 } |
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
758 |
15980
6c0fce0632a4
gui: set keyboard focus when switching between dock widgets (bug #36957)
Torsten <ttl@justmail.de>
parents:
15894
diff
changeset
|
759 // slot for fetab_set_focus: sets the focus to the current edit area |
6c0fce0632a4
gui: set keyboard focus when switching between dock widgets (bug #36957)
Torsten <ttl@justmail.de>
parents:
15894
diff
changeset
|
760 void |
16558 | 761 file_editor_tab::set_focus (const QWidget *ID) |
15980
6c0fce0632a4
gui: set keyboard focus when switching between dock widgets (bug #36957)
Torsten <ttl@justmail.de>
parents:
15894
diff
changeset
|
762 { |
6c0fce0632a4
gui: set keyboard focus when switching between dock widgets (bug #36957)
Torsten <ttl@justmail.de>
parents:
15894
diff
changeset
|
763 if (ID != this) |
6c0fce0632a4
gui: set keyboard focus when switching between dock widgets (bug #36957)
Torsten <ttl@justmail.de>
parents:
15894
diff
changeset
|
764 return; |
6c0fce0632a4
gui: set keyboard focus when switching between dock widgets (bug #36957)
Torsten <ttl@justmail.de>
parents:
15894
diff
changeset
|
765 _edit_area->setFocus (); |
6c0fce0632a4
gui: set keyboard focus when switching between dock widgets (bug #36957)
Torsten <ttl@justmail.de>
parents:
15894
diff
changeset
|
766 } |
6c0fce0632a4
gui: set keyboard focus when switching between dock widgets (bug #36957)
Torsten <ttl@justmail.de>
parents:
15894
diff
changeset
|
767 |
14869
db3c84d38345
Now supporting c/cc/cpp syntax highlighting.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
14833
diff
changeset
|
768 void |
17627
811019b9ef57
Add help and documentation on actual keyword to the editor menu
Torsten <ttl@justmail.de>
parents:
16912
diff
changeset
|
769 file_editor_tab::context_help (const QWidget *ID, bool doc) |
811019b9ef57
Add help and documentation on actual keyword to the editor menu
Torsten <ttl@justmail.de>
parents:
16912
diff
changeset
|
770 { |
811019b9ef57
Add help and documentation on actual keyword to the editor menu
Torsten <ttl@justmail.de>
parents:
16912
diff
changeset
|
771 if (ID != this) |
811019b9ef57
Add help and documentation on actual keyword to the editor menu
Torsten <ttl@justmail.de>
parents:
16912
diff
changeset
|
772 return; |
811019b9ef57
Add help and documentation on actual keyword to the editor menu
Torsten <ttl@justmail.de>
parents:
16912
diff
changeset
|
773 |
811019b9ef57
Add help and documentation on actual keyword to the editor menu
Torsten <ttl@justmail.de>
parents:
16912
diff
changeset
|
774 _edit_area->context_help_doc (doc); |
811019b9ef57
Add help and documentation on actual keyword to the editor menu
Torsten <ttl@justmail.de>
parents:
16912
diff
changeset
|
775 } |
811019b9ef57
Add help and documentation on actual keyword to the editor menu
Torsten <ttl@justmail.de>
parents:
16912
diff
changeset
|
776 |
811019b9ef57
Add help and documentation on actual keyword to the editor menu
Torsten <ttl@justmail.de>
parents:
16912
diff
changeset
|
777 void |
17628
99ffa521ecec
Add possibility to edit the function related to the actual keyword in editor
Torsten <ttl@justmail.de>
parents:
17627
diff
changeset
|
778 file_editor_tab::context_edit (const QWidget *ID) |
99ffa521ecec
Add possibility to edit the function related to the actual keyword in editor
Torsten <ttl@justmail.de>
parents:
17627
diff
changeset
|
779 { |
99ffa521ecec
Add possibility to edit the function related to the actual keyword in editor
Torsten <ttl@justmail.de>
parents:
17627
diff
changeset
|
780 if (ID != this) |
99ffa521ecec
Add possibility to edit the function related to the actual keyword in editor
Torsten <ttl@justmail.de>
parents:
17627
diff
changeset
|
781 return; |
99ffa521ecec
Add possibility to edit the function related to the actual keyword in editor
Torsten <ttl@justmail.de>
parents:
17627
diff
changeset
|
782 |
99ffa521ecec
Add possibility to edit the function related to the actual keyword in editor
Torsten <ttl@justmail.de>
parents:
17627
diff
changeset
|
783 _edit_area->context_edit (); |
99ffa521ecec
Add possibility to edit the function related to the actual keyword in editor
Torsten <ttl@justmail.de>
parents:
17627
diff
changeset
|
784 } |
99ffa521ecec
Add possibility to edit the function related to the actual keyword in editor
Torsten <ttl@justmail.de>
parents:
17627
diff
changeset
|
785 |
99ffa521ecec
Add possibility to edit the function related to the actual keyword in editor
Torsten <ttl@justmail.de>
parents:
17627
diff
changeset
|
786 void |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
787 file_editor_tab::check_modified_file (void) |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
788 { |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
789 if (_cancelled) |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
790 return; |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
791 |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
792 if (check_file_modified () == QMessageBox::Cancel) |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
793 _cancelled = true; |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
794 } |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
795 |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
796 void |
16558 | 797 file_editor_tab::save_file (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
798 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
799 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
800 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
801 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
802 save_file (_file_name); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
803 } |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
804 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
805 void |
16558 | 806 file_editor_tab::save_file (const QWidget *ID, const QString& fileName, |
807 bool remove_on_success) | |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
808 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
809 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
810 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
811 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
812 save_file (fileName, remove_on_success); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
813 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
814 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
815 void |
16558 | 816 file_editor_tab::save_file_as (const QWidget *ID) |
14827
6b90737f69cc
Very basic breakpoint setting and removing in the editor works.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14826
diff
changeset
|
817 { |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
818 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
819 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
820 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
821 save_file_as (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
822 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
823 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
824 void |
16558 | 825 file_editor_tab::print_file (const QWidget *ID) |
16440
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
826 { |
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
827 if (ID != this) |
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
828 return; |
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
829 |
16558 | 830 QsciPrinter *printer = new QsciPrinter (QPrinter::HighResolution); |
16440
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
831 |
16558 | 832 QPrintDialog printDlg (printer, this); |
16440
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
833 |
16558 | 834 if (printDlg.exec () == QDialog::Accepted) |
835 printer->printRange (_edit_area); | |
836 | |
16440
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
837 delete printer; |
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
838 } |
aaf024ac8015
Add editor print menu/toolbutton implementation
John Donoghue <john.donoghue@ieee.org>
parents:
16437
diff
changeset
|
839 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
840 void |
16558 | 841 file_editor_tab::run_file (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
842 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
843 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
844 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
845 |
18838
b43157d085ba
make sure a new and still unnamed file is saved when run from the editor
Torsten <ttl@justmail.de>
parents:
18837
diff
changeset
|
846 if (_edit_area->isModified () | ! valid_file_name ()) |
19910
bb1629e15afe
cancel run action when saving unnamed file was canceled (bug #44434)
Torsten <ttl@justmail.de>
parents:
19900
diff
changeset
|
847 { |
bb1629e15afe
cancel run action when saving unnamed file was canceled (bug #44434)
Torsten <ttl@justmail.de>
parents:
19900
diff
changeset
|
848 save_file (_file_name); // save file dialog |
bb1629e15afe
cancel run action when saving unnamed file was canceled (bug #44434)
Torsten <ttl@justmail.de>
parents:
19900
diff
changeset
|
849 if (! valid_file_name ()) |
20713
2469d78a1d8b
Consistently use 'filename' rather than 'file name' throughout code base.
Rik <rik@octave.org>
parents:
20677
diff
changeset
|
850 return; // still invalid filename: "save as" was cancelled |
19910
bb1629e15afe
cancel run action when saving unnamed file was canceled (bug #44434)
Torsten <ttl@justmail.de>
parents:
19900
diff
changeset
|
851 } |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
852 |
16635
25e418d23a4b
fix running files from file browser's context menu
Torsten <ttl@justmail.de>
parents:
16591
diff
changeset
|
853 QFileInfo info (_file_name); |
25e418d23a4b
fix running files from file browser's context menu
Torsten <ttl@justmail.de>
parents:
16591
diff
changeset
|
854 emit run_file_signal (info); |
15080
4c4f2fb07a50
Added find functionality in editor by to.lil.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
15045
diff
changeset
|
855 } |
4c4f2fb07a50
Added find functionality in editor by to.lil.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
15045
diff
changeset
|
856 |
4c4f2fb07a50
Added find functionality in editor by to.lil.
Jacob Dawid <jacob.dawid@gmail.com>
parents:
15045
diff
changeset
|
857 void |
17635
7945344506ae
Add possibility to run selected text of the editor in the terminal
Torsten <ttl@justmail.de>
parents:
17628
diff
changeset
|
858 file_editor_tab::context_run (const QWidget *ID) |
7945344506ae
Add possibility to run selected text of the editor in the terminal
Torsten <ttl@justmail.de>
parents:
17628
diff
changeset
|
859 { |
7945344506ae
Add possibility to run selected text of the editor in the terminal
Torsten <ttl@justmail.de>
parents:
17628
diff
changeset
|
860 if (ID != this) |
7945344506ae
Add possibility to run selected text of the editor in the terminal
Torsten <ttl@justmail.de>
parents:
17628
diff
changeset
|
861 return; |
7945344506ae
Add possibility to run selected text of the editor in the terminal
Torsten <ttl@justmail.de>
parents:
17628
diff
changeset
|
862 |
7945344506ae
Add possibility to run selected text of the editor in the terminal
Torsten <ttl@justmail.de>
parents:
17628
diff
changeset
|
863 _edit_area->context_run (); |
7945344506ae
Add possibility to run selected text of the editor in the terminal
Torsten <ttl@justmail.de>
parents:
17628
diff
changeset
|
864 } |
7945344506ae
Add possibility to run selected text of the editor in the terminal
Torsten <ttl@justmail.de>
parents:
17628
diff
changeset
|
865 |
7945344506ae
Add possibility to run selected text of the editor in the terminal
Torsten <ttl@justmail.de>
parents:
17628
diff
changeset
|
866 void |
16558 | 867 file_editor_tab::toggle_bookmark (const QWidget *ID) |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
868 { |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
869 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
870 return; |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
871 |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
872 int line, cur; |
16558 | 873 _edit_area->getCursorPosition (&line, &cur); |
874 | |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
875 if (_edit_area->markersAtLine (line) & (1 << marker::bookmark)) |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
876 _edit_area->markerDelete (line, marker::bookmark); |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
877 else |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
878 _edit_area->markerAdd (line, marker::bookmark); |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
879 } |
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
880 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
881 // Move the text cursor to the closest bookmark |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
882 // after the current line. |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
883 void |
16558 | 884 file_editor_tab::next_bookmark (const QWidget *ID) |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
885 { |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
886 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
887 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
888 |
16558 | 889 int line, cur; |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
890 _edit_area->getCursorPosition (&line, &cur); |
16558 | 891 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
892 line++; // Find bookmark strictly after the current line. |
16558 | 893 |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
894 int nextline = _edit_area->markerFindNext (line, (1 << marker::bookmark)); |
16558 | 895 |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
896 _edit_area->setCursorPosition (nextline, 0); |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
897 } |
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
898 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
899 // Move the text cursor to the closest bookmark |
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
900 // before the current line. |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
901 void |
16558 | 902 file_editor_tab::previous_bookmark (const QWidget *ID) |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
903 { |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
904 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
905 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
906 |
16558 | 907 int line, cur; |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
908 _edit_area->getCursorPosition (&line, &cur); |
16558 | 909 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
910 line--; // Find bookmark strictly before the current line. |
16558 | 911 |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
912 int prevline = _edit_area->markerFindPrevious (line, (1 << marker::bookmark)); |
16558 | 913 |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
914 _edit_area->setCursorPosition (prevline, 0); |
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
915 } |
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
916 |
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
917 void |
16558 | 918 file_editor_tab::remove_bookmark (const QWidget *ID) |
14825
eae0e9f2a8c6
Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* .
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14804
diff
changeset
|
919 { |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
920 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
921 return; |
14676
35512b788af2
Editor can now handle multiple files in tabs.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff
changeset
|
922 |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
923 _edit_area->markerDeleteAll (marker::bookmark); |
15402
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
924 } |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
925 |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
926 void |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
927 file_editor_tab::add_breakpoint_callback (const bp_info& info) |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
928 { |
16547
3cd80afc3509
improve debugging with the GUI
John W. Eaton <jwe@octave.org>
parents:
16520
diff
changeset
|
929 bp_table::intmap line_info; |
3cd80afc3509
improve debugging with the GUI
John W. Eaton <jwe@octave.org>
parents:
16520
diff
changeset
|
930 line_info[0] = info.line; |
15402
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
931 |
21148
e8c3590da9ff
update directory in gui after add-path/change-dir dialog
Torsten <ttl@justmail.de>
parents:
21058
diff
changeset
|
932 if (_main_win->get_octave_qt_link ()->file_in_path (info.file, info.dir)) |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
933 bp_table::add_breakpoint (info.function_name, line_info, info.condition); |
15402
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
934 } |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
935 |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
936 void |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
937 file_editor_tab::remove_breakpoint_callback (const bp_info& info) |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
938 { |
16547
3cd80afc3509
improve debugging with the GUI
John W. Eaton <jwe@octave.org>
parents:
16520
diff
changeset
|
939 bp_table::intmap line_info; |
3cd80afc3509
improve debugging with the GUI
John W. Eaton <jwe@octave.org>
parents:
16520
diff
changeset
|
940 line_info[0] = info.line; |
15402
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
941 |
21148
e8c3590da9ff
update directory in gui after add-path/change-dir dialog
Torsten <ttl@justmail.de>
parents:
21058
diff
changeset
|
942 if (_main_win->get_octave_qt_link ()->file_in_path (info.file, info.dir)) |
16547
3cd80afc3509
improve debugging with the GUI
John W. Eaton <jwe@octave.org>
parents:
16520
diff
changeset
|
943 bp_table::remove_breakpoint (info.function_name, line_info); |
15402
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
944 } |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
945 |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
946 void |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
947 file_editor_tab::remove_all_breakpoints_callback (const bp_info& info) |
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
948 { |
21148
e8c3590da9ff
update directory in gui after add-path/change-dir dialog
Torsten <ttl@justmail.de>
parents:
21058
diff
changeset
|
949 if (_main_win->get_octave_qt_link ()->file_in_path (info.file, info.dir)) |
16547
3cd80afc3509
improve debugging with the GUI
John W. Eaton <jwe@octave.org>
parents:
16520
diff
changeset
|
950 bp_table::remove_all_breakpoints_in_file (info.function_name, true); |
15402
7f423c6111c6
refactor GUI event handling to use new event_queue class
John W. Eaton <jwe@octave.org>
parents:
15389
diff
changeset
|
951 } |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
952 |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
953 file_editor_tab::bp_info::bp_info (const QString& fname, int l, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
954 const QString& cond) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
955 : line (l), file (fname.toStdString ()), condition (cond.toStdString ()) |
18237
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
956 { |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
957 QFileInfo file_info (fname); |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
958 |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
959 QString q_dir = file_info.absolutePath (); |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
960 QString q_function_name = file_info.fileName (); |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
961 |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
962 // We have to cut off the suffix, because octave appends it. |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
963 q_function_name.chop (file_info.suffix ().length () + 1); |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
964 |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
965 dir = q_dir.toStdString (); |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
966 function_name = q_function_name.toStdString (); |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
967 |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
968 // Is the last component of DIR @foo? If so, strip it and prepend it |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
969 // to the name of the function. |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
970 |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
971 size_t pos = dir.rfind (file_ops::dir_sep_chars ()); |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
972 |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
973 if (pos != std::string::npos && pos < dir.length () - 1) |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
974 { |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
975 if (dir[pos+1] == '@') |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
976 { |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
977 function_name = file_ops::concat (dir.substr (pos+1), function_name); |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
978 |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
979 dir = dir.substr (0, pos); |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
980 } |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
981 } |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
982 } |
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
983 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
984 void |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
985 file_editor_tab::handle_request_add_breakpoint (int line, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
986 const QString& condition) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
987 { |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
988 bp_info info (_file_name, line, condition); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
989 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
990 octave_link::post_event |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
991 (this, &file_editor_tab::add_breakpoint_callback, info); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
992 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
993 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
994 void |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
995 file_editor_tab::handle_request_remove_breakpoint (int line) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
996 { |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
997 bp_info info (_file_name, line); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
998 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
999 octave_link::post_event |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1000 (this, &file_editor_tab::remove_breakpoint_callback, info); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1001 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1002 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1003 void |
16558 | 1004 file_editor_tab::toggle_breakpoint (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1005 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1006 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1007 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1008 |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1009 int editor_linenr, cur; |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1010 _edit_area->getCursorPosition (&editor_linenr, &cur); |
16558 | 1011 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
1012 if (_edit_area->markersAtLine (editor_linenr) & (1 << marker::breakpoint)) |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1013 request_remove_breakpoint_via_editor_linenr (editor_linenr); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1014 else |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1015 { |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
1016 if (unchanged_or_saved ()) |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1017 handle_request_add_breakpoint (editor_linenr + 1, ""); |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1018 } |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1019 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1020 |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1021 // Move the text cursor to the closest breakpoint (conditional or unconditional) |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
1022 // after the current line. |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1023 void |
16558 | 1024 file_editor_tab::next_breakpoint (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1025 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1026 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1027 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1028 |
16558 | 1029 int line, cur; |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1030 _edit_area->getCursorPosition (&line, &cur); |
16558 | 1031 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
1032 line++; // Find breakpoint strictly after the current line. |
16558 | 1033 |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1034 int nextline = _edit_area->markerFindNext (line, (1 << marker::breakpoint)); |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1035 int nextcond = _edit_area->markerFindNext (line, (1 << marker::cond_break)); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1036 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1037 // Check if the next conditional breakpoint is before next unconditional one. |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1038 if (nextcond != -1 && (nextcond < nextline || nextline == -1)) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1039 nextline = nextcond; |
16558 | 1040 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1041 _edit_area->setCursorPosition (nextline, 0); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1042 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1043 |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1044 // Move the text cursor to the closest breakpoint (conditional or unconditional) |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
1045 // before the current line. |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1046 void |
16558 | 1047 file_editor_tab::previous_breakpoint (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1048 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1049 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1050 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1051 |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1052 int line, cur, prevline, prevcond; |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1053 _edit_area->getCursorPosition (&line, &cur); |
16558 | 1054 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
1055 line--; // Find breakpoint strictly before the current line. |
16558 | 1056 |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1057 prevline = _edit_area->markerFindPrevious (line, (1 << marker::breakpoint)); |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1058 prevcond = _edit_area->markerFindPrevious (line, (1 << marker::cond_break)); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1059 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1060 // Check if the prev conditional breakpoint is closer than the unconditional. |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1061 if (prevcond != -1 && prevcond > prevline) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1062 prevline = prevcond; |
16558 | 1063 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1064 _edit_area->setCursorPosition (prevline, 0); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1065 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1066 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1067 void |
16558 | 1068 file_editor_tab::remove_all_breakpoints (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1069 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1070 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1071 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1072 |
18237
f26d527c1a71
allow the gui editor to set breakpoints in class methods (bug #41126)
John W. Eaton <jwe@octave.org>
parents:
18082
diff
changeset
|
1073 bp_info info (_file_name); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1074 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1075 octave_link::post_event |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1076 (this, &file_editor_tab::remove_all_breakpoints_callback, info); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1077 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1078 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1079 void |
18656
1b289f45187f
add some qscintilla actions to the menu and to the shortcut manager
Torsten <ttl@justmail.de>
parents:
18560
diff
changeset
|
1080 file_editor_tab::scintilla_command (const QWidget *ID, unsigned int sci_msg) |
1b289f45187f
add some qscintilla actions to the menu and to the shortcut manager
Torsten <ttl@justmail.de>
parents:
18560
diff
changeset
|
1081 { |
1b289f45187f
add some qscintilla actions to the menu and to the shortcut manager
Torsten <ttl@justmail.de>
parents:
18560
diff
changeset
|
1082 if (ID != this) |
1b289f45187f
add some qscintilla actions to the menu and to the shortcut manager
Torsten <ttl@justmail.de>
parents:
18560
diff
changeset
|
1083 return; |
1b289f45187f
add some qscintilla actions to the menu and to the shortcut manager
Torsten <ttl@justmail.de>
parents:
18560
diff
changeset
|
1084 |
1b289f45187f
add some qscintilla actions to the menu and to the shortcut manager
Torsten <ttl@justmail.de>
parents:
18560
diff
changeset
|
1085 _edit_area->SendScintilla (sci_msg); |
1b289f45187f
add some qscintilla actions to the menu and to the shortcut manager
Torsten <ttl@justmail.de>
parents:
18560
diff
changeset
|
1086 } |
1b289f45187f
add some qscintilla actions to the menu and to the shortcut manager
Torsten <ttl@justmail.de>
parents:
18560
diff
changeset
|
1087 |
1b289f45187f
add some qscintilla actions to the menu and to the shortcut manager
Torsten <ttl@justmail.de>
parents:
18560
diff
changeset
|
1088 void |
16558 | 1089 file_editor_tab::comment_selected_text (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1090 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1091 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1092 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1093 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1094 do_comment_selected_text (true); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1095 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1096 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1097 void |
16558 | 1098 file_editor_tab::uncomment_selected_text (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1099 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1100 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1101 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1102 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1103 do_comment_selected_text (false); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1104 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1105 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1106 void |
18303
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1107 file_editor_tab::indent_selected_text (const QWidget *ID) |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1108 { |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1109 if (ID != this) |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1110 return; |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1111 |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1112 do_indent_selected_text (true); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1113 } |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1114 |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1115 void |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1116 file_editor_tab::unindent_selected_text (const QWidget *ID) |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1117 { |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1118 if (ID != this) |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1119 return; |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1120 |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1121 do_indent_selected_text (false); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1122 } |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1123 |
19247
9582fad68730
add actions for converting the eol characters of the editor file
Torsten <ttl@justmail.de>
parents:
19245
diff
changeset
|
1124 void |
9582fad68730
add actions for converting the eol characters of the editor file
Torsten <ttl@justmail.de>
parents:
19245
diff
changeset
|
1125 file_editor_tab::convert_eol (const QWidget *ID, QsciScintilla::EolMode eol_mode) |
9582fad68730
add actions for converting the eol characters of the editor file
Torsten <ttl@justmail.de>
parents:
19245
diff
changeset
|
1126 { |
9582fad68730
add actions for converting the eol characters of the editor file
Torsten <ttl@justmail.de>
parents:
19245
diff
changeset
|
1127 if (ID != this) |
9582fad68730
add actions for converting the eol characters of the editor file
Torsten <ttl@justmail.de>
parents:
19245
diff
changeset
|
1128 return; |
9582fad68730
add actions for converting the eol characters of the editor file
Torsten <ttl@justmail.de>
parents:
19245
diff
changeset
|
1129 |
9582fad68730
add actions for converting the eol characters of the editor file
Torsten <ttl@justmail.de>
parents:
19245
diff
changeset
|
1130 _edit_area->convertEols (eol_mode); |
9582fad68730
add actions for converting the eol characters of the editor file
Torsten <ttl@justmail.de>
parents:
19245
diff
changeset
|
1131 _edit_area->setEolMode (eol_mode); |
9582fad68730
add actions for converting the eol characters of the editor file
Torsten <ttl@justmail.de>
parents:
19245
diff
changeset
|
1132 update_eol_indicator (); |
9582fad68730
add actions for converting the eol characters of the editor file
Torsten <ttl@justmail.de>
parents:
19245
diff
changeset
|
1133 } |
18303
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1134 |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1135 void |
18560
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1136 file_editor_tab::zoom_in (const QWidget *ID) |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1137 { |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1138 if (ID != this) |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1139 return; |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1140 |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1141 _edit_area->zoomIn (1); |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1142 auto_margin_width (); |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1143 } |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1144 |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1145 void |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1146 file_editor_tab::zoom_out (const QWidget *ID) |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1147 { |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1148 if (ID != this) |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1149 return; |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1150 |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1151 _edit_area->zoomOut (1); |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1152 auto_margin_width (); |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1153 } |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1154 |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1155 void |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1156 file_editor_tab::zoom_normal (const QWidget *ID) |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1157 { |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1158 if (ID != this) |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1159 return; |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1160 |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1161 _edit_area->zoomTo (0); |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1162 auto_margin_width (); |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1163 } |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1164 |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1165 |
26d15a57f45b
add menu entries and shortcuts for zoom functions in the editor (bug #41516)
Torsten <ttl@justmail.de>
parents:
18555
diff
changeset
|
1166 void |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1167 file_editor_tab::handle_find_dialog_finished (int) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1168 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1169 // Find dialog is going to hide. Save location of window for |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1170 // when it is reshown. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1171 _find_dialog_geometry = _find_dialog->geometry (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1172 _find_dialog_is_visible = false; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1173 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1174 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1175 void |
16558 | 1176 file_editor_tab::find (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1177 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1178 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1179 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1180 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1181 // The find_dialog feature doesn't need a slot for return info. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1182 // Rather than Qt::DeleteOnClose, let the find feature hang about |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1183 // in case it contains useful information like previous searches |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1184 // and so on. Perhaps one find dialog for the whole editor is |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1185 // better, but individual find dialogs has the nice feature of |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1186 // retaining position per file editor tabs, which can be undocked. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1187 |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20814
diff
changeset
|
1188 if (! _find_dialog) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1189 { |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1190 _find_dialog = new find_dialog (_edit_area, |
16558 | 1191 qobject_cast<QWidget *> (sender ())); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1192 connect (_find_dialog, SIGNAL (finished (int)), |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1193 this, SLOT (handle_find_dialog_finished (int))); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1194 _find_dialog->setWindowModality (Qt::NonModal); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1195 _find_dialog_geometry = _find_dialog->geometry (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1196 } |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20814
diff
changeset
|
1197 else if (! _find_dialog->isVisible ()) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1198 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1199 _find_dialog->setGeometry (_find_dialog_geometry); |
19441
521d4959fc42
fix positioning issues of editor find dialog (bug #43174)
Torsten <ttl@justmail.de>
parents:
19430
diff
changeset
|
1200 QPoint p = _find_dialog->pos (); |
521d4959fc42
fix positioning issues of editor find dialog (bug #43174)
Torsten <ttl@justmail.de>
parents:
19430
diff
changeset
|
1201 _find_dialog->move(p.x ()+10, p.y ()+10); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1202 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1203 |
19441
521d4959fc42
fix positioning issues of editor find dialog (bug #43174)
Torsten <ttl@justmail.de>
parents:
19430
diff
changeset
|
1204 _find_dialog->show (); |
521d4959fc42
fix positioning issues of editor find dialog (bug #43174)
Torsten <ttl@justmail.de>
parents:
19430
diff
changeset
|
1205 _find_dialog_is_visible = true; |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1206 _find_dialog->activateWindow (); |
15988
38348a6c3db0
gui: initialize search text in the find dialog with selected text in editor file
Torsten <ttl@justmail.de>
parents:
15984
diff
changeset
|
1207 _find_dialog->init_search_text (); |
38348a6c3db0
gui: initialize search text in the find dialog with selected text in editor file
Torsten <ttl@justmail.de>
parents:
15984
diff
changeset
|
1208 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1209 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1210 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1211 void |
16558 | 1212 file_editor_tab::goto_line (const QWidget *ID, int line) |
16375
f482302d81c9
editor goto line menu item (bug #38590)
John Donoghue <john.donoghue@ieee.org>
parents:
16018
diff
changeset
|
1213 { |
f482302d81c9
editor goto line menu item (bug #38590)
John Donoghue <john.donoghue@ieee.org>
parents:
16018
diff
changeset
|
1214 if (ID != this) |
f482302d81c9
editor goto line menu item (bug #38590)
John Donoghue <john.donoghue@ieee.org>
parents:
16018
diff
changeset
|
1215 return; |
f482302d81c9
editor goto line menu item (bug #38590)
John Donoghue <john.donoghue@ieee.org>
parents:
16018
diff
changeset
|
1216 |
16389
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
1217 if (line <= 0) // ask for desired line |
16377
8430ea8c1594
open editor tab and insert marker for debugging with gui
John W. Eaton <jwe@octave.org>
parents:
16375
diff
changeset
|
1218 { |
16389
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
1219 bool ok = false; |
16377
8430ea8c1594
open editor tab and insert marker for debugging with gui
John W. Eaton <jwe@octave.org>
parents:
16375
diff
changeset
|
1220 int index; |
16558 | 1221 _edit_area->getCursorPosition (&line, &index); |
1222 line = QInputDialog::getInt (_edit_area, tr ("Goto line"), | |
1223 tr ("Line number"), line+1, 1, | |
1224 _edit_area->lines (), 1, &ok); | |
16389
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
1225 if (ok) |
20995
aab7a3c7168e
edit a file from an error message in the terminal (bug #35619)
Torsten <ttl@justmail.de>
parents:
20993
diff
changeset
|
1226 _edit_area->setCursorPosition (line-1, 0); |
16377
8430ea8c1594
open editor tab and insert marker for debugging with gui
John W. Eaton <jwe@octave.org>
parents:
16375
diff
changeset
|
1227 } |
16389
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
1228 else // go to given line without dialog |
16558 | 1229 _edit_area->setCursorPosition (line-1, 0); |
20995
aab7a3c7168e
edit a file from an error message in the terminal (bug #35619)
Torsten <ttl@justmail.de>
parents:
20993
diff
changeset
|
1230 |
21044
e2fdbdd00ef9
center line when setting a breakpoint only if line is at top or at bottom
Torsten <ttl@justmail.de>
parents:
21020
diff
changeset
|
1231 center_current_line (false); // only center line if at top or bottom |
16375
f482302d81c9
editor goto line menu item (bug #38590)
John Donoghue <john.donoghue@ieee.org>
parents:
16018
diff
changeset
|
1232 } |
f482302d81c9
editor goto line menu item (bug #38590)
John Donoghue <john.donoghue@ieee.org>
parents:
16018
diff
changeset
|
1233 |
18303
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1234 void |
19629
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1235 file_editor_tab::move_match_brace (const QWidget *ID, bool select) |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1236 { |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1237 if (ID != this) |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1238 return; |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1239 |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1240 if (select) |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1241 _edit_area->selectToMatchingBrace (); |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1242 else |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1243 _edit_area->moveToMatchingBrace (); |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1244 } |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1245 |
8ef79bc61d8a
add actions for moving/selecting to matching brace
Torsten <ttl@justmail.de>
parents:
19608
diff
changeset
|
1246 void |
18482
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1247 file_editor_tab::show_auto_completion (const QWidget *ID) |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1248 { |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1249 if (ID != this) |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1250 return; |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1251 |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1252 QsciScintilla::AutoCompletionSource s = _edit_area->autoCompletionSource (); |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1253 switch (s) |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1254 { |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1255 case QsciScintilla::AcsAll: |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1256 _edit_area->autoCompleteFromAll (); |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1257 break; |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1258 |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1259 case QsciScintilla::AcsAPIs: |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1260 _edit_area->autoCompleteFromAPIs (); |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1261 break; |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1262 |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1263 case QsciScintilla::AcsDocument: |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1264 _edit_area->autoCompleteFromDocument (); |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1265 break; |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1266 |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1267 case QsciScintilla::AcsNone: |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1268 break; |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1269 } |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1270 } |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1271 |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
1272 void |
18303
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1273 file_editor_tab::do_indent_selected_text (bool indent) |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1274 { |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1275 // TODO |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1276 _edit_area->beginUndoAction (); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1277 |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1278 if (_edit_area->hasSelectedText ()) |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1279 { |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1280 int lineFrom, lineTo, colFrom, colTo; |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1281 _edit_area->getSelection (&lineFrom, &colFrom, &lineTo, &colTo); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1282 |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1283 if (colTo == 0) // the beginning of last line is not selected |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1284 lineTo--; // stop at line above |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1285 |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1286 for (int i = lineFrom; i <= lineTo; i++) |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1287 { |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1288 if (indent) |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1289 _edit_area->indent (i); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1290 else |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1291 _edit_area->unindent (i); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1292 } |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1293 //set selection on (un)indented section |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1294 _edit_area->setSelection (lineFrom, 0, lineTo, |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1295 _edit_area->text (lineTo).length ()); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1296 } |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1297 else |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1298 { |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1299 int cpline, col; |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1300 _edit_area->getCursorPosition (&cpline, &col); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1301 if (indent) |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1302 _edit_area->indent (cpline); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1303 else |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1304 _edit_area->unindent (cpline); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1305 } |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1306 |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1307 _edit_area->endUndoAction (); |
106da7544504
gui: Add indent/unindent edit menu to editor (Bug #41223)
John Donoghue <john.donoghue@ieee.org>
parents:
18299
diff
changeset
|
1308 } |
16375
f482302d81c9
editor goto line menu item (bug #38590)
John Donoghue <john.donoghue@ieee.org>
parents:
16018
diff
changeset
|
1309 |
f482302d81c9
editor goto line menu item (bug #38590)
John Donoghue <john.donoghue@ieee.org>
parents:
16018
diff
changeset
|
1310 void |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1311 file_editor_tab::do_comment_selected_text (bool comment) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1312 { |
16737
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1313 QString comment_str = comment_string (_edit_area->lexer ()->lexer ()); |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1314 _edit_area->beginUndoAction (); |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1315 |
16558 | 1316 if (_edit_area->hasSelectedText ()) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1317 { |
16558 | 1318 int lineFrom, lineTo, colFrom, colTo; |
1319 _edit_area->getSelection (&lineFrom, &colFrom, &lineTo, &colTo); | |
1320 | |
1321 if (colTo == 0) // the beginning of last line is not selected | |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1322 lineTo--; // stop at line above |
16558 | 1323 |
1324 for (int i = lineFrom; i <= lineTo; i++) | |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1325 { |
16558 | 1326 if (comment) |
16719
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
1327 _edit_area->insertAt (comment_str, i, 0); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1328 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1329 { |
16558 | 1330 QString line (_edit_area->text (i)); |
16719
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
1331 if (line.startsWith (comment_str)) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1332 { |
16719
0f6f14e3ac6a
commenting selected lines in the editor uses comment string depending on lexer
Torsten <ttl@justmail.de>
parents:
16717
diff
changeset
|
1333 _edit_area->setSelection (i, 0, i, comment_str.length ()); |
16558 | 1334 _edit_area->removeSelectedText (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1335 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1336 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1337 } |
16737
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1338 //set selection on (un)commented section |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1339 _edit_area->setSelection (lineFrom, 0, lineTo, |
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1340 _edit_area->text (lineTo).length ()); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1341 } |
16737
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1342 else |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1343 { |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1344 int cpline, col; |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1345 _edit_area->getCursorPosition (&cpline, &col); |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1346 if (comment) |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1347 _edit_area->insertAt (comment_str, cpline, 0); |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1348 else |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1349 { |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1350 QString line (_edit_area->text (cpline)); |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1351 if (line.startsWith (comment_str)) |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1352 { |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1353 _edit_area->setSelection (cpline, 0, cpline, comment_str.length ()); |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1354 _edit_area->removeSelectedText (); |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1355 } |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1356 } |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1357 } |
e81084a745a9
GUI: change (un)comment handling of selection, allow (un)comment of current line
Thorsten Liebig <thorsten.liebig@gmx.de>
parents:
16731
diff
changeset
|
1358 _edit_area->endUndoAction (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1359 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1360 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1361 void |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1362 file_editor_tab::update_window_title (bool modified) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1363 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1364 QString title (""); |
15984
1eb3c67139f6
Add full-length-name tool tip to editor file tab when name is not full length.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15982
diff
changeset
|
1365 QString tooltip (""); |
16558 | 1366 |
17979
a761ba02a52f
some code cleanup in file_editor_tab
Torsten <ttl@justmail.de>
parents:
17973
diff
changeset
|
1367 if (! valid_file_name ()) |
16558 | 1368 title = tr ("<unnamed>"); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1369 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1370 { |
16558 | 1371 if (_long_title) |
15981
e3873531dd7c
gui: correct tab title for new editor file if short title setting is selected
Torsten <ttl@justmail.de>
parents:
15980
diff
changeset
|
1372 title = _file_name; |
e3873531dd7c
gui: correct tab title for new editor file if short title setting is selected
Torsten <ttl@justmail.de>
parents:
15980
diff
changeset
|
1373 else |
e3873531dd7c
gui: correct tab title for new editor file if short title setting is selected
Torsten <ttl@justmail.de>
parents:
15980
diff
changeset
|
1374 { |
16558 | 1375 QFileInfo file (_file_name); |
1376 title = file.fileName (); | |
15984
1eb3c67139f6
Add full-length-name tool tip to editor file tab when name is not full length.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15982
diff
changeset
|
1377 tooltip = _file_name; |
15981
e3873531dd7c
gui: correct tab title for new editor file if short title setting is selected
Torsten <ttl@justmail.de>
parents:
15980
diff
changeset
|
1378 } |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1379 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1380 |
16558 | 1381 if (modified) |
1382 emit file_name_changed (title.prepend ("* "), tooltip); | |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1383 else |
15984
1eb3c67139f6
Add full-length-name tool tip to editor file tab when name is not full length.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15982
diff
changeset
|
1384 emit file_name_changed (title, tooltip); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1385 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1386 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1387 void |
16558 | 1388 file_editor_tab::handle_copy_available (bool enableCopy) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1389 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1390 _copy_available = enableCopy; |
19803
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
1391 emit editor_state_changed (_copy_available, _is_octave_file); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1392 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1393 |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1394 // show_dialog: shows a modal or non modal dialog depending on input arg |
17973
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1395 void |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1396 file_editor_tab::show_dialog (QDialog *dlg, bool modal) |
17973
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1397 { |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1398 dlg->setAttribute (Qt::WA_DeleteOnClose); |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1399 if (modal) |
17973
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1400 dlg->exec (); |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1401 else |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1402 { |
19804
dfa608a9c36e
fix issue when saving a new modified file while closing
Torsten <ttl@justmail.de>
parents:
19803
diff
changeset
|
1403 dlg->setWindowModality (Qt::NonModal); |
17973
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1404 dlg->show (); |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1405 } |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1406 } |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1407 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1408 int |
16018
e0df71fbe39b
gui: clearer message box with cancel button when closing an unsaved editor file
Torsten <ttl@justmail.de>
parents:
16017
diff
changeset
|
1409 file_editor_tab::check_file_modified () |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1410 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1411 int decision = QMessageBox::Yes; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1412 if (_edit_area->isModified ()) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1413 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1414 // File is modified but not saved, ask user what to do. The file |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1415 // editor tab can't be made parent because it may be deleted depending |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1416 // upon the response. Instead, change the _edit_area to read only. |
16638
3c2e457eeb72
ask for saving modified editor files if octave is closed (bug #38689)
Torsten <ttl@justmail.de>
parents:
16635
diff
changeset
|
1417 QMessageBox::StandardButtons buttons = QMessageBox::Save | |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1418 QMessageBox::Discard | |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1419 QMessageBox::Cancel; |
19411
ed0df431631b
allow to cancel exiting if editor tabs are modified and exit is requested in gui
Torsten <ttl@justmail.de>
parents:
19348
diff
changeset
|
1420 |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1421 // For now, just a warning message about closing a tab that has been |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1422 // modified seems sufficient. Exit-condition-specific messages could |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1423 // be achieved by making 'available_actions' a function input string. |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1424 QString available_actions = |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1425 tr ("Do you want to cancel closing, save or discard the changes?"); |
16638
3c2e457eeb72
ask for saving modified editor files if octave is closed (bug #38689)
Torsten <ttl@justmail.de>
parents:
16635
diff
changeset
|
1426 |
17973
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1427 QString file; |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1428 if (valid_file_name ()) |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1429 file = _file_name; |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1430 else |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1431 file = tr ("<unnamed>"); |
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1432 |
16558 | 1433 QMessageBox* msgBox |
1434 = new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"), | |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1435 tr ("The file\n\n" |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1436 " %1\n\n" |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1437 "is about to be closed but has been modified. " |
16638
3c2e457eeb72
ask for saving modified editor files if octave is closed (bug #38689)
Torsten <ttl@justmail.de>
parents:
16635
diff
changeset
|
1438 "%2"). |
17973
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1439 arg (file). arg (available_actions), |
16638
3c2e457eeb72
ask for saving modified editor files if octave is closed (bug #38689)
Torsten <ttl@justmail.de>
parents:
16635
diff
changeset
|
1440 buttons, qobject_cast<QWidget *> (parent ())); |
16558 | 1441 |
16018
e0df71fbe39b
gui: clearer message box with cancel button when closing an unsaved editor file
Torsten <ttl@justmail.de>
parents:
16017
diff
changeset
|
1442 msgBox->setDefaultButton (QMessageBox::Save); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1443 _edit_area->setReadOnly (true); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1444 connect (msgBox, SIGNAL (finished (int)), |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1445 this, SLOT (handle_file_modified_answer (int))); |
17973
6925dca34807
fix saving unnamed editor files when closing octave (bug #40637)
Torsten <ttl@justmail.de>
parents:
17962
diff
changeset
|
1446 |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1447 show_dialog (msgBox, true); |
16558 | 1448 |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1449 if (_cancelled) |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1450 return QMessageBox::Cancel; |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1451 else |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1452 return decision; |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1453 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1454 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1455 { |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1456 // Nothing was modified. Leave tab present in case user |
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1457 // decides to cancel some point further along. |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1458 } |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1459 |
16558 | 1460 return decision; |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1461 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1462 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1463 void |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1464 file_editor_tab::handle_file_modified_answer (int decision) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1465 { |
16018
e0df71fbe39b
gui: clearer message box with cancel button when closing an unsaved editor file
Torsten <ttl@justmail.de>
parents:
16017
diff
changeset
|
1466 if (decision == QMessageBox::Save) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1467 { |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1468 // Save file, but do not remove from editor. |
21054
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1469 save_file (_file_name, false, false); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1470 } |
16018
e0df71fbe39b
gui: clearer message box with cancel button when closing an unsaved editor file
Torsten <ttl@justmail.de>
parents:
16017
diff
changeset
|
1471 else if (decision == QMessageBox::Discard) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1472 { |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1473 // User doesn't want to save, leave tab and remove subsequently. |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1474 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1475 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1476 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1477 // User canceled, allow editing again. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1478 _edit_area->setReadOnly (false); |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1479 _cancelled = true; |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1480 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1481 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1482 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1483 void |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1484 file_editor_tab::set_modified (bool modified) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1485 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1486 _edit_area->setModified (modified); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1487 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1488 |
21054
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1489 void |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1490 file_editor_tab::recover_from_exit () |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1491 { |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1492 // reset the possibly still existing read only state |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1493 _edit_area->setReadOnly (false); |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1494 |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1495 // if we are in this slot and the list of breakpoint is not empty, |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1496 // then this tab was saved during an exit of the applications (not |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1497 // restoring the breakpoints and not emptying the list) and the user |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1498 // canceled this closing late on. |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1499 check_restore_breakpoints (); |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1500 } |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1501 |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1502 void |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1503 file_editor_tab::check_restore_breakpoints () |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1504 { |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1505 if (! _bp_lines.isEmpty ()) |
21054
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1506 { |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1507 // At least one breakpoint is present. |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1508 // Get rid of breakpoints at old (now possibly invalid) linenumbers |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1509 remove_all_breakpoints (this); |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1510 |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1511 // and set breakpoints at the new linenumbers |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1512 for (int i = 0; i < _bp_lines.length (); i++) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1513 handle_request_add_breakpoint (_bp_lines.value (i) + 1, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1514 _bp_conditions.value (i)); |
21054
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1515 |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1516 // reset the list of breakpoints |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1517 _bp_lines.clear (); |
21054
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1518 } |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1519 } |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1520 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1521 QString |
16558 | 1522 file_editor_tab::load_file (const QString& fileName) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1523 { |
17706
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1524 // get the absolute path |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1525 QFileInfo file_info = QFileInfo (fileName); |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1526 QString file_to_load; |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1527 if (file_info.exists ()) |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1528 file_to_load = file_info.canonicalFilePath (); |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1529 else |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1530 file_to_load = fileName; |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1531 QFile file (file_to_load); |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20814
diff
changeset
|
1532 if (! file.open (QFile::ReadOnly)) |
16558 | 1533 return file.errorString (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1534 |
20731
83611b387bc5
provide a user preference for the encoding used by the editor (bug #45597)
Torsten <ttl@justmail.de>
parents:
20713
diff
changeset
|
1535 // read the file |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1536 QTextStream in (&file); |
20731
83611b387bc5
provide a user preference for the encoding used by the editor (bug #45597)
Torsten <ttl@justmail.de>
parents:
20713
diff
changeset
|
1537 // set the desired codec |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1538 QTextCodec *codec = QTextCodec::codecForName (_encoding.toAscii ()); |
20731
83611b387bc5
provide a user preference for the encoding used by the editor (bug #45597)
Torsten <ttl@justmail.de>
parents:
20713
diff
changeset
|
1539 in.setCodec(codec); |
83611b387bc5
provide a user preference for the encoding used by the editor (bug #45597)
Torsten <ttl@justmail.de>
parents:
20713
diff
changeset
|
1540 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1541 QApplication::setOverrideCursor (Qt::WaitCursor); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1542 _edit_area->setText (in.readAll ()); |
19237
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1543 _edit_area->setEolMode (detect_eol_mode ()); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1544 QApplication::restoreOverrideCursor (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1545 |
17636
230ffaf80ac9
fix enabling copy, cut and run selection actions depending on selected text
Torsten <ttl@justmail.de>
parents:
17635
diff
changeset
|
1546 _copy_available = false; // no selection yet available |
17706
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1547 set_file_name (file_to_load); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1548 update_window_title (false); // window title (no modification) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1549 _edit_area->setModified (false); // loaded file is not modified yet |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1550 |
19237
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1551 update_eol_indicator (); |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1552 |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1553 // TODO: (BREAKPOINTS) At this point it would be nice to put any set |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1554 // breakpoints on the margin. In order to do this, somehow the |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1555 // "dbstatus" command needs to be accessed. All it would require is a |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1556 // routine that does "res = feval("dbstatus") and signals that result |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1557 // to some slot. |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1558 // |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1559 // See patch #8016 for a general way to get Octave results from |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1560 // commands processed in the background. |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1561 |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1562 /* |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1563 connect (octave_link, SIGNAL (fileSelected (QObject *, const QString&, const octave_value_list&)), |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1564 this, SLOT (handle_feval_result (QObject *, const QString&, const octave_value_list&))); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1565 connect (this, SIGNAL (evaluate_octave_command (const QString&)), |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1566 octave_link, SLOT (queue_octave_command (const QString&))); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1567 |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1568 emit evaluate_octave_command ("dbstatus"); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1569 */ |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1570 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1571 return QString (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1572 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1573 |
19237
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1574 QsciScintilla::EolMode |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1575 file_editor_tab::detect_eol_mode () |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1576 { |
19768
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1577 QByteArray text = _edit_area->text ().toAscii (); |
19237
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1578 |
19768
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1579 QByteArray eol_lf = QByteArray (1,0x0a); |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1580 QByteArray eol_cr = QByteArray (1,0x0d); |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1581 QByteArray eol_crlf = eol_cr; |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1582 eol_crlf.append (eol_lf); |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1583 |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1584 int count_crlf = text.count (eol_crlf); |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1585 int count_lf = text.count (eol_lf) - count_crlf; // isolated lf |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1586 int count_cr = text.count (eol_cr) - count_crlf; // isolated cr; |
19237
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1587 |
19248
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1588 // get default from OS or from settings |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1589 #if defined (Q_OS_WIN32) |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1590 int os_eol_mode = QsciScintilla::EolWindows; |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1591 #elif defined (Q_OS_MAC) |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1592 int os_eol_mode = QsciScintilla::EolMac; |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1593 #else |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1594 int os_eol_mode = QsciScintilla::EolUnix; |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1595 #endif |
19768
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1596 QSettings *settings = resource_manager::get_settings (); |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1597 QsciScintilla::EolMode eol_mode = static_cast<QsciScintilla::EolMode> ( |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1598 settings->value("editor/default_eol_mode",os_eol_mode).toInt ()); |
19237
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1599 |
19248
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1600 int count_max = 0; |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1601 |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1602 if (count_crlf > count_max) |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1603 { |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1604 eol_mode = QsciScintilla::EolWindows; |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1605 count_max = count_crlf; |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1606 } |
19768
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1607 if (count_lf > count_max) |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1608 { |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1609 eol_mode = QsciScintilla::EolUnix; |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1610 count_max = count_lf; |
95a94c98c884
fix eol detection in editor which caused a crash for huge files
Torsten <ttl@justmail.de>
parents:
19714
diff
changeset
|
1611 } |
19237
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1612 if (count_cr > count_max) |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1613 { |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1614 eol_mode = QsciScintilla::EolMac; |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1615 count_max = count_cr; |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1616 } |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1617 |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1618 return eol_mode; |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1619 } |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1620 |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1621 void |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1622 file_editor_tab::update_eol_indicator () |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1623 { |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1624 switch (_edit_area->eolMode ()) |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1625 { |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1626 case QsciScintilla::EolWindows: |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1627 _eol_indicator->setText ("CRLF"); |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1628 break; |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1629 case QsciScintilla::EolMac: |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1630 _eol_indicator->setText ("CR"); |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1631 break; |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1632 case QsciScintilla::EolUnix: |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1633 _eol_indicator->setText ("LF"); |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1634 break; |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1635 } |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1636 } |
c766a1f63c40
detect eol mode when opening a file in the editor of the gui (#bug 43334)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1637 |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1638 // TODO: See patch #8016 for a general way to get Octave results from |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1639 // commands processed in the background, e.g., dbstatus. |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1640 void |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1641 file_editor_tab::handle_octave_result (QObject *requester, QString& command, |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1642 octave_value_list&) |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1643 { |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1644 // Check if this object initiated the command. |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1645 if (requester == this) |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1646 { |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1647 if (command == "dbstatus") |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1648 { |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1649 // Should be installing breakpoints in this file |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1650 /* |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1651 octave:1> result = dbstatus |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1652 result = |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1653 |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1654 0x1 struct array containing the fields: |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1655 |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1656 name |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1657 file |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1658 line |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1659 */ |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1660 // Check for results that match "file". |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1661 } |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1662 } |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1663 } |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1664 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1665 void |
16452
744ff2fe11ce
add create script context menu to history window
John Donoghue <john.donoghue@ieee.org>
parents:
16443
diff
changeset
|
1666 file_editor_tab::new_file (const QString &commands) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1667 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1668 update_window_title (false); // window title (no modification) |
19245
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1669 |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1670 QSettings *settings = resource_manager::get_settings (); |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1671 |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1672 // set the eol mode from the settings or depending on the OS if the entry is |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1673 // missing in the settings |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1674 #if defined (Q_OS_WIN32) |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1675 int eol_mode = QsciScintilla::EolWindows; |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1676 #elif defined (Q_OS_MAC) |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1677 int eol_mode = QsciScintilla::EolMac; |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1678 #else |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1679 int eol_mode = QsciScintilla::EolUnix; |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1680 #endif |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1681 _edit_area->setEolMode ( |
19248
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1682 static_cast<QsciScintilla::EolMode> ( |
54943eb0ce37
reorder eol modes in the editor settings
Torsten <ttl@justmail.de>
parents:
19247
diff
changeset
|
1683 settings->value("editor/default_eol_mode",eol_mode).toInt ())); |
19245
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1684 |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1685 update_eol_indicator (); |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
1686 |
19770
35a8e1beac8d
fix some oddities updating lexer and api-files for auto completion
Torsten <ttl@justmail.de>
parents:
19768
diff
changeset
|
1687 update_lexer (); |
35a8e1beac8d
fix some oddities updating lexer and api-files for auto completion
Torsten <ttl@justmail.de>
parents:
19768
diff
changeset
|
1688 |
16452
744ff2fe11ce
add create script context menu to history window
John Donoghue <john.donoghue@ieee.org>
parents:
16443
diff
changeset
|
1689 _edit_area->setText (commands); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1690 _edit_area->setModified (false); // new file is not modified yet |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1691 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1692 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1693 void |
21054
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1694 file_editor_tab::save_file (const QString& saveFileName, |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1695 bool remove_on_success, bool restore_breakpoints) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1696 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1697 // If it is a new file with no name, signal that saveFileAs |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1698 // should be performed. |
17979
a761ba02a52f
some code cleanup in file_editor_tab
Torsten <ttl@justmail.de>
parents:
17973
diff
changeset
|
1699 if (! valid_file_name (saveFileName)) |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
1700 { |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1701 save_file_as (remove_on_success); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1702 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1703 } |
17706
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1704 // get the absolute path (if existing) |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1705 QFileInfo file_info = QFileInfo (saveFileName); |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1706 QString file_to_save; |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1707 if (file_info.exists ()) |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1708 file_to_save = file_info.canonicalFilePath (); |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1709 else |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1710 file_to_save = saveFileName; |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1711 QFile file (file_to_save); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1712 |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1713 // Get a list of all the breakpoint line numbers. |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
1714 emit report_marker_linenr (_bp_lines, _bp_conditions); |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1715 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1716 // stop watching file |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1717 QStringList trackedFiles = _file_system_watcher.files (); |
17706
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1718 if (trackedFiles.contains (file_to_save)) |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1719 _file_system_watcher.removePath (file_to_save); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1720 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1721 // open the file for writing |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20814
diff
changeset
|
1722 if (! file.open (QIODevice::WriteOnly)) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1723 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1724 // Unsuccessful, begin watching file again if it was being |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1725 // watched previously. |
17706
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1726 if (trackedFiles.contains (file_to_save)) |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1727 _file_system_watcher.addPath (file_to_save); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1728 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1729 // Create a NonModal message about error. |
16558 | 1730 QMessageBox* msgBox |
1731 = new QMessageBox (QMessageBox::Critical, | |
1732 tr ("Octave Editor"), | |
1733 tr ("Could not open file %1 for write:\n%2."). | |
17706
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1734 arg (file_to_save).arg (file.errorString ()), |
16558 | 1735 QMessageBox::Ok, 0); |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
1736 show_dialog (msgBox, false); |
16558 | 1737 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1738 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1739 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1740 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1741 // save the contents into the file |
20783
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1742 |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1743 _encoding = _new_encoding; // consider a possible new encoding |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1744 |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1745 // set the desired codec (if suitable for contents) |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1746 QTextCodec *codec = QTextCodec::codecForName (_encoding.toAscii ()); |
20731
83611b387bc5
provide a user preference for the encoding used by the editor (bug #45597)
Torsten <ttl@justmail.de>
parents:
20713
diff
changeset
|
1747 |
20783
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1748 if (check_valid_codec (codec)) |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1749 { |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1750 save_file_as (remove_on_success); |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1751 return; |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1752 } |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1753 |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1754 // write the file |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1755 QTextStream out (&file); |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1756 out.setCodec (codec); |
20731
83611b387bc5
provide a user preference for the encoding used by the editor (bug #45597)
Torsten <ttl@justmail.de>
parents:
20713
diff
changeset
|
1757 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1758 QApplication::setOverrideCursor (Qt::WaitCursor); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1759 out << _edit_area->text (); |
17706
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1760 out.flush (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1761 QApplication::restoreOverrideCursor (); |
17706
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1762 file.flush (); |
16558 | 1763 file.close (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1764 |
17706
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1765 // file exists now |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1766 file_info = QFileInfo (file); |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1767 file_to_save = file_info.canonicalFilePath (); |
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1768 |
20713
2469d78a1d8b
Consistently use 'filename' rather than 'file name' throughout code base.
Rik <rik@octave.org>
parents:
20677
diff
changeset
|
1769 // save filename after closing file as set_file_name starts watching again |
17706
97ed9dd479ab
make sure all entries in the editor's mru-menu have an absolute path
Torsten <ttl@justmail.de>
parents:
17699
diff
changeset
|
1770 set_file_name (file_to_save); // make absolute |
16558 | 1771 |
20713
2469d78a1d8b
Consistently use 'filename' rather than 'file name' throughout code base.
Rik <rik@octave.org>
parents:
20677
diff
changeset
|
1772 // set the window title to actual filename (not modified) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1773 update_window_title (false); |
16558 | 1774 |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1775 // files is save -> not modified, update encoding in statusbar |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1776 _edit_area->setModified (false); |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1777 _enc_indicator->setText (_encoding); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1778 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1779 if (remove_on_success) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1780 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1781 emit tab_remove_request (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1782 return; // Don't touch member variables after removal |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1783 } |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1784 |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
1785 // Attempt to restore the breakpoints if that is desired. |
21054
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1786 // This is only allowed if the tab is not closing since changing |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1787 // breakpoints would reopen the tab in this case. |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1788 if (restore_breakpoints) |
221847e5f488
fix issues when restoring breakpoints and closing tabs or whole application
Torsten <ttl@justmail.de>
parents:
21052
diff
changeset
|
1789 check_restore_breakpoints (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1790 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1791 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1792 void |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1793 file_editor_tab::save_file_as (bool remove_on_success) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1794 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1795 // Simply put up the file chooser dialog box with a slot connection |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1796 // then return control to the system waiting for a file selection. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1797 |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1798 // reset _new_encoding |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1799 _new_encoding = _encoding; |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1800 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1801 // If the tab is removed in response to a QFileDialog signal, the tab |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1802 // can't be a parent. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1803 QFileDialog* fileDialog; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1804 if (remove_on_success) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1805 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1806 // If tab is closed, "this" cannot be parent in which case modality |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1807 // has no effect. Disable editing instead. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1808 _edit_area->setReadOnly (true); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1809 fileDialog = new QFileDialog (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1810 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1811 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1812 fileDialog = new QFileDialog (this); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1813 |
16912
6bd74153c3ae
no native dialogs to prevent hangs in KDE (patch #7948 by Andre da Costa Barros)
Torsten <ttl@justmail.de>
parents:
16757
diff
changeset
|
1814 // Giving trouble under KDE (problem is related to Qt signal handling on unix, |
6bd74153c3ae
no native dialogs to prevent hangs in KDE (patch #7948 by Andre da Costa Barros)
Torsten <ttl@justmail.de>
parents:
16757
diff
changeset
|
1815 // see https://bugs.kde.org/show_bug.cgi?id=260719 , |
6bd74153c3ae
no native dialogs to prevent hangs in KDE (patch #7948 by Andre da Costa Barros)
Torsten <ttl@justmail.de>
parents:
16757
diff
changeset
|
1816 // it had/has no effect on Windows, though) |
6bd74153c3ae
no native dialogs to prevent hangs in KDE (patch #7948 by Andre da Costa Barros)
Torsten <ttl@justmail.de>
parents:
16757
diff
changeset
|
1817 fileDialog->setOption(QFileDialog::DontUseNativeDialog, true); |
6bd74153c3ae
no native dialogs to prevent hangs in KDE (patch #7948 by Andre da Costa Barros)
Torsten <ttl@justmail.de>
parents:
16757
diff
changeset
|
1818 |
19249
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1819 // define a new grid layout with the extra elements |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1820 QGridLayout *extra = new QGridLayout (fileDialog); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1821 QFrame *separator = new QFrame (fileDialog); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1822 separator->setFrameShape (QFrame::HLine); // horizontal line as separator |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1823 separator->setFrameStyle (QFrame::Sunken); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1824 |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1825 // combo box for choosing new line ending chars |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1826 QLabel *label_eol = new QLabel (tr ("Line Endings:")); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1827 QComboBox *combo_eol = new QComboBox (); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1828 combo_eol->addItem ("Windows (CRLF)"); // ensure the same order as in |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1829 combo_eol->addItem ("Mac (CR)"); // the settings dialog |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1830 combo_eol->addItem ("Unix (LF)"); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1831 _save_as_desired_eol = _edit_area->eolMode (); // init with current eol |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1832 combo_eol->setCurrentIndex (_save_as_desired_eol); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1833 |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1834 // combo box for encoding |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1835 QLabel *label_enc = new QLabel (tr ("File Encoding:")); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1836 QComboBox *combo_enc = new QComboBox (); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1837 resource_manager::combo_encoding (combo_enc, _encoding); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1838 |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1839 // track changes in the combo boxes |
19249
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1840 connect (combo_eol, SIGNAL (currentIndexChanged (int)), |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1841 this, SLOT (handle_combo_eol_current_index (int))); |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1842 connect (combo_enc, SIGNAL (currentIndexChanged (QString)), |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1843 this, SLOT (handle_combo_enc_current_index (QString))); |
19249
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1844 |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1845 // build the extra grid layout |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1846 extra->addWidget (separator,0,0,1,6); |
19249
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1847 extra->addWidget (label_eol,1,0); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1848 extra->addWidget (combo_eol,1,1); |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1849 extra->addItem (new QSpacerItem (1,20,QSizePolicy::Fixed, |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1850 QSizePolicy::Fixed), 1,2); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1851 extra->addWidget (label_enc,1,3); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1852 extra->addWidget (combo_enc,1,4); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1853 extra->addItem (new QSpacerItem (1,20,QSizePolicy::Expanding, |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1854 QSizePolicy::Fixed), 1,5); |
19249
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1855 |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1856 // and add the extra grid layout to the dialog's layout |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1857 QGridLayout *dialog_layout = dynamic_cast<QGridLayout*> (fileDialog->layout ()); |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1858 dialog_layout->addLayout (extra,dialog_layout->rowCount (),0, |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1859 1,dialog_layout->columnCount ()); |
19249
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1860 |
19256
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1861 // add the possible filters and the default suffix |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1862 QStringList filters; |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1863 filters << tr ("Octave Files (*.m)") |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1864 << tr ("All Files (*)"); |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1865 fileDialog->setNameFilters (filters); |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1866 fileDialog->setDefaultSuffix ("m"); |
19249
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1867 |
17979
a761ba02a52f
some code cleanup in file_editor_tab
Torsten <ttl@justmail.de>
parents:
17973
diff
changeset
|
1868 if (valid_file_name ()) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1869 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1870 fileDialog->selectFile (_file_name); |
19256
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1871 QFileInfo file_info (_file_name); |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1872 if (file_info.suffix () != "m") |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1873 { // it is not an octave file |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1874 fileDialog->selectNameFilter (filters.at (1)); // "All Files" |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1875 fileDialog->setDefaultSuffix (""); // no default suffix |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1876 } |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1877 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1878 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1879 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1880 fileDialog->selectFile (""); |
19803
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
1881 fileDialog->setDirectory (_ced); |
18834
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
1882 |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
1883 // propose a name corresponding to the function name |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
1884 QString fname = get_function_name (); |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
1885 if (! fname.isEmpty ()) |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
1886 fileDialog->selectFile (fname + ".m"); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1887 } |
16558 | 1888 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1889 fileDialog->setAcceptMode (QFileDialog::AcceptSave); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1890 fileDialog->setViewMode (QFileDialog::Detail); |
16558 | 1891 |
19256
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1892 connect (fileDialog, SIGNAL (filterSelected (const QString&)), |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1893 this, SLOT (handle_save_as_filter_selected (const QString&))); |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1894 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1895 if (remove_on_success) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1896 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1897 connect (fileDialog, SIGNAL (fileSelected (const QString&)), |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1898 this, SLOT (handle_save_file_as_answer_close (const QString&))); |
16558 | 1899 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1900 connect (fileDialog, SIGNAL (rejected ()), |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1901 this, SLOT (handle_save_file_as_answer_cancel ())); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1902 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1903 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1904 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1905 connect (fileDialog, SIGNAL (fileSelected (const QString&)), |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1906 this, SLOT (handle_save_file_as_answer (const QString&))); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1907 } |
16558 | 1908 |
19804
dfa608a9c36e
fix issue when saving a new modified file while closing
Torsten <ttl@justmail.de>
parents:
19803
diff
changeset
|
1909 show_dialog (fileDialog, ! valid_file_name ()); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1910 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1911 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1912 void |
19249
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1913 file_editor_tab::handle_combo_eol_current_index (int index) |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1914 { |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1915 _save_as_desired_eol = static_cast<QsciScintilla::EolMode> (index); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1916 } |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1917 |
19256
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1918 void |
20774
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1919 file_editor_tab::handle_combo_enc_current_index (QString text) |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1920 { |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1921 _new_encoding = text; |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1922 } |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1923 |
5c5e085a1ae6
allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents:
20753
diff
changeset
|
1924 void |
19256
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1925 file_editor_tab::handle_save_as_filter_selected (const QString& filter) |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1926 { |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1927 QFileDialog *file_dialog = qobject_cast<QFileDialog *> (sender ()); |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1928 |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1929 QRegExp rx ("\\*\\.([^ ^\\)]*)[ \\)]"); // regexp for suffix in filter |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1930 int index = rx.indexIn (filter,0); // get first suffix in filter |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1931 |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1932 if (index > -1) |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1933 file_dialog->setDefaultSuffix (rx.cap (1)); // found a suffix, set default |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1934 else |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1935 file_dialog->setDefaultSuffix (""); // not found, clear default |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1936 } |
ce9bd5ed44d2
usage of default suffix depending on filter in save as dialog (bug #43335)
Torsten <ttl@justmail.de>
parents:
19249
diff
changeset
|
1937 |
18275
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1938 bool |
18318
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
1939 file_editor_tab::check_valid_identifier (QString file_name) |
18275
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1940 { |
18318
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
1941 QFileInfo file = QFileInfo (file_name); |
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
1942 QString base_name = file.baseName (); |
18275
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1943 |
18318
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
1944 if ((file.suffix () == "m") |
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
1945 && (! valid_identifier (base_name.toStdString ()))) |
18275
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1946 { |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1947 int ans = QMessageBox::question (0, tr ("Octave Editor"), |
18318
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
1948 tr ("\"%1\"\n" |
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
1949 "is not a valid identifier.\n\n" |
20713
2469d78a1d8b
Consistently use 'filename' rather than 'file name' throughout code base.
Rik <rik@octave.org>
parents:
20677
diff
changeset
|
1950 "If you keep this filename, you will not be able to\n" |
18318
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
1951 "call your script using its name as an Octave command.\n\n" |
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
1952 "Do you want to choose another name?").arg (base_name), |
18275
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1953 QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1954 |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1955 if (ans == QMessageBox::Yes) |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1956 return true; |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1957 } |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1958 |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1959 return false; |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1960 } |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1961 |
20783
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1962 bool |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1963 file_editor_tab::check_valid_codec (QTextCodec *codec) |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1964 { |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1965 if (! codec->canEncode (_edit_area->text ())) |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1966 { |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1967 int ans = QMessageBox::warning (0, |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1968 tr ("Octave Editor"), |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1969 tr ("The current editor contents can not be encoded\n" |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1970 "with the selected codec %1.\n" |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1971 "Using it will result in data loss!\n\n" |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1972 "Do you want to chose another codec?").arg (_encoding), |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1973 QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1974 |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1975 if (ans == QMessageBox::Yes) |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1976 return true; |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1977 } |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1978 |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1979 return false; |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1980 } |
b6091735f3f5
warning when saving editor file with a codec not suited for current contents
Torsten <ttl@justmail.de>
parents:
20774
diff
changeset
|
1981 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1982 void |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1983 file_editor_tab::handle_save_file_as_answer (const QString& saveFileName) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1984 { |
19249
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1985 if (_save_as_desired_eol != _edit_area->eolMode ()) |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1986 convert_eol (this,_save_as_desired_eol); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
1987 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1988 if (saveFileName == _file_name) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1989 { |
18082
c3e7da9836bd
allow saving an editor file as the current one (bug #40759)
Torsten <ttl@justmail.de>
parents:
17979
diff
changeset
|
1990 save_file (saveFileName); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1991 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1992 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1993 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1994 // Have editor check for conflict, do not delete tab after save. |
18318
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
1995 if (check_valid_identifier (saveFileName)) |
18275
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1996 save_file_as (false); |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1997 else |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
1998 emit editor_check_conflict_save (saveFileName, false); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
1999 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2000 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2001 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2002 void |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2003 file_editor_tab::handle_save_file_as_answer_close (const QString& saveFileName) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2004 { |
19249
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
2005 if (_save_as_desired_eol != _edit_area->eolMode ()) |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
2006 { |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
2007 _edit_area->setReadOnly (false); // was set to read-only in save_file_as |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
2008 convert_eol (this,_save_as_desired_eol); |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
2009 _edit_area->setReadOnly (true); // restore read-only mode |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
2010 } |
d10c711a08d8
add a drop down menu with the eol mode in the save-file-as-dialog
Torsten <ttl@justmail.de>
parents:
19248
diff
changeset
|
2011 |
18082
c3e7da9836bd
allow saving an editor file as the current one (bug #40759)
Torsten <ttl@justmail.de>
parents:
17979
diff
changeset
|
2012 // saveFileName == _file_name can not happen, because we only can get here |
20713
2469d78a1d8b
Consistently use 'filename' rather than 'file name' throughout code base.
Rik <rik@octave.org>
parents:
20677
diff
changeset
|
2013 // when we close a tab and _file_name is not a valid filename yet |
18082
c3e7da9836bd
allow saving an editor file as the current one (bug #40759)
Torsten <ttl@justmail.de>
parents:
17979
diff
changeset
|
2014 |
c3e7da9836bd
allow saving an editor file as the current one (bug #40759)
Torsten <ttl@justmail.de>
parents:
17979
diff
changeset
|
2015 // Have editor check for conflict, delete tab after save. |
18318
770c525a1a2b
Warn when saving/running a script whose name is not a valid identifier.
Julien Bect <julien.bect@supelec.fr>
parents:
18315
diff
changeset
|
2016 if (check_valid_identifier (saveFileName)) |
18275
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
2017 save_file_as (true); |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
2018 else |
3a26bb54655e
warn when saving or executing a file with spaces in its name (bug #41136)
Torsten <ttl@justmail.de>
parents:
18237
diff
changeset
|
2019 emit editor_check_conflict_save (saveFileName, true); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2020 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2021 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2022 void |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2023 file_editor_tab::handle_save_file_as_answer_cancel () |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2024 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2025 // User canceled, allow editing again. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2026 _edit_area->setReadOnly (false); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2027 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2028 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2029 void |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2030 file_editor_tab::file_has_changed (const QString&) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2031 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2032 // Prevent popping up multiple message boxes when the file has |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2033 // been changed multiple times by temporarily removing from the |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2034 // file watcher. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2035 QStringList trackedFiles = _file_system_watcher.files (); |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20814
diff
changeset
|
2036 if (! trackedFiles.isEmpty ()) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2037 _file_system_watcher.removePath (_file_name); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2038 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2039 if (QFile::exists (_file_name)) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2040 { |
18946
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2041 if (_always_reload_changed_files) |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2042 |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2043 load_file (_file_name); |
16558 | 2044 |
18946
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2045 else |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2046 { |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2047 // Create a WindowModal message that blocks the edit area |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2048 // by making _edit_area parent. |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2049 QMessageBox* msgBox |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2050 = new QMessageBox (QMessageBox::Warning, |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2051 tr ("Octave Editor"), |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2052 tr ("It seems that \'%1\' has been modified by another application. Do you want to reload it?"). |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2053 arg (_file_name), |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2054 QMessageBox::Yes | QMessageBox::No, this); |
16558 | 2055 |
18946
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2056 connect (msgBox, SIGNAL (finished (int)), |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2057 this, SLOT (handle_file_reload_answer (int))); |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2058 |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2059 msgBox->setWindowModality (Qt::WindowModal); |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2060 msgBox->setAttribute (Qt::WA_DeleteOnClose); |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2061 msgBox->show (); |
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2062 } |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2063 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2064 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2065 { |
16017
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2066 QString modified = ""; |
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2067 if (_edit_area->isModified ()) |
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2068 modified = tr ("\n\nWarning: The contents in the editor is modified!"); |
16558 | 2069 |
16017
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2070 // Create a WindowModal message. The file editor tab can't be made |
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2071 // parent because it may be deleted depending upon the response. |
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2072 // Instead, change the _edit_area to read only. |
16558 | 2073 QMessageBox* msgBox |
2074 = new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"), | |
2075 tr ("It seems that the file\n" | |
2076 "%1\n" | |
2077 "has been deleted or renamed. Do you want to save it now?%2"). | |
2078 arg (_file_name).arg (modified), | |
2079 QMessageBox::Save | QMessageBox::Close, 0); | |
2080 | |
16017
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2081 _edit_area->setReadOnly (true); |
16558 | 2082 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2083 connect (msgBox, SIGNAL (finished (int)), |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2084 this, SLOT (handle_file_resave_answer (int))); |
16558 | 2085 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2086 msgBox->setWindowModality (Qt::WindowModal); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2087 msgBox->setAttribute (Qt::WA_DeleteOnClose); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2088 msgBox->show (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2089 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2090 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2091 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2092 void |
19770
35a8e1beac8d
fix some oddities updating lexer and api-files for auto completion
Torsten <ttl@justmail.de>
parents:
19768
diff
changeset
|
2093 file_editor_tab::notice_settings (const QSettings *settings, bool init) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2094 { |
16413
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16402
diff
changeset
|
2095 // QSettings pointer is checked before emitting. |
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
16402
diff
changeset
|
2096 |
19770
35a8e1beac8d
fix some oddities updating lexer and api-files for auto completion
Torsten <ttl@justmail.de>
parents:
19768
diff
changeset
|
2097 if (! init) |
35a8e1beac8d
fix some oddities updating lexer and api-files for auto completion
Torsten <ttl@justmail.de>
parents:
19768
diff
changeset
|
2098 update_lexer (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2099 |
18733
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2100 // code folding |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2101 if (settings->value ("editor/code_folding",true).toBool ()) |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2102 { |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2103 _edit_area->setMarginType (3, QsciScintilla::SymbolMargin); |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2104 _edit_area->setFolding (QsciScintilla::BoxedTreeFoldStyle , 3); |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2105 } |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2106 else |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2107 { |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2108 _edit_area->setFolding (QsciScintilla::NoFoldStyle, 3); |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2109 } |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2110 |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2111 // status bar |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2112 if (settings->value ("editor/show_edit_status_bar",true).toBool ()) |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2113 _status_bar->show (); |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2114 else |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2115 _status_bar->hide (); |
f6f1f27026bb
status bars and code folding a user preference (bug #42306)
Torsten <ttl@justmail.de>
parents:
18687
diff
changeset
|
2116 |
16693
e9d0b8252a0a
make color of current line marker in the editor configurable
Torsten <ttl@justmail.de>
parents:
16679
diff
changeset
|
2117 //highlight current line color |
e9d0b8252a0a
make color of current line marker in the editor configurable
Torsten <ttl@justmail.de>
parents:
16679
diff
changeset
|
2118 QVariant default_var = QColor (240, 240, 240); |
e9d0b8252a0a
make color of current line marker in the editor configurable
Torsten <ttl@justmail.de>
parents:
16679
diff
changeset
|
2119 QColor setting_color = settings->value ("editor/highlight_current_line_color", |
e9d0b8252a0a
make color of current line marker in the editor configurable
Torsten <ttl@justmail.de>
parents:
16679
diff
changeset
|
2120 default_var).value<QColor> (); |
e9d0b8252a0a
make color of current line marker in the editor configurable
Torsten <ttl@justmail.de>
parents:
16679
diff
changeset
|
2121 _edit_area->setCaretLineBackgroundColor (setting_color); |
16558 | 2122 _edit_area->setCaretLineVisible |
2123 (settings->value ("editor/highlightCurrentLine", true).toBool ()); | |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2124 |
18482
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2125 bool match_keywords = settings->value |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2126 ("editor/codeCompletion_keywords",true).toBool (); |
18482
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2127 bool match_document = settings->value |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
2128 ("editor/codeCompletion_document",true).toBool (); |
16679
cf939872811c
options for auto completion threshold, source and word replacement in settings
Torsten <ttl@justmail.de>
parents:
16678
diff
changeset
|
2129 |
18482
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2130 QsciScintilla::AutoCompletionSource source = QsciScintilla::AcsNone; |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2131 if (match_keywords) |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2132 if (match_document) |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2133 source = QsciScintilla::AcsAll; |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2134 else |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2135 source = QsciScintilla::AcsAPIs; |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2136 else if (match_document) |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2137 source = QsciScintilla::AcsDocument; |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2138 _edit_area->setAutoCompletionSource (source); |
16679
cf939872811c
options for auto completion threshold, source and word replacement in settings
Torsten <ttl@justmail.de>
parents:
16678
diff
changeset
|
2139 |
18482
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2140 _edit_area->setAutoCompletionReplaceWord |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2141 (settings->value ("editor/codeCompletion_replace",false).toBool ()); |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2142 _edit_area->setAutoCompletionCaseSensitivity |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2143 (settings->value ("editor/codeCompletion_case",true).toBool ()); |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2144 |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2145 if (settings->value ("editor/codeCompletion", true).toBool ()) |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2146 _edit_area->setAutoCompletionThreshold |
3a509de8e791
automatic completion list as user preference (bug #41469)
Torsten <ttl@justmail.de>
parents:
18460
diff
changeset
|
2147 (settings->value ("editor/codeCompletion_threshold",2).toInt ()); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2148 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2149 _edit_area->setAutoCompletionThreshold (-1); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2150 |
16702
553cfdd5d660
make white space visibility in the editor configurable
Torsten <ttl@justmail.de>
parents:
16701
diff
changeset
|
2151 if (settings->value ("editor/show_white_space",false).toBool ()) |
553cfdd5d660
make white space visibility in the editor configurable
Torsten <ttl@justmail.de>
parents:
16701
diff
changeset
|
2152 if (settings->value ("editor/show_white_space_indent",false).toBool ()) |
553cfdd5d660
make white space visibility in the editor configurable
Torsten <ttl@justmail.de>
parents:
16701
diff
changeset
|
2153 _edit_area->setWhitespaceVisibility (QsciScintilla::WsVisibleAfterIndent); |
553cfdd5d660
make white space visibility in the editor configurable
Torsten <ttl@justmail.de>
parents:
16701
diff
changeset
|
2154 else |
553cfdd5d660
make white space visibility in the editor configurable
Torsten <ttl@justmail.de>
parents:
16701
diff
changeset
|
2155 _edit_area->setWhitespaceVisibility (QsciScintilla::WsVisible); |
553cfdd5d660
make white space visibility in the editor configurable
Torsten <ttl@justmail.de>
parents:
16701
diff
changeset
|
2156 else |
553cfdd5d660
make white space visibility in the editor configurable
Torsten <ttl@justmail.de>
parents:
16701
diff
changeset
|
2157 _edit_area->setWhitespaceVisibility (QsciScintilla::WsInvisible); |
553cfdd5d660
make white space visibility in the editor configurable
Torsten <ttl@justmail.de>
parents:
16701
diff
changeset
|
2158 |
19245
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
2159 _edit_area->setEolVisibility ( |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
2160 settings->value("editor/show_eol_chars",false).toBool ()); |
f3c4b48f3c53
add a preference for the default eol mode of new files (bug #43334)
Torsten <ttl@justmail.de>
parents:
19244
diff
changeset
|
2161 |
16558 | 2162 if (settings->value ("editor/showLineNumbers", true).toBool ()) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2163 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2164 _edit_area->setMarginLineNumbers (2, true); |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
2165 auto_margin_width (); |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
2166 connect (_edit_area, SIGNAL (linesChanged ()), |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
2167 this, SLOT (auto_margin_width ())); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2168 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2169 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2170 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2171 _edit_area->setMarginLineNumbers (2, false); |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
2172 disconnect (_edit_area, SIGNAL (linesChanged ()), 0, 0); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2173 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2174 |
16703
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2175 _edit_area->setAutoIndent |
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2176 (settings->value ("editor/auto_indent",true).toBool ()); |
20414
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2177 _smart_indent = settings->value ("editor/auto_indent",true).toBool (); |
16703
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2178 _edit_area->setTabIndents |
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2179 (settings->value ("editor/tab_indents_line",false).toBool ()); |
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2180 _edit_area->setBackspaceUnindents |
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2181 (settings->value ("editor/backspace_unindents_line",false).toBool ()); |
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2182 _edit_area->setIndentationGuides |
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2183 (settings->value ("editor/show_indent_guides",false).toBool ()); |
19312
5fb4505b84ff
provide option for using tabs for indentations in the editor
Torsten <ttl@justmail.de>
parents:
19256
diff
changeset
|
2184 _edit_area->setIndentationsUseTabs |
5fb4505b84ff
provide option for using tabs for indentations in the editor
Torsten <ttl@justmail.de>
parents:
19256
diff
changeset
|
2185 (settings->value ("editor/indent_uses_tabs",false).toBool ()); |
19328
cd2a75e5cd6e
use indentation width for the editor from the settings (bug #43592)
Torsten <ttl@justmail.de>
parents:
19312
diff
changeset
|
2186 _edit_area->setIndentationWidth |
cd2a75e5cd6e
use indentation width for the editor from the settings (bug #43592)
Torsten <ttl@justmail.de>
parents:
19312
diff
changeset
|
2187 (settings->value ("editor/indent_width",2).toInt ()); |
16703
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2188 |
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2189 _edit_area->setTabWidth |
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2190 (settings->value ("editor/tab_width",2).toInt ()); |
5cf19370011d
add more settings concerning tabs and indentation to the editor settings
Torsten <ttl@justmail.de>
parents:
16702
diff
changeset
|
2191 |
19430
472a5572849c
hiding horizontal scroll bar in editor when not needed (bug #41592)
Torsten <ttl@justmail.de>
parents:
19426
diff
changeset
|
2192 _edit_area->SendScintilla (QsciScintillaBase::SCI_SETHSCROLLBAR, |
472a5572849c
hiding horizontal scroll bar in editor when not needed (bug #41592)
Torsten <ttl@justmail.de>
parents:
19426
diff
changeset
|
2193 settings->value ("editor/show_hscroll_bar",true).toBool ()); |
472a5572849c
hiding horizontal scroll bar in editor when not needed (bug #41592)
Torsten <ttl@justmail.de>
parents:
19426
diff
changeset
|
2194 _edit_area->SendScintilla (QsciScintillaBase::SCI_SETSCROLLWIDTH,-1); |
19590
6d75f1683ce8
fix scroll width of horizontal scroll bar (bug #44040)
Torsten <ttl@justmail.de>
parents:
19441
diff
changeset
|
2195 _edit_area->SendScintilla (QsciScintillaBase::SCI_SETSCROLLWIDTHTRACKING,true); |
19430
472a5572849c
hiding horizontal scroll bar in editor when not needed (bug #41592)
Torsten <ttl@justmail.de>
parents:
19426
diff
changeset
|
2196 |
16558 | 2197 _long_title = settings->value ("editor/longWindowTitle", false).toBool (); |
16757
35d9f1f79f06
update editor tab titles due to changed settings regarding the modifed state
Torsten <ttl@justmail.de>
parents:
16737
diff
changeset
|
2198 update_window_title (_edit_area->isModified ()); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2199 |
18489
6eae8ba32e62
provide a long line marker in the editor
Torsten <ttl@justmail.de>
parents:
18483
diff
changeset
|
2200 _edit_area->setEdgeColumn ( |
6eae8ba32e62
provide a long line marker in the editor
Torsten <ttl@justmail.de>
parents:
18483
diff
changeset
|
2201 settings->value ("editor/long_line_column",80).toInt ()); |
6eae8ba32e62
provide a long line marker in the editor
Torsten <ttl@justmail.de>
parents:
18483
diff
changeset
|
2202 if (settings->value ("editor/long_line_marker",true).toBool ()) |
6eae8ba32e62
provide a long line marker in the editor
Torsten <ttl@justmail.de>
parents:
18483
diff
changeset
|
2203 _edit_area->setEdgeMode (QsciScintilla::EdgeLine); |
6eae8ba32e62
provide a long line marker in the editor
Torsten <ttl@justmail.de>
parents:
18483
diff
changeset
|
2204 else |
6eae8ba32e62
provide a long line marker in the editor
Torsten <ttl@justmail.de>
parents:
18483
diff
changeset
|
2205 _edit_area->setEdgeMode (QsciScintilla::EdgeNone); |
6eae8ba32e62
provide a long line marker in the editor
Torsten <ttl@justmail.de>
parents:
18483
diff
changeset
|
2206 |
18946
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2207 // reload changed files |
19595
be7ac98fab43
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19594
diff
changeset
|
2208 _always_reload_changed_files = |
18946
0be65bd7f369
add an user preference for loading changed files without a prompt (bug #42678)
Torsten <ttl@justmail.de>
parents:
18838
diff
changeset
|
2209 settings->value ("editor/always_reload_changed_files",false).toBool (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2210 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2211 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2212 void |
16716
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
2213 file_editor_tab::auto_margin_width () |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
2214 { |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
2215 _edit_area->setMarginWidth (2, "1"+QString::number (_edit_area->lines ())); |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
2216 } |
23b5dde25367
make octave lexer the default and dynamically set margin width for line numbers
Torsten <ttl@justmail.de>
parents:
16715
diff
changeset
|
2217 |
19411
ed0df431631b
allow to cancel exiting if editor tabs are modified and exit is requested in gui
Torsten <ttl@justmail.de>
parents:
19348
diff
changeset
|
2218 // the following close request was changed from a signal slot into a |
ed0df431631b
allow to cancel exiting if editor tabs are modified and exit is requested in gui
Torsten <ttl@justmail.de>
parents:
19348
diff
changeset
|
2219 // normal function because we need the return value from close whether |
ed0df431631b
allow to cancel exiting if editor tabs are modified and exit is requested in gui
Torsten <ttl@justmail.de>
parents:
19348
diff
changeset
|
2220 // the tab really was closed (for canceling exiting octave). |
ed0df431631b
allow to cancel exiting if editor tabs are modified and exit is requested in gui
Torsten <ttl@justmail.de>
parents:
19348
diff
changeset
|
2221 // When emitting a signal, only the return value from the last slot |
ed0df431631b
allow to cancel exiting if editor tabs are modified and exit is requested in gui
Torsten <ttl@justmail.de>
parents:
19348
diff
changeset
|
2222 // goes back to the sender |
ed0df431631b
allow to cancel exiting if editor tabs are modified and exit is requested in gui
Torsten <ttl@justmail.de>
parents:
19348
diff
changeset
|
2223 bool |
19714
21015ca26566
Restructure shutdown flow and behavior for improved robustness
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
19697
diff
changeset
|
2224 file_editor_tab::conditional_close (void) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2225 { |
19411
ed0df431631b
allow to cancel exiting if editor tabs are modified and exit is requested in gui
Torsten <ttl@justmail.de>
parents:
19348
diff
changeset
|
2226 return close (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2227 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2228 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2229 void |
16558 | 2230 file_editor_tab::change_editor_state (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2231 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2232 if (ID != this) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2233 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2234 // Widget may be going out of focus. If so, record location. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2235 if (_find_dialog) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2236 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2237 if (_find_dialog->isVisible ()) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2238 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2239 _find_dialog_geometry = _find_dialog->geometry (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2240 _find_dialog->hide (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2241 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2242 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2243 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2244 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2245 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2246 if (_find_dialog && _find_dialog_is_visible) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2247 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2248 _find_dialog->setGeometry (_find_dialog_geometry); |
19441
521d4959fc42
fix positioning issues of editor find dialog (bug #43174)
Torsten <ttl@justmail.de>
parents:
19430
diff
changeset
|
2249 QPoint p = _find_dialog->pos (); |
521d4959fc42
fix positioning issues of editor find dialog (bug #43174)
Torsten <ttl@justmail.de>
parents:
19430
diff
changeset
|
2250 _find_dialog->move(p.x ()+10, p.y ()+10); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2251 _find_dialog->show (); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2252 } |
16558 | 2253 |
19803
415864f5b85f
communicating actual working directory to the editor (#44298)
Torsten <ttl@justmail.de>
parents:
19770
diff
changeset
|
2254 emit editor_state_changed (_copy_available, _is_octave_file); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2255 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2256 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2257 void |
16558 | 2258 file_editor_tab::file_name_query (const QWidget *ID) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2259 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2260 // A zero (null pointer) means that all file editor tabs |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2261 // should respond, otherwise just the desired file editor tab. |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2262 if (ID != this && ID != 0) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2263 return; |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2264 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2265 // Unnamed files shouldn't be transmitted. |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20814
diff
changeset
|
2266 if (! _file_name.isEmpty ()) |
20796
ed770c16a3e8
also store encoding and tab index with last editor session (bugs #46588, #45688)
Torsten <ttl@justmail.de>
parents:
20793
diff
changeset
|
2267 emit add_filename_to_list (_file_name, _encoding, this); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2268 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2269 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2270 void |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2271 file_editor_tab::handle_file_reload_answer (int decision) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2272 { |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2273 if (decision == QMessageBox::Yes) |
16558 | 2274 { |
2275 // reload: file is readded to the file watcher in set_file_name () | |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2276 load_file (_file_name); |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2277 } |
15849
e55a64f49346
editor: prevent reloaded file from being added twice to the file watcher
Torsten <ttl@justmail.de>
parents:
15848
diff
changeset
|
2278 else |
16558 | 2279 { |
2280 // do not reload: readd to the file watche | |
15849
e55a64f49346
editor: prevent reloaded file from being added twice to the file watcher
Torsten <ttl@justmail.de>
parents:
15848
diff
changeset
|
2281 _file_system_watcher.addPath (_file_name); |
e55a64f49346
editor: prevent reloaded file from being added twice to the file watcher
Torsten <ttl@justmail.de>
parents:
15848
diff
changeset
|
2282 } |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2283 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2284 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2285 void |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2286 file_editor_tab::handle_file_resave_answer (int decision) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2287 { |
16017
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2288 // check decision of user in dialog |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2289 if (decision == QMessageBox::Save) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2290 { |
16017
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2291 save_file (_file_name); // readds file to watcher in set_file_name () |
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2292 _edit_area->setReadOnly (false); // delete read only flag |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2293 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2294 else |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2295 { |
16017
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2296 // Definitely close the file. |
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2297 // Set modified to false to prevent the dialog box when the close event |
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2298 // is posted. If the user cancels the close in this dialog the tab is |
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2299 // left open with a non-existing file. |
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2300 _edit_area->setModified (false); |
06187a0b7a62
gui: new handling when an editor file is deleted or renamed (bug #38282)
Torsten <ttl@justmail.de>
parents:
15988
diff
changeset
|
2301 close (); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2302 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2303 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2304 |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2305 void |
16395
fc491da603f6
also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents:
16389
diff
changeset
|
2306 file_editor_tab::insert_debugger_pointer (const QWidget *ID, int line) |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2307 { |
16377
8430ea8c1594
open editor tab and insert marker for debugging with gui
John W. Eaton <jwe@octave.org>
parents:
16375
diff
changeset
|
2308 if (ID != this || ID == 0) |
8430ea8c1594
open editor tab and insert marker for debugging with gui
John W. Eaton <jwe@octave.org>
parents:
16375
diff
changeset
|
2309 return; |
8430ea8c1594
open editor tab and insert marker for debugging with gui
John W. Eaton <jwe@octave.org>
parents:
16375
diff
changeset
|
2310 |
21058
759fcdf3666d
Test GUI marker flags correctly, and omit unnecessary test finding next marker
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21054
diff
changeset
|
2311 emit remove_all_positions (); // debugger_position, unsure_debugger_position |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2312 |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2313 if (line > 0) |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2314 { |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2315 marker *dp; |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2316 |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2317 if (_edit_area->isModified ()) |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2318 { |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2319 // The best that can be done if the editor contents has been |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2320 // modified is to see if there is a match with the original |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2321 // line number of any existing breakpoints. We can put a normal |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2322 // debugger pointer at that breakpoint position. Otherwise, it |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2323 // isn't certain whether the original line number and current line |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2324 // number match. |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2325 int editor_linenr = -1; |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2326 marker *dummy; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2327 emit find_translated_line_number (line, editor_linenr, dummy); |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2328 if (editor_linenr != -1) |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2329 { |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2330 // Match with an existing breakpoint. |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2331 dp = new marker (_edit_area, line, |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2332 marker::debugger_position, editor_linenr); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2333 } |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2334 else |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2335 { |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2336 int original_linenr = -1; |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2337 editor_linenr = -1; |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2338 emit find_linenr_just_before (line, original_linenr, editor_linenr); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2339 if (original_linenr >= 0) |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2340 { |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2341 // Make a guess by using an offset from the breakpoint. |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2342 int linenr_guess = editor_linenr + line - original_linenr; |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2343 dp = new marker (_edit_area, line, |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2344 marker::unsure_debugger_position, |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2345 linenr_guess); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2346 } |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2347 else |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2348 { |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2349 // Can't make a very good guess, so just use the debugger |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2350 // line number. |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2351 dp = new marker (_edit_area, line, |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2352 marker::unsure_debugger_position); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2353 } |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2354 } |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2355 } |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2356 else |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2357 dp = new marker (_edit_area, line, marker::debugger_position); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2358 |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2359 connect (this, SIGNAL (remove_position_via_debugger_linenr (int)), |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2360 dp, SLOT (handle_remove_via_original_linenr (int))); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2361 connect (this, SIGNAL (remove_all_positions (void)), |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2362 dp, SLOT (handle_remove (void))); |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2363 |
21052
5c5af828c248
gui: only center line with debugger pointer if line is at the top or bottom
Torsten <ttl@justmail.de>
parents:
21045
diff
changeset
|
2364 center_current_line (false); |
15848
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2365 } |
424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15449
diff
changeset
|
2366 } |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15860
diff
changeset
|
2367 |
16386
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2368 void |
16395
fc491da603f6
also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents:
16389
diff
changeset
|
2369 file_editor_tab::delete_debugger_pointer (const QWidget *ID, int line) |
fc491da603f6
also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents:
16389
diff
changeset
|
2370 { |
fc491da603f6
also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents:
16389
diff
changeset
|
2371 if (ID != this || ID == 0) |
fc491da603f6
also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents:
16389
diff
changeset
|
2372 return; |
fc491da603f6
also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents:
16389
diff
changeset
|
2373 |
fc491da603f6
also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents:
16389
diff
changeset
|
2374 if (line > 0) |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2375 _edit_area->markerDelete (line-1, marker::debugger_position); |
16395
fc491da603f6
also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents:
16389
diff
changeset
|
2376 } |
fc491da603f6
also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents:
16389
diff
changeset
|
2377 |
fc491da603f6
also provide a hook for exiting debugger
John W. Eaton <jwe@octave.org>
parents:
16389
diff
changeset
|
2378 void |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2379 file_editor_tab::do_breakpoint_marker (bool insert, const QWidget *ID, int line, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2380 const QString& cond) |
16386
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2381 { |
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2382 if (ID != this || ID == 0) |
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2383 return; |
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2384 |
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2385 if (line > 0) |
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2386 { |
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2387 if (insert) |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2388 { |
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2389 int editor_linenr = -1; |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2390 marker *bp = 0; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2391 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2392 // If comes back indicating a non-zero breakpoint marker, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2393 // reuse it if possible |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2394 emit find_translated_line_number (line, editor_linenr, bp); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2395 if (bp != 0) |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2396 { |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2397 if ((cond == "") != (bp->get_cond () == "")) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2398 { // can only reuse conditional bp as conditional |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2399 emit remove_breakpoint_via_debugger_linenr (line); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2400 bp = 0; |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2401 } |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2402 else |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2403 bp->set_cond (cond); |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2404 } |
21158
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2405 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2406 if (bp == 0) |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2407 bp = new marker (_edit_area, line, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2408 cond == "" ? marker::breakpoint |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2409 : marker::cond_break, cond); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2410 |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2411 connect (this, SIGNAL (remove_breakpoint_via_debugger_linenr |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2412 (int)), |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2413 bp, SLOT (handle_remove_via_original_linenr (int))); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2414 connect (this, SIGNAL (request_remove_breakpoint_via_editor_linenr |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2415 (int)), |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2416 bp, SLOT (handle_request_remove_via_editor_linenr |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2417 (int))); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2418 connect (this, SIGNAL (remove_all_breakpoints (void)), |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2419 bp, SLOT (handle_remove (void))); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2420 connect (this, SIGNAL (find_translated_line_number (int, int&, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2421 marker*&)), |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2422 bp, SLOT (handle_find_translation (int, int&, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2423 marker*&))); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2424 connect (this, SIGNAL (find_linenr_just_before (int, int&, int&)), |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2425 bp, SLOT (handle_find_just_before (int, int&, int&))); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2426 connect (this, SIGNAL (report_marker_linenr (QIntList&, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2427 QStringList&)), |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2428 bp, SLOT (handle_report_editor_linenr (QIntList&, |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2429 QStringList&))); |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2430 connect (bp, SIGNAL (request_remove (int)), |
65827e9cccb8
Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21148
diff
changeset
|
2431 this, SLOT (handle_request_remove_breakpoint (int))); |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2432 } |
16386
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2433 else |
21007
0a09c3cae800
New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20995
diff
changeset
|
2434 emit remove_breakpoint_via_debugger_linenr (line); |
16386
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2435 } |
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2436 } |
4902484f9181
callbacks to set markers in editor using command line dbstop function
John W. Eaton <jwe@octave.org>
parents:
16379
diff
changeset
|
2437 |
16389
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
2438 |
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
2439 void |
21044
e2fdbdd00ef9
center line when setting a breakpoint only if line is at top or at bottom
Torsten <ttl@justmail.de>
parents:
21020
diff
changeset
|
2440 file_editor_tab::center_current_line (bool always) |
16389
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
2441 { |
16558 | 2442 long int visible_lines |
2443 = _edit_area->SendScintilla (QsciScintillaBase::SCI_LINESONSCREEN); | |
2444 | |
16389
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
2445 if (visible_lines > 2) |
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
2446 { |
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
2447 int line, index; |
16558 | 2448 _edit_area->getCursorPosition (&line, &index); |
2449 | |
16389
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
2450 int first_line = _edit_area->firstVisibleLine (); |
16558 | 2451 |
21044
e2fdbdd00ef9
center line when setting a breakpoint only if line is at top or at bottom
Torsten <ttl@justmail.de>
parents:
21020
diff
changeset
|
2452 if (always || line == first_line || line > first_line + visible_lines - 2) |
e2fdbdd00ef9
center line when setting a breakpoint only if line is at top or at bottom
Torsten <ttl@justmail.de>
parents:
21020
diff
changeset
|
2453 { |
e2fdbdd00ef9
center line when setting a breakpoint only if line is at top or at bottom
Torsten <ttl@justmail.de>
parents:
21020
diff
changeset
|
2454 first_line = first_line + (line - first_line - (visible_lines-1)/2); |
e2fdbdd00ef9
center line when setting a breakpoint only if line is at top or at bottom
Torsten <ttl@justmail.de>
parents:
21020
diff
changeset
|
2455 _edit_area->SendScintilla (2613,first_line); // SCI_SETFIRSTVISIBLELINE |
e2fdbdd00ef9
center line when setting a breakpoint only if line is at top or at bottom
Torsten <ttl@justmail.de>
parents:
21020
diff
changeset
|
2456 } |
16389
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
2457 } |
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
2458 } |
f5204f486a29
gui: add shortcut for goto line action in the editor and center the target line
Torsten <ttl@justmail.de>
parents:
16388
diff
changeset
|
2459 |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19237
diff
changeset
|
2460 void |
20414
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2461 file_editor_tab::handle_lines_changed () |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2462 { |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2463 // the related signal is emitted before cursor-move-signal! |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2464 _lines_changed = true; |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2465 } |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2466 |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2467 void |
17962
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
2468 file_editor_tab::handle_cursor_moved (int line, int col) |
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
2469 { |
18483
0f3bc7ccb875
update the completion list of the editor while typing
Torsten <ttl@justmail.de>
parents:
18482
diff
changeset
|
2470 if (_edit_area->SendScintilla (QsciScintillaBase::SCI_AUTOCACTIVE)) |
0f3bc7ccb875
update the completion list of the editor while typing
Torsten <ttl@justmail.de>
parents:
18482
diff
changeset
|
2471 show_auto_completion (this); |
0f3bc7ccb875
update the completion list of the editor while typing
Torsten <ttl@justmail.de>
parents:
18482
diff
changeset
|
2472 |
20414
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2473 if (_lines_changed) // check for smart indentation |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2474 { |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2475 _lines_changed = false; |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2476 if (_is_octave_file && _smart_indent && line == _line+1 && col < _col) |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2477 do_smart_indent (); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2478 } |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2479 |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2480 _line = line; |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2481 _col = col; |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2482 |
17962
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
2483 _row_indicator->setNum (line+1); |
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
2484 _col_indicator->setNum (col+1); |
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
2485 } |
4a53bcc1a4ae
GUI: Add statusbar with line/col indicator to editor window (Bug #40626)
John Donoghue <john.donoghue@ieee.org>
parents:
17790
diff
changeset
|
2486 |
20414
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2487 void |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2488 file_editor_tab::do_smart_indent () |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2489 { |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2490 QString prev_line = _edit_area->text (_line); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2491 |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2492 QRegExp bkey = QRegExp ("^[\t ]*(if|for|while|switch|case|do|function" |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2493 "|unwind_protect|unwind_protect_cleanup|try)" |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2494 "[\n\t #%]"); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2495 if (prev_line.contains (bkey)) |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2496 { |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2497 _edit_area->indent (_line+1); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2498 _edit_area->setCursorPosition (_line+1, |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2499 _edit_area->indentation (_line) + |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2500 _edit_area->indentationWidth ()); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2501 return; |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2502 } |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2503 |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2504 QRegExp mkey = QRegExp ("^[\t ]*(else|elseif|catch)[\t #%\n]"); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2505 if (prev_line.contains (mkey)) |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2506 { |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2507 int prev_ind = _edit_area->indentation (_line-1); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2508 int act_ind = _edit_area->indentation (_line); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2509 |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2510 if (prev_ind == act_ind) |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2511 _edit_area->unindent (_line); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2512 else if (prev_ind > act_ind) |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2513 { |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2514 _edit_area->setIndentation (_line+1, prev_ind); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2515 _edit_area->setCursorPosition (_line+1, prev_ind); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2516 } |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2517 return; |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2518 } |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2519 |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2520 QRegExp ekey = QRegExp ("^[\t ]*(end|endif|endfor|endwhile|until|endfunction" |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2521 "|end_try_catch|end_unwind_protext)[\t #%\n(;]"); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2522 if (prev_line.contains (ekey)) |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2523 { |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2524 if (_edit_area->indentation (_line-1) <= _edit_area->indentation (_line)) |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2525 { |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2526 _edit_area->unindent (_line+1); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2527 _edit_area->unindent (_line); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2528 _edit_area->setCursorPosition (_line+1, |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2529 _edit_area->indentation (_line)); |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2530 } |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2531 return; |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2532 } |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2533 |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2534 } |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2535 |
046904b54dc4
editor with smart indentation for octave files (bug #41554)
Torsten <ttl@justmail.de>
parents:
20230
diff
changeset
|
2536 |
18834
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2537 QString |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2538 file_editor_tab::get_function_name () |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2539 { |
19005
bf7c5d96d1ff
improved regexp for file name suggestion when saving a new editor file
Torsten <ttl@justmail.de>
parents:
19004
diff
changeset
|
2540 QRegExp rxfun1 ("^[\t ]*function[^=]+=([^\\(]+)\\([^\\)]*\\)[\t ]*$"); |
bf7c5d96d1ff
improved regexp for file name suggestion when saving a new editor file
Torsten <ttl@justmail.de>
parents:
19004
diff
changeset
|
2541 QRegExp rxfun2 ("^[\t ]*function[\t ]+([^\\(]+)\\([^\\)]*\\)[\t ]*$"); |
19043
2e6b34324d50
fix compile warning in gui editor tab
Torsten <ttl@justmail.de>
parents:
19005
diff
changeset
|
2542 QRegExp rxfun3 ("^[\t ]*function[^=]+=[\t ]*([^\\s]+)[\t ]*$"); |
2e6b34324d50
fix compile warning in gui editor tab
Torsten <ttl@justmail.de>
parents:
19005
diff
changeset
|
2543 QRegExp rxfun4 ("^[\t ]*function[\t ]+([^\\s]+)[\t ]*$"); |
18834
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2544 |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2545 QStringList lines = _edit_area->text ().split ("\n"); |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2546 |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2547 for (int i = 0; i < lines.count (); i++) |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2548 { |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2549 if (rxfun1.indexIn (lines.at (i)) != -1) |
19005
bf7c5d96d1ff
improved regexp for file name suggestion when saving a new editor file
Torsten <ttl@justmail.de>
parents:
19004
diff
changeset
|
2550 return rxfun1.cap (1).remove (QRegExp("[ \t]*")); |
18834
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2551 else if (rxfun2.indexIn (lines.at (i)) != -1) |
19005
bf7c5d96d1ff
improved regexp for file name suggestion when saving a new editor file
Torsten <ttl@justmail.de>
parents:
19004
diff
changeset
|
2552 return rxfun2.cap (1).remove (QRegExp("[ \t]*")); |
18834
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2553 else if (rxfun3.indexIn (lines.at (i)) != -1) |
19005
bf7c5d96d1ff
improved regexp for file name suggestion when saving a new editor file
Torsten <ttl@justmail.de>
parents:
19004
diff
changeset
|
2554 return rxfun3.cap (1).remove (QRegExp("[ \t]*")); |
bf7c5d96d1ff
improved regexp for file name suggestion when saving a new editor file
Torsten <ttl@justmail.de>
parents:
19004
diff
changeset
|
2555 else if (rxfun4.indexIn (lines.at (i)) != -1) |
bf7c5d96d1ff
improved regexp for file name suggestion when saving a new editor file
Torsten <ttl@justmail.de>
parents:
19004
diff
changeset
|
2556 return rxfun4.cap (1).remove (QRegExp("[ \t]*")); |
18834
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2557 } |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2558 |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2559 return QString (); |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2560 } |
0e6f7b5f6556
propose function name as file name when saving a new file (bug #42568)
Torsten <ttl@justmail.de>
parents:
18833
diff
changeset
|
2561 |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15860
diff
changeset
|
2562 #endif |