Mercurial > octave
annotate libgui/src/external-editor-interface.h @ 23385:41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
* external-editor-interface.cc/h: new class with an interface for an external
editor, which is used by preference or if qscintilla is not available;
(external_editor_interface): ctor, connect a signal for opening the settings;
(external_editor): check for an external editor being set in the settings;
(call_custom_editor): call the custom editor;
(request_open_file, request_open_file, handle_edit_file_request):
slots for the various ways for opening a file
* file-editor-interface.h: moved request_new_function and
removed request_open_file into the main window
* file-editor.cc: include external-editor-interface.h;
(file_editor): file encoding tracked in main window;
(request_new_function): moved into main window;
(request_open_file (void)): moved to main window;
(request_open_files): moved to main window;
(handle_combo_enc_current_index): moved to main window;
(restore_create_file_setting): moved into main window;
(request_new_script): moved into main window;
(restore_create_file_setting): moved into main window;
(call_custom_editor): use external_editor_interface;
(handle_edit_mfile_request): moved into main window;
(construct): moved some signal connection into the main window;
(add_file_editor_tab): update signal connection to moved slots;
* file-editor.h: moved request_new_function, handle_edit_mfile_request,
request_open_file (void), request_open_files, handle_combo_enc_current_index,
and class variable _file_encodinginto the main window;
* main-window.cc (main_window): initialize _file_encoding to empty string,
set external editor interface and store active editor for connecting signals;
(~main_window): delete external_editor_interface;
(edit_mfile): directly use slot handle_edit_mfile_request moved here;
(handle_edit_mfile_request): moved from editor to here;
(request_new_function): moved from editor to here;
(request_open_file): moved from file editor to here;
(set_file_encoding): moved from file editor to here, old name was
handle_combo_enc_current_index;
(request_open_files): moved from file editor to here;
(restore_create_file_setting): moved from editor to here;
(construct_octave_qt_link): connect signals to slots in editor or external
editor interface;
(construct_file_menu): connect signals to slots in editor or external
editor interface, slot for opening files now in main window
(construct_new_menu): connect signals to slots in editor, external
editor interface, or to slots moved here;
* main-window.h: update signals according to moved slots, namely
request_new_function, request_new_script, handle_edit_mfile_request,
restore_create_file_setting, moved request_open_file, set_file_encoding,
request_open_files, and class variable _file_encoding to here
* module.mk: added new files external-editor-interface.cc/h
author | Torsten <mttl@mailbox.org> |
---|---|
date | Tue, 11 Apr 2017 08:00:23 +0200 |
parents | |
children | 9107bae20480 |
rev | line source |
---|---|
23385
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
1 /* |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
2 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
3 Copyright (C) 2017 Torsten |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
4 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
5 This file is part of Octave. |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
6 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
7 Octave is free software; you can redistribute it and/or modify it |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
8 under the terms of the GNU Genera*_*) |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
9 * l Public License as published by |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
10 the Free Software Foundation; either version 3 of the License, or |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
11 (at your option) any later version. |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
12 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
13 Octave is distributed in the hope that it will be useful, but |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
14 WITHOUT ANY WARRANTY; without even the implied warranty of |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
16 GNU General Public License for more details. |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
17 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
18 You should have received a copy of the GNU General Public License |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
19 along with Octave; see the file COPYING. If not, see |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
20 <http://www.gnu.org/licenses/>. |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
21 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
22 */ |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
23 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
24 #if ! defined (octave_external_editor_interface_h) |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
25 #define octave_external_editor_interface_h 1 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
26 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
27 #include <QWidget> |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
28 #include <QString> |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
29 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
30 class external_editor_interface : public QWidget |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
31 { |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
32 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
33 Q_OBJECT |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
34 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
35 public: |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
36 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
37 external_editor_interface (QWidget *main_win); |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
38 ~external_editor_interface () { }; |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
39 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
40 signals: |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
41 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
42 void request_settings_dialog (const QString&); |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
43 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
44 public slots: |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
45 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
46 bool call_custom_editor (const QString& file = QString (), int line = -1); |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
47 void request_open_file (const QString& fileName, |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
48 const QString& encoding = QString (), |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
49 int line = -1, bool debug_pointer = false, |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
50 bool breakpoint_marker = false, bool insert = true, |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
51 const QString& cond = ""); |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
52 void request_new_file (const QString&); |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
53 void handle_edit_file_request (const QString& file); |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
54 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
55 private: |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
56 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
57 QString external_editor (); |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
58 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
59 }; |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
60 |
41639665aa34
improve opening files from gui when built without qscintilla (bug #39179)
Torsten <mttl@mailbox.org>
parents:
diff
changeset
|
61 #endif |