octave: libgui/src/main-window.cc annotate

annotate libgui/src/main-window.cc @ 27281:0915fec3d3a9

prevent gui from catching focus when its desktop workspace becomes active * file-editor.cc (focus): renamed into activate and make use of octave_dock_widget::activate; (set_focus): use qt setFocus instead of own old octave_dock_widget::focus; (request_new_file, request_close_file, active_tab_changed, handle_visibility, request_open_file): call new method activate instead of old focus; * file-editor.h: removed method focus and added new method activate * main-window.cc (focus_command_window): activate instead of focus; (editor_tabs_changed, construct_documentation_menu): use activate slot instead of focus; * octave-dock-widget.cc (make_window, make_widget, set_focus_predecessor): use qt setFocus instead of removed focus method; (activate): implementation of renamed method; (handle_visibility): moved implementation from header to here * octave-dock-widget.h: renamed focus into activate, moved implementation from here to cc-file, use setFocus in handle_visibility, moved implementation for handle_visibility from here to cc-file * terminal-dock-widget.cc (focus): removed virtual implementation * terminal-dock-widget.h: removed focus method

author	Torsten Lilge <ttl-octave@mailbox.org>
date	Mon, 22 Jul 2019 22:20:56 +0200
parents	db687716fed6
children	189ca5990c5d

rev	line source
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	1 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26323 diff changeset	3 Copyright (C) 2013-2019 John W. Eaton
00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26323 diff changeset	4 Copyright (C) 2011-2019 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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24520 diff changeset	8 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	9 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24520 diff changeset	10 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	11 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	12
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	16 GNU General Public License for more details.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	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
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24520 diff changeset	20 <https://www.gnu.org/licenses/>.
15204 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 */
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	25 # include "config.h"
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	26 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	27
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	28 #include <QKeySequence>
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	29 #include <QApplication>
26227 2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	30 #include <QStyleFactory>
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	31 #include <QInputDialog>
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	32 #include <QLabel>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	33 #include <QMenuBar>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	34 #include <QMenu>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	35 #include <QAction>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	36 #include <QSettings>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	37 #include <QStyle>
25956 2201f82db233 Add missing QStyleFactory header (Bug #54881) John Donoghue parents: 25944 diff changeset	38 #include <QStyleFactory>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	39 #include <QToolBar>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	40 #include <QDesktopServices>
16391 a695ee2dc17e * main-window.cc: Include <QDesktopWidget> John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	41 #include <QDesktopWidget>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	42 #include <QFileDialog>
13626 cc90c62ada21 Removed terminal, instead now using QPlainTextEdit, which looks much nicer and is not that error-prone... Jacob Dawid <jacob.dawid@googlemail.com> parents: 13620 diff changeset	43 #include <QMessageBox>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	44 #include <QIcon>
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	45 #include <QTextBrowser>
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	46 #include <QTextCodec>
17764 811b5a562680 Format release notes as preformatted text in the GUI (bug #40367) Mike Miller <mtmiller@ieee.org> parents: 17744 diff changeset	47 #include <QTextStream>
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	48 #include <QThread>
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	49 #include <QDateTime>
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	50 #include <QDebug>
21439 912b8828193b * main-window.cc: include QTimer header file Mike Miller <mtmiller@octave.org> parents: 21428 diff changeset	51 #include <QTimer>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	52
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	53 #include <utility>
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	54
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	55 #if defined (HAVE_QSCINTILLA)
21203 710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21158 diff changeset	56 # include "file-editor.h"
16290 d07aeecb2d22 build: Add more #ifdefs to build GUI when Qscintilla is not present. Rik <rik@octave.org> parents: 16176 diff changeset	57 #endif
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: 27194 diff changeset	58 #include "interpreter-qobject.h"
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	59 #include "main-window.h"
27193 01e73e1664ff move news reader widget to separate file John W. Eaton <jwe@octave.org> parents: 27118 diff changeset	60 #include "news-reader.h"
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: 27196 diff changeset	61 #include "octave-qobject.h"
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	62 #include "settings-dialog.h"
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	63 #include "shortcut-manager.h"
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	64 #include "welcome-wizard.h"
26309 b26b31781b30 separate include file for main window gui preferences Torsten <mttl@mailbox.org> parents: 26307 diff changeset	65 #include "gui-preferences-mw.h"
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	66
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	67 #include "Array.h"
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	68 #include "cmd-edit.h"
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	69 #include "oct-env.h"
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	70 #include "url-transfer.h"
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	71
19893 67cb2f421255 restore include statement removed in changeset c7c50030e76c John W. Eaton <jwe@octave.org> parents: 19882 diff changeset	72 #include "builtin-defun-decls.h"
25460 627d6bde9b8d solve installation info initialization problem differently John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	73 #include "defaults.h"
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	74 #include "defun.h"
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	75 #include "interpreter-private.h"
23773 5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	76 #include "interpreter.h"
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	77 #include "oct-map.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	78 #include "octave.h"
25408 ce725103ebf1 Fallback to open.m for opening files in the gui file browser (bug #50543) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25407 diff changeset	79 #include "parse.h"
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 26115 diff changeset	80 #include "syminfo.h"
24362 3fc24b792a24 avoid including symtab.h, symscope.h, or symrec.h unnecessarily John W. Eaton <jwe@octave.org> parents: 24361 diff changeset	81 #include "symscope.h"
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	82 #include "utils.h"
15404 f52a62a6db3a eliminate copy and paste copyright info in GUI about info box John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	83 #include "version.h"
23380 c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	84
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	85 namespace octave
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	86 {
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	87 static file_editor_interface *
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	88 create_default_editor (QWidget *p)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	89 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	90 #if defined (HAVE_QSCINTILLA)
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	91 return new file_editor (p);
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	92 #else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	93 octave_unused_parameter (p);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	94
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	95 return 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	96 #endif
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	97 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 27042 diff changeset	98
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	99 main_window::main_window (base_qobject& qobj)
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	100 : QMainWindow (), m_octave_qobj (qobj), m_workspace_model (nullptr),
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	101 m_status_bar (nullptr), m_command_window (nullptr),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	102 m_history_window (nullptr), m_file_browser_window (nullptr),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	103 m_doc_browser_window (nullptr), m_editor_window (nullptr),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	104 m_workspace_window (nullptr), m_variable_editor_window (nullptr),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	105 m_external_editor (new external_editor_interface (this)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	106 m_active_editor (m_external_editor),
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	107 m_settings_dlg (nullptr), m_find_files_dlg (nullptr),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	108 m_release_notes_window (nullptr), m_community_news_window (nullptr),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	109 m_clipboard (QApplication::clipboard ()),
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	110 m_prevent_readline_conflicts (true), m_suppress_dbg_location (true),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	111 m_closing (false), m_file_encoding (QString ())
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	112 {
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	113 if (resource_manager::is_first_run ())
25938 6fec0e305268 Backed out changeset 2ab0a9b66388 John W. Eaton <jwe@octave.org> parents: 25937 diff changeset	114 {
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	115 // Before wizard.
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: 27196 diff changeset	116 qobj.config_translators ();
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	117
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	118 welcome_wizard welcomeWizard;
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	119
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	120 if (welcomeWizard.exec () == QDialog::Rejected)
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	121 exit (1);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	122
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	123 // Install settings file.
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	124 resource_manager::reload_settings ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	125 }
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	126 else
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	127 {
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	128 // Get settings file.
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	129 resource_manager::reload_settings ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	130
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	131 // After settings.
27197 b8c0d5ad024f refactor and rename some qt application objects John W. Eaton <jwe@octave.org> parents: 27196 diff changeset	132 qobj.config_translators ();
25938 6fec0e305268 Backed out changeset 2ab0a9b66388 John W. Eaton <jwe@octave.org> parents: 25937 diff changeset	133 }
6fec0e305268 Backed out changeset 2ab0a9b66388 John W. Eaton <jwe@octave.org> parents: 25937 diff changeset	134
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	135 resource_manager::update_network_settings ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	136
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	137 // We provide specific terminal capabilities, so ensure that
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	138 // TERM is always set appropriately.
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	139
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	140 #if defined (OCTAVE_USE_WINDOWS_API)
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	141 sys::env::putenv ("TERM", "cygwin");
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	142 #else
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	143 sys::env::putenv ("TERM", "xterm");
25046 a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	144 #endif
a4c687fec320 gui: set Qt Application and Desktop metadata for desktop integration (bug #53102) Mike Miller <mtmiller@octave.org> parents: 25042 diff changeset	145
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	146 shortcut_manager::init_data ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	147
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	148 construct_central_widget ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	149
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	150 m_workspace_model = new workspace_model ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	151 m_status_bar = new QStatusBar ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	152 m_command_window = new terminal_dock_widget (this);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	153 m_history_window = new history_dock_widget (this);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	154 m_file_browser_window = new files_dock_widget (this);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	155 m_doc_browser_window = new documentation_dock_widget (this);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	156 m_editor_window = create_default_editor (this);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	157 m_variable_editor_window = new variable_editor (this);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	158 m_workspace_window = new workspace_view (this);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	159
27267 d75c7b4f7645 fix using external editor when built without qscintilla (regression from ceb508ea92ee) Torsten Lilge <ttl-octave@mailbox.org> parents: 27263 diff changeset	160 // Set active editor depending on editor window. If the latter is
d75c7b4f7645 fix using external editor when built without qscintilla (regression from ceb508ea92ee) Torsten Lilge <ttl-octave@mailbox.org> parents: 27263 diff changeset	161 // not initialized (qscintilla not present), use the external editor.
d75c7b4f7645 fix using external editor when built without qscintilla (regression from ceb508ea92ee) Torsten Lilge <ttl-octave@mailbox.org> parents: 27263 diff changeset	162 if (m_editor_window)
d75c7b4f7645 fix using external editor when built without qscintilla (regression from ceb508ea92ee) Torsten Lilge <ttl-octave@mailbox.org> parents: 27263 diff changeset	163 m_active_editor = m_editor_window;
d75c7b4f7645 fix using external editor when built without qscintilla (regression from ceb508ea92ee) Torsten Lilge <ttl-octave@mailbox.org> parents: 27263 diff changeset	164 else
d75c7b4f7645 fix using external editor when built without qscintilla (regression from ceb508ea92ee) Torsten Lilge <ttl-octave@mailbox.org> parents: 27263 diff changeset	165 m_active_editor = m_external_editor;
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	166
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	167 #if defined (HAVE_QGUIAPPLICATION_SETDESKTOPFILENAME)
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	168 QGuiApplication::setDesktopFileName ("org.octave.Octave.desktop");
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	169 #endif
25938 6fec0e305268 Backed out changeset 2ab0a9b66388 John W. Eaton <jwe@octave.org> parents: 25937 diff changeset	170
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	171 QApplication *qapp = m_octave_qobj.qapplication ();
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	172
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	173 m_default_style = qapp->style ()->objectName ();
26227 2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	174
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	175 QSettings *settings = resource_manager::get_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	176
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	177 bool connect_to_web = true;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	178 QDateTime last_checked;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	179 int serial = 0;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	180 m_active_dock = nullptr;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	181
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	182 if (settings)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	183 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	184 connect_to_web
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	185 = settings->value ("news/allow_web_connection", false).toBool ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	186
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	187 last_checked
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	188 = settings->value ("news/last_time_checked", QDateTime ()).toDateTime ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	189
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	190 serial = settings->value ("news/last_news_item", 0).toInt ();
25702 bd30c6f8cfb7 update internal __mfile_encoding__ when gui default encoding changes (bug #54310) Torsten <mttl@mailbox.org> parents: 25700 diff changeset	191 m_default_encoding = settings->value (ed_default_enc.key,
bd30c6f8cfb7 update internal __mfile_encoding__ when gui default encoding changes (bug #54310) Torsten <mttl@mailbox.org> parents: 25700 diff changeset	192 ed_default_enc.def).toString ();
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	193 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	194
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	195 QDateTime current = QDateTime::currentDateTime ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	196 QDateTime one_day_ago = current.addDays (-1);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	197
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	198 if (connect_to_web
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	199 && (! last_checked.isValid () \|\| one_day_ago > last_checked))
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	200 load_and_display_community_news (serial);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	201
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	202 construct_octave_qt_link ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	203
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	204 // We have to set up all our windows, before we finally launch
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	205 // octave.
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	206
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	207 construct ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	208
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	209 read_settings ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	210
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	211 init_terminal_size ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	212
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	213 // Connect signals for changes in visibility not before window is
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	214 // shown.
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	215
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	216 connect_visibility_changed ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	217
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	218 focus_command_window ();
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	219 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	220
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	221 main_window::~main_window (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	222 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	223 // Destroy the terminal first so that STDERR stream is redirected back
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	224 // to its original pipe to capture error messages at exit.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	225
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	226 delete m_editor_window; // first one for dialogs of modified editor-tabs
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	227 delete m_external_editor;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	228 delete m_command_window;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	229 delete m_workspace_window;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	230 delete m_doc_browser_window;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	231 delete m_file_browser_window;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	232 delete m_history_window;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	233 delete m_status_bar;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	234 delete m_workspace_model;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	235 delete m_variable_editor_window;
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	236
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	237 delete m_find_files_dlg;
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	238 delete m_release_notes_window;
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	239 delete m_settings_dlg;
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	240 delete m_community_news_window;
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	241 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	242
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	243 bool main_window::command_window_has_focus (void) const
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	244 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	245 return m_command_window->has_focus ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	246 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	247
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	248 void main_window::focus_command_window (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	249 {
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	250 m_command_window->activate ();
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	251 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	252
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	253 // catch focus changes and determine the active dock widget
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	254 void main_window::focus_changed (QWidget , QWidget new_widget)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	255 {
24772 860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	256 // If there is no new widget (e.g., when pressing <alt> and the global
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	257 // menu gets active, we can return immediately
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	258 if (! new_widget)
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	259 return;
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	260
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	261 octave_dock_widget *dock = nullptr;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	262 QWidget *w_new = new_widget; // get a copy of new focus widget
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	263 QWidget *start = w_new; // Save it as start of our search
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	264 int count = 0; // fallback to prevent endless loop
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	265
24772 860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	266 QList<octave_dock_widget *> w_list = dock_widget_list ();
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	267
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	268 while (w_new && w_new != m_main_tool_bar && count < 100)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	269 {
24772 860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	270 // Go through all dock widgets and check whether the current widget
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	271 // widget with focus is a child of one of it
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	272 foreach (octave_dock_widget *w, w_list)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	273 {
24772 860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	274 if (w->isAncestorOf (w_new))
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	275 dock = w;
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	276 }
24772 860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	277
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	278 if (dock)
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	279 break;
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	280
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	281 // If not yet found (in case w_new is not a childs of its dock widget),
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	282 // test next widget in the focus chain
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	283 w_new = qobject_cast<QWidget *> (w_new->previousInFocusChain ());
24772 860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	284
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	285 // Measures preventing an endless loop
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	286 if (w_new == start)
24772 860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	287 break; // We have arrived where we began ==> exit loop
860860e2e69e fix focus change between dock widgets of gui Torsten <mttl@mailbox.org> parents: 24729 diff changeset	288 count++; // Limited number of trials
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	289 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	290
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	291 // editor needs extra handling
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	292 octave_dock_widget *edit_dock_widget
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	293 = static_cast<octave_dock_widget *> (m_editor_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	294 // if new dock has focus, emit signal and store active focus
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	295 // except editor changes to a dialog (dock=0)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	296 if ((dock \|\| m_active_dock != edit_dock_widget) && (dock != m_active_dock))
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	297 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	298 // signal to all dock widgets for updating the style
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	299 emit active_dock_changed (m_active_dock, dock);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	300
26555 84e0e0b6493e * main-window.cc (focus_changed): prevent accessing null pointer (bug #55440) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	301 if (dock)
84e0e0b6493e * main-window.cc (focus_changed): prevent accessing null pointer (bug #55440) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	302 {
84e0e0b6493e * main-window.cc (focus_changed): prevent accessing null pointer (bug #55440) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	303 QList<QDockWidget *> tabbed = tabifiedDockWidgets (dock);
84e0e0b6493e * main-window.cc (focus_changed): prevent accessing null pointer (bug #55440) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	304 if (tabbed.contains (m_active_dock))
84e0e0b6493e * main-window.cc (focus_changed): prevent accessing null pointer (bug #55440) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	305 dock->set_predecessor_widget (m_active_dock);
84e0e0b6493e * main-window.cc (focus_changed): prevent accessing null pointer (bug #55440) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	306 }
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	307
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	308 if (edit_dock_widget == dock)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	309 emit editor_focus_changed (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	310 else if (edit_dock_widget == m_active_dock)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	311 emit editor_focus_changed (false);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	312
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	313 m_active_dock = dock;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	314 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	315 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	316
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	317 void main_window::request_reload_settings (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	318 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	319 QSettings *settings = resource_manager::get_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	320
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	321 if (settings)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	322 emit settings_changed (settings);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	323 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	324
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	325 void main_window::report_status_message (const QString& statusMessage)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	326 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	327 m_status_bar->showMessage (statusMessage, 1000);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	328 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	329
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	330 void main_window::handle_save_workspace_request (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	331 {
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	332 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	333 int opts = 0; // No options by default.
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	334 if (! resource_manager::get_settings ()->value ("use_native_file_dialogs",
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	335 true).toBool ())
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	336 opts = QFileDialog::DontUseNativeDialog;
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	337
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	338 QString file
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	339 = QFileDialog::getSaveFileName (this, tr ("Save Workspace As"), ".",
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	340 nullptr, nullptr, QFileDialog::Option (opts));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	341
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	342 if (! file.isEmpty ())
25723 22544083fe2c use common callback for workspace actions initiated by gui Torsten <mttl@mailbox.org> parents: 25703 diff changeset	343 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	344 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	345 = __get_event_manager__ ("main_window::handle_save_workspace_request");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	346
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	347 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	348 ([file] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	349 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	350 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	351
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	352 interpreter& interp
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	353 = __get_interpreter__ ("main_window::handle_save_workspace_request");
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	354
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	355 Fsave (interp, ovl (file.toStdString ()));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	356 });
25723 22544083fe2c use common callback for workspace actions initiated by gui Torsten <mttl@mailbox.org> parents: 25703 diff changeset	357 }
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	358 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	359
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	360 void main_window::handle_load_workspace_request (const QString& file_arg)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	361 {
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	362 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	363 int opts = 0; // No options by default.
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	364 if (! resource_manager::get_settings ()->value ("use_native_file_dialogs",
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	365 true).toBool ())
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	366 opts = QFileDialog::DontUseNativeDialog;
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	367
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	368 QString file = file_arg;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	369
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	370 if (file.isEmpty ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	371 file = QFileDialog::getOpenFileName (this, tr ("Load Workspace"), ".",
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	372 nullptr, nullptr, QFileDialog::Option (opts));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	373
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	374 if (! file.isEmpty ())
25723 22544083fe2c use common callback for workspace actions initiated by gui Torsten <mttl@mailbox.org> parents: 25703 diff changeset	375 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	376 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	377 = __get_event_manager__ ("main_window::handle_load_workspace_request");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	378
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	379 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	380 ([file] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	381 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	382 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	383
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	384 interpreter& interp
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	385 = __get_interpreter__ ("main_window::handle_load_workspace_request");
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	386
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	387 Fload (interp, ovl (file.toStdString ()));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	388
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	389 tree_evaluator& tw = interp.get_evaluator ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	390
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	391 event_manager& xevmgr = interp.get_event_manager ();
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	392
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	393 xevmgr.set_workspace (true, tw.get_symbol_info ());
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	394 });
25723 22544083fe2c use common callback for workspace actions initiated by gui Torsten <mttl@mailbox.org> parents: 25703 diff changeset	395 }
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	396 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	397
25408 ce725103ebf1 Fallback to open.m for opening files in the gui file browser (bug #50543) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25407 diff changeset	398 void main_window::handle_open_any_request (const QString& file_arg)
ce725103ebf1 Fallback to open.m for opening files in the gui file browser (bug #50543) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25407 diff changeset	399 {
ce725103ebf1 Fallback to open.m for opening files in the gui file browser (bug #50543) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25407 diff changeset	400 if (! file_arg.isEmpty ())
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	401 {
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	402 std::string file = file_arg.toStdString ();
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	403
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	404 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	405 = __get_event_manager__ ("main_window::handle_open_any_request");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	406
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	407 evmgr.post_event
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	408 ([file] (void)
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	409 {
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	410 // INTERPRETER THREAD
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	411
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	412 interpreter& interp
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	413 = __get_interpreter__ ("main_window::handle_open_any_request");
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	414
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	415 feval ("open", ovl (file));
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	416
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	417 // Update the workspace since open.m may have loaded new
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	418 // variables.
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	419 tree_evaluator& tw = interp.get_evaluator ();
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	420
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	421 event_manager& xevmgr = interp.get_event_manager ();
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	422
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	423 xevmgr.set_workspace (true, tw.get_symbol_info ());
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	424 });
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	425 }
25408 ce725103ebf1 Fallback to open.m for opening files in the gui file browser (bug #50543) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25407 diff changeset	426 }
ce725103ebf1 Fallback to open.m for opening files in the gui file browser (bug #50543) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25407 diff changeset	427
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	428 void main_window::handle_clear_workspace_request (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	429 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	430 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	431 = __get_event_manager__ ("main_window::handle_clear_workspace_request");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	432
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	433 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	434 ([] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	435 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	436 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	437
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	438 interpreter& interp
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	439 = __get_interpreter__ ("main_window::handle_clear_workspace_request");
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	440
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	441 Fclear (interp);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	442 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	443 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	444
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	445 void main_window::handle_clear_command_window_request (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	446 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	447 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	448 = __get_event_manager__ ("main_window::handle_clear_command_window_request");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	449
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	450 evmgr.post_event
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	451 ([] (void)
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	452 {
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	453 // INTERPRETER THREAD
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	454
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	455 command_editor::kill_full_line ();
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	456 command_editor::clear_screen ();
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	457 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	458 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	459
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	460 void main_window::handle_clear_history_request (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	461 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	462 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	463 = __get_event_manager__ ("main_window::handle_clear_history_request");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	464
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	465 evmgr.post_event
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	466 ([] (void)
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	467 {
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	468 // INTERPRETER THREAD
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	469
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	470 history_system& history_sys
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	471 = __get_history_system__ ("main_window::clear_history_request");
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	472
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	473 history_sys.do_history (ovl ("-c"));
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	474 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	475 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	476
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	477 void main_window::handle_undo_request (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	478 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	479 if (command_window_has_focus ())
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	480 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	481 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	482 = __get_event_manager__ ("main_window::handle_undo_request");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	483
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	484 evmgr.post_event
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	485 ([] (void)
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	486 {
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	487 // INTERPRETER THREAD
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	488
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	489 command_editor::undo ();
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	490 command_editor::redisplay ();
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	491 });
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	492 }
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	493 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	494 emit undo_signal ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	495 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	496
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	497 void main_window::handle_rename_variable_request (const QString& old_name_arg,
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	498 const QString& new_name_arg)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	499
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	500 {
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	501 std::string old_name = old_name_arg.toStdString ();
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	502 std::string new_name = new_name_arg.toStdString ();
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	503
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	504 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	505 = __get_event_manager__ ("main_window::handle_rename_variable_request");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	506
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	507 evmgr.post_event
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	508 ([old_name, new_name] (void)
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	509 {
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	510 // INTERPRETER THREAD
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	511
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	512 interpreter& interp
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	513 = __get_interpreter__ ("main_window::rename_variable_request");
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	514
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	515 symbol_scope scope = interp.get_current_scope ();
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	516
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	517 if (scope)
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	518 {
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	519 scope.rename (old_name, new_name);
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	520
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	521 tree_evaluator& tw = interp.get_evaluator ();
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	522
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	523 event_manager& xevmgr = interp.get_event_manager ();
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	524
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	525 xevmgr.set_workspace (true, tw.get_symbol_info ());
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	526 }
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	527
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	528 // FIXME: if this action fails, do we need a way to display that info
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	529 // in the GUI?
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	530 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	531 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	532
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	533 void main_window::new_file (const QString& commands)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	534 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	535 emit new_file_signal (commands);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	536 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	537
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	538 void main_window::open_file (const QString& file_name, int line)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	539 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	540 if (line < 0)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	541 emit open_file_signal (file_name);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	542 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	543 emit open_file_signal (file_name, QString (), line);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	544 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	545
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	546 void main_window::edit_mfile (const QString& name, int line)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	547 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	548 handle_edit_mfile_request (name, QString (), QString (), line);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	549 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	550
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25723 diff changeset	551 void main_window::file_remove_proxy (const QString& o, const QString& n)
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25723 diff changeset	552 {
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	553 interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	554
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	555 qt_interpreter_events *qt_link = interp_qobj->qt_link ();
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	556
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25723 diff changeset	557 // Wait for worker to suspend
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	558 qt_link->lock ();
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25723 diff changeset	559
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25723 diff changeset	560 // Close the file if opened
27039 32d9f57d7245 fix missing unlock of mutex when gui editor is not present (bug #56097) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	561 #if defined (HAVE_QSCINTILLA)
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25723 diff changeset	562 m_editor_window->handle_file_remove (o, n);
27041 6caf75200854 build: Silence unused parameter warning created in cset 43f6f02dd91c (bug #56097). Rik <rik@octave.org> parents: 27039 diff changeset	563 #else
6caf75200854 build: Silence unused parameter warning created in cset 43f6f02dd91c (bug #56097). Rik <rik@octave.org> parents: 27039 diff changeset	564 octave_unused_parameter (o);
6caf75200854 build: Silence unused parameter warning created in cset 43f6f02dd91c (bug #56097). Rik <rik@octave.org> parents: 27039 diff changeset	565 octave_unused_parameter (n);
27039 32d9f57d7245 fix missing unlock of mutex when gui editor is not present (bug #56097) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	566 #endif
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25723 diff changeset	567
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25723 diff changeset	568 // We are done: Unlock and wake the worker thread
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	569 qt_link->unlock ();
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	570 qt_link->wake_all ();
25742 d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25723 diff changeset	571 }
d3c6de326bae close/reload editor tab when file is (re)moved in gui terminal (bug #43922) Torsten <mttl@mailbox.org> parents: 25723 diff changeset	572
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	573 void main_window::open_online_documentation_page (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	574 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	575 QDesktopServices::openUrl
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	576 (QUrl ("https://octave.org/doc/interpreter/index.html"));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	577 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	578
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	579 void main_window::display_release_notes (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	580 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	581 if (! m_release_notes_window)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	582 {
25460 627d6bde9b8d solve installation info initialization problem differently John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	583 std::string news_file = config::oct_etc_dir () + "/NEWS";
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	584
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	585 QString news;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	586
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	587 QFile *file = new QFile (QString::fromStdString (news_file));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	588 if (file->open (QFile::ReadOnly))
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	589 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	590 QTextStream *stream = new QTextStream (file);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	591 news = stream->readAll ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	592 if (! news.isEmpty ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	593 {
25251 0bc58956aa40 Escape '<', '>' in NEWS file before it is displayed as HTML in Release Notes window (bug #53642). Rik <rik@octave.org> parents: 25103 diff changeset	594 // Convert '<', '>' which would be interpreted as HTML
0bc58956aa40 Escape '<', '>' in NEWS file before it is displayed as HTML in Release Notes window (bug #53642). Rik <rik@octave.org> parents: 25103 diff changeset	595 news.replace ("<", "<");
0bc58956aa40 Escape '<', '>' in NEWS file before it is displayed as HTML in Release Notes window (bug #53642). Rik <rik@octave.org> parents: 25103 diff changeset	596 news.replace (">", ">");
0bc58956aa40 Escape '<', '>' in NEWS file before it is displayed as HTML in Release Notes window (bug #53642). Rik <rik@octave.org> parents: 25103 diff changeset	597 // Add HTML tags for pre-formatted text
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	598 news.prepend ("<pre>");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	599 news.append ("</pre>");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	600 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	601 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	602 news = (tr ("The release notes file '%1' is empty.")
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	603 . arg (QString::fromStdString (news_file)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	604 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	605 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	606 news = (tr ("The release notes file '%1' cannot be read.")
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	607 . arg (QString::fromStdString (news_file)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	608
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	609 m_release_notes_window = new QWidget;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	610
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	611 QTextBrowser *browser = new QTextBrowser (m_release_notes_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	612 browser->setText (news);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	613
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	614 QVBoxLayout *vlayout = new QVBoxLayout;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	615 vlayout->addWidget (browser);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	616
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	617 m_release_notes_window->setLayout (vlayout);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	618 m_release_notes_window->setWindowTitle (tr ("Octave Release Notes"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	619
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	620 browser->document ()->adjustSize ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	621
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	622 // center the window on the screen where octave is running
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	623 QDesktopWidget *m_desktop = QApplication::desktop ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	624 int screen = m_desktop->screenNumber (this); // screen of the main window
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	625 QRect screen_geo = m_desktop->availableGeometry (screen);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	626 int win_x = screen_geo.width (); // width of the screen
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	627 int win_y = screen_geo.height (); // height of the screen
26643 5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	628 int reln_x = win_x*2/5; // desired width of release notes
5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	629 int reln_y = win_y*2/3; // desired height of release notes
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	630 m_release_notes_window->resize (reln_x, reln_y); // set size
26643 5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	631 m_release_notes_window->move (20, 20); // move to the top left corner
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	632 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	633
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	634 if (! m_release_notes_window->isVisible ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	635 m_release_notes_window->show ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	636 else if (m_release_notes_window->isMinimized ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	637 m_release_notes_window->showNormal ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	638
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	639 m_release_notes_window->setWindowIcon (QIcon (m_release_notes_icon));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	640
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	641 m_release_notes_window->raise ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	642 m_release_notes_window->activateWindow ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	643 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	644
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	645 void main_window::load_and_display_community_news (int serial)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	646 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	647 QSettings *settings = resource_manager::get_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	648
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	649 bool connect_to_web
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	650 = (settings
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	651 ? settings->value ("news/allow_web_connection", false).toBool ()
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	652 : true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	653
25024 3c817af70eed maint: use https for all Octave project URLs Mike Miller <mtmiller@octave.org> parents: 24792 diff changeset	654 QString base_url = "https://octave.org";
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	655 QString page = "community-news.html";
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	656
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	657 QThread *worker_thread = new QThread;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	658
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	659 news_reader *reader = new news_reader (base_url, page, serial,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	660 connect_to_web);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	661
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	662 reader->moveToThread (worker_thread);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	663
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	664 connect (reader, SIGNAL (display_news_signal (const QString&)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	665 this, SLOT (display_community_news (const QString&)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	666
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	667 connect (worker_thread, SIGNAL (started (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	668 reader, SLOT (process (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	669
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	670 connect (reader, SIGNAL (finished (void)), worker_thread, SLOT (quit (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	671
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	672 connect (reader, SIGNAL (finished (void)), reader, SLOT (deleteLater (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	673
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	674 connect (worker_thread, SIGNAL (finished (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	675 worker_thread, SLOT (deleteLater (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	676
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	677 worker_thread->start ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	678 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	679
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	680 void main_window::display_community_news (const QString& news)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	681 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	682 if (! m_community_news_window)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	683 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	684 m_community_news_window = new QWidget;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	685
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	686 QTextBrowser *browser = new QTextBrowser (m_community_news_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	687
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	688 browser->setHtml (news);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	689 browser->setObjectName ("OctaveNews");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	690 browser->setOpenExternalLinks (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	691
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	692 QVBoxLayout *vlayout = new QVBoxLayout;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	693
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	694 vlayout->addWidget (browser);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	695
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	696 m_community_news_window->setLayout (vlayout);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	697 m_community_news_window->setWindowTitle (tr ("Octave Community News"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	698
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	699 // center the window on the screen where octave is running
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	700 QDesktopWidget *m_desktop = QApplication::desktop ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	701 int screen = m_desktop->screenNumber (this); // screen of the main window
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	702 QRect screen_geo = m_desktop->availableGeometry (screen);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	703 int win_x = screen_geo.width (); // width of the screen
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	704 int win_y = screen_geo.height (); // height of the screen
26643 5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	705 int news_x = win_x/2; // desired width of news window
5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	706 int news_y = win_y/2; // desired height of news window
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	707 m_community_news_window->resize (news_x, news_y); // set size and center
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	708 m_community_news_window->move ((win_x - m_community_news_window->width ())/2,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	709 (win_y - m_community_news_window->height ())/2);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	710 }
25805 ae2c9f1427f0 update news window contents when community news are requeted a second time Torsten <mttl@mailbox.org> parents: 25742 diff changeset	711 else
ae2c9f1427f0 update news window contents when community news are requeted a second time Torsten <mttl@mailbox.org> parents: 25742 diff changeset	712 {
ae2c9f1427f0 update news window contents when community news are requeted a second time Torsten <mttl@mailbox.org> parents: 25742 diff changeset	713 // Window already exists, just update the browser contents
ae2c9f1427f0 update news window contents when community news are requeted a second time Torsten <mttl@mailbox.org> parents: 25742 diff changeset	714 QTextBrowser *browser
25819 182e891789f5 fix libgui build failure with Qt 4.8 Mike Miller <mtmiller@octave.org> parents: 25805 diff changeset	715
182e891789f5 fix libgui build failure with Qt 4.8 Mike Miller <mtmiller@octave.org> parents: 25805 diff changeset	716 = m_community_news_window->findChild<QTextBrowser *>("OctaveNews"
182e891789f5 fix libgui build failure with Qt 4.8 Mike Miller <mtmiller@octave.org> parents: 25805 diff changeset	717 #if defined (QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS)
182e891789f5 fix libgui build failure with Qt 4.8 Mike Miller <mtmiller@octave.org> parents: 25805 diff changeset	718 , Qt::FindDirectChildrenOnly
182e891789f5 fix libgui build failure with Qt 4.8 Mike Miller <mtmiller@octave.org> parents: 25805 diff changeset	719 #endif
182e891789f5 fix libgui build failure with Qt 4.8 Mike Miller <mtmiller@octave.org> parents: 25805 diff changeset	720 );
25805 ae2c9f1427f0 update news window contents when community news are requeted a second time Torsten <mttl@mailbox.org> parents: 25742 diff changeset	721 if (browser)
ae2c9f1427f0 update news window contents when community news are requeted a second time Torsten <mttl@mailbox.org> parents: 25742 diff changeset	722 browser->setHtml (news);
ae2c9f1427f0 update news window contents when community news are requeted a second time Torsten <mttl@mailbox.org> parents: 25742 diff changeset	723 }
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	724
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	725 if (! m_community_news_window->isVisible ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	726 m_community_news_window->show ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	727 else if (m_community_news_window->isMinimized ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	728 m_community_news_window->showNormal ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	729
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	730 // same icon as release notes
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	731 m_community_news_window->setWindowIcon (QIcon (m_release_notes_icon));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	732
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	733 m_community_news_window->raise ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	734 m_community_news_window->activateWindow ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	735 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	736
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	737 void main_window::open_bug_tracker_page (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	738 {
25024 3c817af70eed maint: use https for all Octave project URLs Mike Miller <mtmiller@octave.org> parents: 24792 diff changeset	739 QDesktopServices::openUrl (QUrl ("https://octave.org/bugs.html"));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	740 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	741
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	742 void main_window::open_octave_packages_page (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	743 {
25024 3c817af70eed maint: use https for all Octave project URLs Mike Miller <mtmiller@octave.org> parents: 24792 diff changeset	744 QDesktopServices::openUrl (QUrl ("https://octave.org/packages.html"));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	745 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	746
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	747 void main_window::open_contribute_page (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	748 {
25024 3c817af70eed maint: use https for all Octave project URLs Mike Miller <mtmiller@octave.org> parents: 24792 diff changeset	749 QDesktopServices::openUrl (QUrl ("https://octave.org/contribute.html"));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	750 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	751
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	752 void main_window::open_donate_page (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	753 {
25024 3c817af70eed maint: use https for all Octave project URLs Mike Miller <mtmiller@octave.org> parents: 24792 diff changeset	754 QDesktopServices::openUrl (QUrl ("https://octave.org/donate.html"));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	755 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	756
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	757 void main_window::process_settings_dialog_request (const QString& desired_tab)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	758 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	759 if (m_settings_dlg) // m_settings_dlg is a guarded pointer!
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	760 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	761 // here the dialog is still open and called once again
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	762 if (! desired_tab.isEmpty ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	763 m_settings_dlg->show_tab (desired_tab);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	764 return;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	765 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	766
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	767 m_settings_dlg = new settings_dialog (this, desired_tab);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	768
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	769 connect (m_settings_dlg, SIGNAL (apply_new_settings (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	770 this, SLOT (request_reload_settings (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	771
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	772 m_settings_dlg->setModal (false);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	773 m_settings_dlg->setAttribute (Qt::WA_DeleteOnClose);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	774 m_settings_dlg->show ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	775 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	776
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	777 void main_window::show_about_octave (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	778 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	779 std::string message
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	780 = octave_name_version_copyright_copying_warranty_and_bugs (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	781
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	782 QMessageBox::about (this, tr ("About Octave"),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	783 QString::fromStdString (message));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	784 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	785
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	786 void main_window::notice_settings (const QSettings *settings)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	787 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	788 // QSettings pointer is checked before emitting.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	789
26227 2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	790 // Get desired style from preferences or take the default one if
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	791 // the desired one is not found
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	792 QString preferred_style
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	793 = settings->value (global_style.key, global_style.def).toString ();
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	794
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	795 if (preferred_style == global_style.def.toString ())
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	796 preferred_style = m_default_style;
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	797
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	798 QStyle *new_style = QStyleFactory::create (preferred_style);
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	799 if (new_style)
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	800 {
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	801 QApplication *qapp = m_octave_qobj.qapplication ();
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	802
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	803 qapp->setStyle (new_style);
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	804 }
26227 2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26117 diff changeset	805
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	806 // the widget's icons (when floating)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	807 QString icon_set
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	808 = settings->value ("DockWidgets/widget_icon_set", "NONE").toString ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	809
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	810 static struct
19422 476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	811 {
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	812 QString name;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	813 QString path;
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	814 }
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	815
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	816 widget_icon_data[] =
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	817 {
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	818 // array of possible icon sets (name, path (complete for NONE))
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	819 // the first entry here is the default!
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	820 {"NONE", ":/actions/icons/logo.png"},
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	821 {"GRAPHIC", ":/actions/icons/graphic_logo_"},
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	822 {"LETTER", ":/actions/icons/letter_logo_"},
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	823 {"", ""} // end marker has empty name
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	824 };
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	825
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	826 int count = 0;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	827 int icon_set_found = 0; // default
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	828
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	829 while (! widget_icon_data[count].name.isEmpty ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	830 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	831 // while not end of data
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	832 if (widget_icon_data[count].name == icon_set)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	833 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	834 // data of desired icon set found
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	835 icon_set_found = count;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	836 break;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	837 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	838 count++;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	839 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	840
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	841 QString icon;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	842 foreach (octave_dock_widget *widget, dock_widget_list ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	843 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	844 QString name = widget->objectName ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	845 if (! name.isEmpty ())
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	846 {
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	847 // if children has a name
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	848 icon = widget_icon_data[icon_set_found].path; // prefix \| octave-logo
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	849 if (widget_icon_data[icon_set_found].name != "NONE")
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	850 icon += name + ".png"; // add widget name and ext.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	851 widget->setWindowIcon (QIcon (icon));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	852 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	853 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	854 if (widget_icon_data[icon_set_found].name != "NONE")
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	855 m_release_notes_icon = widget_icon_data[icon_set_found].path
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	856 + "ReleaseWidget.png";
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	857 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	858 m_release_notes_icon = ":/actions/icons/logo.png";
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	859
26058 ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25994 diff changeset	860 int size_idx = settings->value (global_icon_size.key,
ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25994 diff changeset	861 global_icon_size.def).toInt ();
ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25994 diff changeset	862 size_idx = (size_idx > 0) - (size_idx < 0) + 1; // Make valid index from 0 to 2
ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25994 diff changeset	863
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	864 QStyle *st = style ();
26058 ecd86b8b8979 use constants for icon size preferences instead of hard coded numbers Torsten <mttl@mailbox.org> parents: 25994 diff changeset	865 int icon_size = st->pixelMetric (global_icon_sizes[size_idx]);
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	866 m_main_tool_bar->setIconSize (QSize (icon_size,icon_size));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	867
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	868 if (settings->value ("show_status_bar",true).toBool ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	869 m_status_bar->show ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	870 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	871 m_status_bar->hide ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	872
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	873 m_prevent_readline_conflicts
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	874 = settings->value ("shortcuts/prevent_readline_conflicts", true).toBool ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	875
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	876 m_suppress_dbg_location
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	877 = ! settings->value ("terminal/print_debug_location", false).toBool ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	878
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	879 resource_manager::update_network_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	880
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	881 emit active_dock_changed (nullptr, m_active_dock); // update dock widget styles
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	882
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	883 configure_shortcuts ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	884 set_global_shortcuts (m_active_dock == m_command_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	885 disable_menu_shortcuts (m_active_dock == m_editor_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	886
27270 47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	887 // Check whether some octave internal preferences have to be updated
25702 bd30c6f8cfb7 update internal __mfile_encoding__ when gui default encoding changes (bug #54310) Torsten <mttl@mailbox.org> parents: 25700 diff changeset	888 QString new_default_encoding
bd30c6f8cfb7 update internal __mfile_encoding__ when gui default encoding changes (bug #54310) Torsten <mttl@mailbox.org> parents: 25700 diff changeset	889 = settings->value (ed_default_enc.key, ed_default_enc.def).toString ();
bd30c6f8cfb7 update internal __mfile_encoding__ when gui default encoding changes (bug #54310) Torsten <mttl@mailbox.org> parents: 25700 diff changeset	890 if (new_default_encoding != m_default_encoding)
27270 47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	891 update_default_encoding (new_default_encoding);
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	892
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	893 // Set cursor blinking depending on the settings
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	894 // Cursor blinking: consider old terminal related setting if not yet set
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	895 // TODO: This pref. can be deprecated / removed if Qt adds support for
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	896 // getting the cursor blink preferences from all OS environments
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	897 bool cursor_blinking;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	898
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	899 if (settings->contains ("cursor_blinking"))
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	900 cursor_blinking = settings->value ("cursor_blinking",true).toBool ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	901 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	902 cursor_blinking = settings->value ("terminal/cursorBlinking",true).toBool ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	903
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	904 if (cursor_blinking)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	905 QApplication::setCursorFlashTime (1000); // 1000 ms flash time
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	906 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	907 QApplication::setCursorFlashTime (0); // no flashing
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	908
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	909 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	910
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	911 bool main_window::confirm_shutdown_octave (void)
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	912 {
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	913 bool closenow = true;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	914
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	915 QSettings *settings = resource_manager::get_settings ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	916
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	917 if (settings->value ("prompt_to_exit", false).toBool ())
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	918 {
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	919 int ans = QMessageBox::question (this, tr ("Octave"),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	920 tr ("Are you sure you want to exit Octave?"),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	921 (QMessageBox::Ok
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	922 \| QMessageBox::Cancel),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	923 QMessageBox::Ok);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	924
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	925 if (ans != QMessageBox::Ok)
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	926 closenow = false;
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	927 }
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	928
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	929 #if defined (HAVE_QSCINTILLA)
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	930 if (closenow)
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	931 closenow = m_editor_window->check_closing ();
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	932 #endif
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	933
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	934 return closenow;
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	935 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	936
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	937 void main_window::prepare_to_exit (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	938 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	939 // Find files dialog is constructed dynamically, not at time of main_window
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	940 // construction. Connecting it to qApp aboutToQuit signal would have
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	941 // caused it to run after QSettings deleted.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	942 if (m_find_files_dlg)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	943 m_find_files_dlg->save_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	944
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	945 write_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	946 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	947
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	948 void main_window::reset_windows (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	949 {
26307 a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	950 hide ();
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	951 set_window_layout (nullptr); // do not use the settings file
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	952 showNormal (); // make sure main window is not minimized
24792 3390adaee21d * main-window.cc (reset_windows): set focus to console after resetting window layout Torsten <mttl@mailbox.org> parents: 24772 diff changeset	953 focus_command_window ();
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	954 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	955
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	956 void main_window::change_directory (const QString& dir)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	957 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	958 // Remove existing entry, if any, then add new directory at top and
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	959 // mark it as the current directory. Finally, update the file list
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	960 // widget.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	961
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	962 int index = m_current_directory_combo_box->findText (dir);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	963
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	964 if (index >= 0)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	965 m_current_directory_combo_box->removeItem (index);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	966
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	967 m_current_directory_combo_box->insertItem (0, dir);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	968 m_current_directory_combo_box->setCurrentIndex (0);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	969 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	970
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	971 void main_window::browse_for_directory (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	972 {
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	973 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	974 int opts = QFileDialog::ShowDirsOnly;
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	975 if (! resource_manager::get_settings ()->value ("use_native_file_dialogs",
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	976 true).toBool ())
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	977 opts = QFileDialog::DontUseNativeDialog;
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	978
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	979 QString dir
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	980 = QFileDialog::getExistingDirectory (this, tr ("Browse directories"), nullptr,
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	981 QFileDialog::Option (opts));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	982
15626 1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	983 set_current_working_directory (dir);
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	984
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	985 // FIXME: on Windows systems, the command window freezes after the
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	986 // previous actions. Forcing the focus appears to unstick it.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	987
24019 fc4ba8b1ff87 style fixes for GUI main window John W. Eaton <jwe@octave.org> parents: 24016 diff changeset	988 focus_command_window ();
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	989 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	990
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	991 void main_window::set_current_working_directory (const QString& dir)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	992 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	993 // Change to dir if it is an existing directory.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	994
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	995 QString xdir = (dir.isEmpty () ? "." : dir);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	996
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	997 QFileInfo fileInfo (xdir);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	998
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	999 if (fileInfo.exists () && fileInfo.isDir ())
25703 7b4e99fbe9d4 include builtin functions without interpreter argument being into octave_cmd Torsten <mttl@mailbox.org> parents: 25702 diff changeset	1000 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1001 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1002 = __get_event_manager__ ("main_window::set_current_working_directory");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1003
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1004 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1005 ([xdir] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1006 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1007 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1008
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1009 Fcd (ovl (xdir.toStdString ()));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1010 });
25703 7b4e99fbe9d4 include builtin functions without interpreter argument being into octave_cmd Torsten <mttl@mailbox.org> parents: 25702 diff changeset	1011 }
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1012 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1013
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1014 void main_window::change_directory_up (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1015 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1016 set_current_working_directory ("..");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1017 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1018
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1019 // Slot that is called if return is pressed in the line edit of the
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1020 // combobox to change to a new directory or a directory that is already
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1021 // in the drop down list.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1022
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1023 void main_window::accept_directory_line_edit (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1024 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1025 // Get new directory name, and change to it if it is new. Otherwise,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1026 // the combo box will triggers the "activated" signal to change to the
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1027 // directory.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1028
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1029 QString dir = m_current_directory_combo_box->currentText ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1030
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1031 int index = m_current_directory_combo_box->findText (dir);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1032
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1033 if (index < 0)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1034 set_current_working_directory (dir);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1035 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1036
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1037 void main_window::execute_command_in_terminal (const QString& command)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1038 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1039 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1040 = __get_event_manager__ ("main_window::execute_command_in_terminal");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1041
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1042 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1043 ([command] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1044 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1045 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1046
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1047 std::string pending_input = command_editor::get_current_line ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1048
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1049 command_editor::set_initial_input (pending_input);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1050 command_editor::replace_line (command.toStdString ());
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1051 command_editor::redisplay ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1052 command_editor::accept_line ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1053 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1054
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1055 if (focus_console_after_command ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1056 focus_command_window ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1057 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1058
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1059 void main_window::run_file_in_terminal (const QFileInfo& info)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1060 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1061 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1062 = __get_event_manager__ ("main_window::run_file_in_terminal");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1063
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1064 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1065 ([info] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1066 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1067 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1068
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1069 QString function_name = info.fileName ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1070 function_name.chop (info.suffix ().length () + 1);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1071 std::string file_path = info.absoluteFilePath ().toStdString ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1072
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1073 std::string pending_input = command_editor::get_current_line ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1074
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1075 if (valid_identifier (function_name.toStdString ()))
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1076 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1077 // Valid identifier: call as function with possibility to
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1078 // debug.
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1079
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1080 std::string path = info.absolutePath ().toStdString ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1081
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1082 if (qt_interpreter_events::file_in_path (file_path, path))
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1083 command_editor::replace_line (function_name.toStdString ());
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1084 }
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1085 else
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1086 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1087 interpreter& interp
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1088 = __get_interpreter__ ("main_window::run_file_in_terminal");
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1089
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1090 // No valid identifier: use equivalent of Fsource (), no
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1091 // debug possible.
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1092
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1093 interp.source_file (file_path);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1094
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1095 command_editor::replace_line ("");
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1096 }
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1097
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1098 command_editor::set_initial_input (pending_input);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1099 command_editor::redisplay ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1100
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1101 command_editor::accept_line ();
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1102 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1103
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1104 if (focus_console_after_command ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1105 focus_command_window ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1106 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1107
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1108 void main_window::handle_new_figure_request (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1109 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1110 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1111 = __get_event_manager__ ("main_window::handle_new_figure_request");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1112
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1113 evmgr.post_event
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1114 ([] (void)
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1115 {
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1116 // INTERPRETER THREAD
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1117
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1118 interpreter& interp
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1119 = __get_interpreter__ ("main_window::new_figure_request");
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1120
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1121 Fbuiltin (interp, ovl ("figure"));
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1122 Fdrawnow ();
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1123 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1124 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1125
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1126 void main_window::handle_enter_debugger (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1127 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1128 setWindowTitle ("Octave (Debugging)");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1129
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1130 m_debug_continue->setEnabled (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1131 m_debug_step_into->setEnabled (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1132 m_debug_step_over->setEnabled (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1133 m_debug_step_out->setEnabled (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1134 m_debug_quit->setEnabled (true);
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	1135
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1136 #if defined (HAVE_QSCINTILLA)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1137 m_editor_window->handle_enter_debug_mode ();
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15848 diff changeset	1138 #endif
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1139 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1140
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1141 void main_window::handle_exit_debugger (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1142 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1143 setWindowTitle ("Octave");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1144
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1145 m_debug_continue->setEnabled (false);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1146 m_debug_step_into->setEnabled (false);
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	1147 m_debug_step_over->setEnabled (m_editor_has_tabs);
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1148 m_debug_step_out->setEnabled (false);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1149 m_debug_quit->setEnabled (false);
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	1150
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1151 #if defined (HAVE_QSCINTILLA)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1152 m_editor_window->handle_exit_debug_mode ();
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15848 diff changeset	1153 #endif
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1154 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1155
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1156 void main_window::debug_continue (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1157 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1158 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1159 = __get_event_manager__ ("main_window::debug_continue");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1160
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1161 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1162 ([this] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1163 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1164 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1165
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1166 interpreter& interp
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1167 = __get_interpreter__ ("main_window::debug_continue");
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1168
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1169 F__db_next_breakpoint_quiet__ (interp, ovl (m_suppress_dbg_location));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1170 Fdbcont (interp);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1171
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1172 command_editor::interrupt (true);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1173 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1174 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1175
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1176 void main_window::debug_step_into (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1177 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1178 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1179 = __get_event_manager__ ("main_window::debug_step_into");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1180
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1181 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1182 ([this] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1183 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1184 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1185
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1186 interpreter& interp
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1187 = __get_interpreter__ ("main_window::debug_step_into");
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1188
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1189 F__db_next_breakpoint_quiet__ (interp, ovl (m_suppress_dbg_location));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1190 Fdbstep (interp, ovl ("in"));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1191
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1192 command_editor::interrupt (true);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1193 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1194 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1195
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1196 void main_window::debug_step_over (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1197 {
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	1198 if (m_debug_quit->isEnabled ())
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	1199 {
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1200 // We are in debug mode, just call dbstep.
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1201
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1202 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1203 = __get_event_manager__ ("main_window::debug_step_over");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1204
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1205 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1206 ([this] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1207 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1208 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1209
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1210 interpreter& interp
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1211 = __get_interpreter__ ("main_window::debug_step_over");
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1212
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1213 F__db_next_breakpoint_quiet__ (interp, ovl (m_suppress_dbg_location));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1214 Fdbstep (interp);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1215
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1216 command_editor::interrupt (true);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1217 });
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	1218 }
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	1219 else
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	1220 {
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	1221 // Not in debug mode: "step into" the current editor file
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	1222 emit step_into_file_signal ();
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	1223 }
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1224 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1225
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1226 void main_window::debug_step_out (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1227 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1228 event_manager& evmgr = __get_event_manager__ ("main_window::debug_step_out");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1229
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1230 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1231 ([this] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1232 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1233 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1234
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1235 interpreter& interp
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1236 = __get_interpreter__ ("main_window::debug_step_out");
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1237
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1238 F__db_next_breakpoint_quiet__ (interp, ovl (m_suppress_dbg_location));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1239 Fdbstep (interp, ovl ("out"));
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1240
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1241 command_editor::interrupt (true);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1242 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1243 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1244
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1245 void main_window::debug_quit (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1246 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1247 event_manager& evmgr = __get_event_manager__ ("main_window::debug_quit");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1248
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1249 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1250 ([this] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1251 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1252 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1253
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1254 interpreter& interp
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1255 = __get_interpreter__ ("main_window::debug_quit");
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1256
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1257 Fdbquit (interp);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1258
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1259 command_editor::interrupt (true);
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1260 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1261 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1262
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1263 //
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1264 // Functions related to file editing
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1265 //
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1266 // These are moved from editor to here for also using them when octave
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1267 // is built without qscintilla
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1268 //
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1269 void main_window::request_open_file (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1270 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1271 // Open file isn't a file_editor_tab or editor function since the file
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1272 // might be opened in an external editor. Hence, functionality is here.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1273
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1274 QSettings *settings = resource_manager::get_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1275 bool is_internal = m_editor_window
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25091 diff changeset	1276 && ! settings->value ("useCustomFileEditor",false).toBool ();
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1277
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1278 // Create a NonModal message.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1279 QWidget *p = this;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1280 if (is_internal)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1281 p = m_editor_window;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1282 QFileDialog *fileDialog = new QFileDialog (p);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1283 fileDialog->setNameFilter (tr ("Octave Files (.m);;All Files ()"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1284
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1285 fileDialog->setAcceptMode (QFileDialog::AcceptOpen);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1286 fileDialog->setViewMode (QFileDialog::Detail);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1287 fileDialog->setFileMode (QFileDialog::ExistingFiles);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1288 fileDialog->setDirectory (m_current_directory_combo_box->itemText (0));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1289
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	1290 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	1291 if (! resource_manager::get_settings ()->value ("use_native_file_dialogs",
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	1292 true).toBool ())
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	1293 fileDialog->setOption(QFileDialog::DontUseNativeDialog);
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26067 diff changeset	1294
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1295 connect (fileDialog, SIGNAL (filesSelected (const QStringList&)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1296 this, SLOT (request_open_files (const QStringList&)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1297
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1298 fileDialog->setWindowModality (Qt::NonModal);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1299 fileDialog->setAttribute (Qt::WA_DeleteOnClose);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1300 fileDialog->show ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1301 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1302
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1303 // Create a new script
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1304 void main_window::request_new_script (const QString& commands)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1305 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1306 emit new_file_signal (commands);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1307 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1308
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1309 // Create a new function and open it
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1310 void main_window::request_new_function (bool)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1311 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1312 bool ok;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1313 // Get the name of the new function: Parent of the input dialog is the
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1314 // editor window or the main window. The latter is chosen, if a custom
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1315 // editor is used or qscintilla is not available
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1316 QWidget *p = m_editor_window;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1317 QSettings *settings = resource_manager::get_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1318 if (! p \|\| settings->value ("useCustomFileEditor",false).toBool ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1319 p = this;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1320 QString new_name = QInputDialog::getText (p, tr ("New Function"),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1321 tr ("New function name:\n"), QLineEdit::Normal, "", &ok);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1322
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1323 if (ok && new_name.length () > 0)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1324 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1325 // append suffix if it not already exists
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1326 if (new_name.rightRef (2) != ".m")
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1327 new_name.append (".m");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1328 // check whether new files are created without prompt
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1329 if (! settings->value ("editor/create_new_file",false).toBool ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1330 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1331 // no, so enable this settings and wait for end of new file loading
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1332 settings->setValue ("editor/create_new_file",true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1333 connect (m_editor_window, SIGNAL (file_loaded_signal (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1334 this, SLOT (restore_create_file_setting (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1335 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1336 // start the edit command
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1337 execute_command_in_terminal ("edit " + new_name);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1338 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1339 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1340
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1341 void main_window::handle_edit_mfile_request (const QString& fname,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1342 const QString& ffile,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1343 const QString& curr_dir,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1344 int line)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1345 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1346 interpreter& interp
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1347 = __get_interpreter__ ("main_window::handle_edit_mfile_request");
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1348
25925 e9c24b5e8673 fix opening a function file with an error in a nested function (bug #54801) Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1349 // Split possible subfuntions
e9c24b5e8673 fix opening a function file with an error in a nested function (bug #54801) Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1350 QStringList fcn_list = fname.split ('>');
e9c24b5e8673 fix opening a function file with an error in a nested function (bug #54801) Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1351 QString fcn_name = fcn_list.at (0) + ".m";
e9c24b5e8673 fix opening a function file with an error in a nested function (bug #54801) Torsten <mttl@mailbox.org> parents: 25923 diff changeset	1352
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1353 // Is it a regular function within the search path? (Call Fexist)
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1354 octave_value_list fct = Fexist (interp, ovl (fname.toStdString ()),0);
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1355 int type = fct (0).int_value ();
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1356
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1357 QString message = QString ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1358 QString filename = QString ();
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1359
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1360 switch (type)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1361 {
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1362 case 3:
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1363 case 5:
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1364 case 103:
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1365 message = tr ("%1 is a built-in, compiled or inline\n"
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1366 "function and can not be edited.");
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1367 break;
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1368
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1369 case 2:
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1370 octave_value_list file_path
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1371 = Ffile_in_loadpath (interp, ovl (fcn_name.toStdString ()), 0);
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1372 if (file_path.length () > 0)
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1373 filename = QString::fromStdString (file_path (0).string_value ());
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1374 break;
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1375 }
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1376
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1377 if (filename.isEmpty () && message.isEmpty ())
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1378 {
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1379 // No error so far, but function still not known
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1380 // -> try directory of edited file
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1381 // get directory
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1382 QDir dir;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1383 if (ffile.isEmpty ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1384 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1385 if (curr_dir.isEmpty ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1386 dir = QDir (m_current_directory_combo_box->itemText (0));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1387 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1388 dir = QDir (curr_dir);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1389 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1390 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1391 dir = QDir (QFileInfo (ffile).canonicalPath ());
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1392
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1393 QFileInfo file = QFileInfo (dir, fcn_name);
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1394 if (file.exists ())
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1395 filename = file.canonicalFilePath (); // local file exists
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1396 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1397 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1398 // local file does not exist -> try private directory
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1399 file = QFileInfo (ffile);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1400 file = QFileInfo (QDir (file.canonicalPath () + "/private"),
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1401 fcn_name);
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1402 if (file.exists ())
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1403 filename = file.canonicalFilePath (); // private function exists
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1404 else
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1405 message = tr ("Can not find function %1"); // no file found
cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1406
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1407 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1408 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1409
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1410 if (! message.isEmpty ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1411 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1412 QMessageBox *msgBox
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1413 = new QMessageBox (QMessageBox::Critical,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1414 tr ("Octave Editor"),
25892 cb440b43a236 fix editing an m-file with syntax error via edit ... menu (bug #54600) Torsten <mttl@mailbox.org> parents: 25883 diff changeset	1415 message.arg (fname),
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1416 QMessageBox::Ok, this);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1417
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1418 msgBox->setWindowModality (Qt::NonModal);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1419 msgBox->setAttribute (Qt::WA_DeleteOnClose);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1420 msgBox->show ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1421 return;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1422 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1423
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1424 if (! filename.endsWith (".m"))
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1425 filename.append (".m");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1426
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1427 emit open_file_signal (filename, QString (), line); // default encoding
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1428 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1429
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1430 void main_window::handle_insert_debugger_pointer_request (const QString& file,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1431 int line)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1432 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1433 bool cmd_focus = command_window_has_focus ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1434
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1435 emit insert_debugger_pointer_signal (file, line);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1436
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1437 if (cmd_focus)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1438 focus_command_window ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1439 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1440
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1441 void main_window::handle_delete_debugger_pointer_request (const QString& file,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1442 int line)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1443 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1444 bool cmd_focus = command_window_has_focus ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1445
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1446 emit delete_debugger_pointer_signal (file, line);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1447
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1448 if (cmd_focus)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1449 focus_command_window ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1450 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1451
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1452 void main_window::handle_update_breakpoint_marker_request (bool insert,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1453 const QString& file,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1454 int line,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1455 const QString& cond)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1456 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1457 bool cmd_focus = command_window_has_focus ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1458
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1459 emit update_breakpoint_marker_signal (insert, file, line, cond);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1460
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1461 if (cmd_focus)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1462 focus_command_window ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1463 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1464
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1465 void main_window::read_settings (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1466 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1467 QSettings *settings = resource_manager::get_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1468
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1469 if (! settings)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1470 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1471 qDebug ("Error: QSettings pointer from resource manager is NULL.");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1472 return;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1473 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1474
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1475 set_window_layout (settings);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1476
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1477 // restore the list of the last directories
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1478 QStringList curr_dirs
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1479 = settings->value ("MainWindow/current_directory_list").toStringList ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1480 for (int i=0; i < curr_dirs.size (); i++)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1481 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1482 m_current_directory_combo_box->addItem (curr_dirs.at (i));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1483 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1484 emit settings_changed (settings);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1485 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1486
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1487 void main_window::init_terminal_size (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1488 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1489 emit init_terminal_size_signal ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1490 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1491
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1492 void main_window::set_window_layout (QSettings *settings)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1493 {
26299 c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 26277 diff changeset	1494 // Restore main window state and geometry from settings file or, in case
c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 26277 diff changeset	1495 // of an error from the default layout
26307 a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1496 if (settings)
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1497 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	1498 if (! restoreState (settings->value (mw_state.key, mw_state.def).toByteArray ()))
26307 a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1499 restoreState (mw_state.def.toByteArray ());
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1500
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	1501 if (! restoreGeometry (settings->value (mw_geometry.key, mw_geometry.def).toByteArray ()))
26307 a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1502 restoreGeometry (mw_geometry.def.toByteArray ());
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1503 }
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1504
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1505 // Restore the geometry of all dock-widgets
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1506 foreach (octave_dock_widget *widget, dock_widget_list ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1507 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1508 QString name = widget->objectName ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1509
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1510 if (! name.isEmpty ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1511 {
26307 a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1512 bool floating = false;
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1513 bool visible = true;
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1514 if (settings)
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1515 {
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1516 floating = settings->value
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1517 ("DockWidgets/" + name + "Floating", false).toBool ();
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1518 visible = settings->value
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1519 ("DockWidgets/" + name + "Visible", true).toBool ();
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1520 }
17899 14c427b5c5c1 Restore geometry of floating widgets after restart in windows (bug #40485) Torsten <ttl@justmail.de> parents: 17890 diff changeset	1521
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1522 // If floating, make window from widget.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1523 if (floating)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1524 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1525 widget->make_window ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1526
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1527 if (visible)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1528 {
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	1529 if (settings && settings->value ("DockWidgets/" + name
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	1530 + "_minimized").toBool ())
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1531 widget->showMinimized ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1532 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1533 widget->setVisible (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1534 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1535 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1536 else // not floating
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1537 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1538 if (! widget->parent ()) // should not be floating but is
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1539 widget->make_widget (false); // no docking, just reparent
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1540
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1541 widget->make_widget ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1542 widget->setVisible (visible); // not floating -> show
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1543 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1544 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1545 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1546
26307 a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1547 if (! settings)
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1548 {
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1549 restoreGeometry (mw_geometry.def.toByteArray ());
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1550 restoreState (mw_state.def.toByteArray ());
26643 5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	1551
5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	1552 QDesktopWidget *m_desktop = QApplication::desktop ();
5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	1553 int screen = m_desktop->screenNumber (this); // screen of the main window
5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	1554 QRect screen_geo = m_desktop->availableGeometry (screen);
5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	1555
5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	1556 int win_x = screen_geo.width (); // width of the screen
5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	1557 int win_y = screen_geo.height (); // height of the screen
5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	1558
5d1f413ff746 adapt initial window sizes to the screen resolution (bug #55498) Torsten <mttl@mailbox.org> parents: 26555 diff changeset	1559 resize (std::max (width (), 2win_x/3), std::max (height (), 7win_y/8));
26307 a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1560 }
a21f58c5e573 fix resetting gui window layout Torsten <mttl@mailbox.org> parents: 26299 diff changeset	1561
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1562 show ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1563 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1564
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1565 void main_window::write_settings (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1566 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1567 QSettings *settings = resource_manager::get_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1568 if (! settings)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1569 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1570 qDebug ("Error: QSettings pointer from resource manager is NULL.");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1571 return;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1572 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1573
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1574 settings->setValue ("MainWindow/geometry", saveGeometry ());
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1575 settings->setValue ("MainWindow/windowState", saveState ());
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1576 // write the list of recent used directories
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1577 QStringList curr_dirs;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1578 for (int i=0; i<m_current_directory_combo_box->count (); i++)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1579 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1580 curr_dirs.append (m_current_directory_combo_box->itemText (i));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1581 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1582 settings->setValue ("MainWindow/current_directory_list", curr_dirs);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1583 settings->sync ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1584 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1585
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1586 // Connecting the signals emitted when the visibility of a widget changes.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1587 // This has to be done after the window is shown (see octave-gui.cc)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1588 void main_window::connect_visibility_changed (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1589 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1590 foreach (octave_dock_widget *widget, dock_widget_list ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1591 widget->connect_visibility_changed ();
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	1592
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1593 #if defined (HAVE_QSCINTILLA)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1594 m_editor_window->enable_menu_shortcuts (false);
19589 4fe86a372f10 Fix compilation error when building without QScintilla Mike Miller <mtmiller@ieee.org> parents: 19585 diff changeset	1595 #endif
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1596 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1597
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1598 void main_window::copyClipboard (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1599 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1600 if (m_current_directory_combo_box->hasFocus ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1601 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1602 QLineEdit *edit = m_current_directory_combo_box->lineEdit ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1603 if (edit && edit->hasSelectedText ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1604 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1605 QClipboard *clipboard = QApplication::clipboard ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1606 clipboard->setText (edit->selectedText ());
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1607 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1608 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1609 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1610 emit copyClipboard_signal ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1611 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1612
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1613 void main_window::pasteClipboard (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1614 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1615 if (m_current_directory_combo_box->hasFocus ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1616 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1617 QLineEdit *edit = m_current_directory_combo_box->lineEdit ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1618 QClipboard *clipboard = QApplication::clipboard ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1619 QString str = clipboard->text ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1620 if (edit && str.length () > 0)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1621 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1622 edit->insert (str);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1623 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1624 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1625 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1626 emit pasteClipboard_signal ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1627 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1628
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1629 void main_window::selectAll (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1630 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1631 if (m_current_directory_combo_box->hasFocus ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1632 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1633 QLineEdit *edit = m_current_directory_combo_box->lineEdit ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1634 if (edit)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1635 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1636 edit->selectAll ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1637 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1638 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1639 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1640 emit selectAll_signal ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1641 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1642
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1643 void main_window::handle_show_doc (const QString& file)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1644 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1645 m_doc_browser_window->setVisible (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1646 emit show_doc_signal (file);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1647 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1648
25060 1cd3aeda7598 Allow registering compressed help at run time (bug #53006). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25054 diff changeset	1649 void main_window::handle_register_doc (const QString& file)
1cd3aeda7598 Allow registering compressed help at run time (bug #53006). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25054 diff changeset	1650 {
1cd3aeda7598 Allow registering compressed help at run time (bug #53006). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25054 diff changeset	1651 emit register_doc_signal (file);
1cd3aeda7598 Allow registering compressed help at run time (bug #53006). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25054 diff changeset	1652 }
1cd3aeda7598 Allow registering compressed help at run time (bug #53006). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25054 diff changeset	1653
1cd3aeda7598 Allow registering compressed help at run time (bug #53006). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25054 diff changeset	1654 void main_window::handle_unregister_doc (const QString& file)
1cd3aeda7598 Allow registering compressed help at run time (bug #53006). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25054 diff changeset	1655 {
1cd3aeda7598 Allow registering compressed help at run time (bug #53006). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25054 diff changeset	1656 emit unregister_doc_signal (file);
1cd3aeda7598 Allow registering compressed help at run time (bug #53006). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25054 diff changeset	1657 }
1cd3aeda7598 Allow registering compressed help at run time (bug #53006). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25054 diff changeset	1658
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1659 void main_window::handle_octave_ready (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1660 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1661 // actions after the startup files are executed
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1662 QSettings *settings = resource_manager::get_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1663
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1664 QDir startup_dir = QDir (); // current octave dir after startup
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1665
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1666 if (settings)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1667 {
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1668 if (settings->value ("restore_octave_dir").toBool ())
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1669 {
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1670 // restore last dir from previous session
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1671 QStringList curr_dirs
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1672 = settings->value ("MainWindow/current_directory_list").toStringList ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1673 startup_dir
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1674 = QDir (curr_dirs.at (0)); // last dir in previous session
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1675 }
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1676 else if (! settings->value ("octave_startup_dir").toString ().isEmpty ())
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1677 {
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1678 // do not restore but there is a startup dir configured
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1679 startup_dir
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1680 = QDir (settings->value ("octave_startup_dir").toString ());
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1681 }
27270 47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	1682
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	1683 update_default_encoding
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	1684 (settings->value (ed_default_enc.key,
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	1685 ed_default_enc.def).toString ());
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1686 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1687
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1688 if (! startup_dir.exists ())
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1689 {
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1690 // the configured startup dir does not exist, take actual one
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1691 startup_dir = QDir ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1692 }
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1693
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1694 set_current_working_directory (startup_dir.absolutePath ());
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1695
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1696 if (m_editor_window)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1697 {
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1698 #if defined (HAVE_QSCINTILLA)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1699 // Octave ready, determine whether to create an empty script.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1700 // This can not be done when the editor is created because all functions
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1701 // must be known for the lexer's auto completion informations
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1702 m_editor_window->empty_script (true, false);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1703 m_editor_window->restore_session (settings);
18833 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18823 diff changeset	1704 #endif
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1705 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1706
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1707 focus_command_window (); // make sure that the command window has focus
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1708 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1709
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1710 void main_window::find_files (const QString& start_dir)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1711 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1712
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1713 if (! m_find_files_dlg)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1714 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1715 m_find_files_dlg = new find_files_dialog (this);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1716
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1717 connect (m_find_files_dlg, SIGNAL (finished (int)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1718 this, SLOT (find_files_finished (int)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1719
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1720 connect (m_find_files_dlg, SIGNAL (dir_selected (const QString &)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1721 m_file_browser_window,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1722 SLOT (set_current_directory (const QString&)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1723
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1724 connect (m_find_files_dlg, SIGNAL (file_selected (const QString &)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1725 this, SLOT (open_file (const QString &)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1726
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1727 m_find_files_dlg->setWindowModality (Qt::NonModal);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1728 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1729
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1730 if (! m_find_files_dlg->isVisible ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1731 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1732 m_find_files_dlg->show ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1733 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1734
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1735 m_find_files_dlg->set_search_dir (start_dir);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1736
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1737 m_find_files_dlg->activateWindow ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1738
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1739 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1740
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1741 void main_window::set_global_shortcuts (bool set_shortcuts)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1742 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1743 // this slot is called when the terminal gets/loses focus
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1744
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1745 // return if the user don't want to use readline shortcuts
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1746 if (! m_prevent_readline_conflicts)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1747 return;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1748
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1749 if (set_shortcuts)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1750 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1751 // terminal loses focus: set the global shortcuts
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1752 configure_shortcuts ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1753 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1754 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1755 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1756 // terminal gets focus: disable some shortcuts
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1757 QKeySequence no_key = QKeySequence ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1758
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1759 // file menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1760 m_open_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1761 m_new_script_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1762 m_new_function_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1763 m_new_function_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1764 m_load_workspace_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1765 m_save_workspace_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1766 m_preferences_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1767 m_exit_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1768
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1769 // edit menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1770 m_select_all_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1771 m_clear_clipboard_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1772 m_find_files_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1773 m_clear_command_history_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1774 m_clear_command_window_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1775 m_clear_workspace_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1776
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1777 // window menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1778 m_reset_windows_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1779
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1780 // help menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1781 m_ondisk_doc_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1782 m_online_doc_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1783 m_report_bug_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1784 m_octave_packages_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1785 m_contribute_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1786 m_developer_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1787 m_about_octave_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1788
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1789 // news menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1790 m_release_notes_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1791 m_current_news_action->setShortcut (no_key);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1792 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1793 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1794
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1795 void main_window::set_screen_size (int ht, int wd)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1796 {
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1797 event_manager& evmgr = __get_event_manager__ ("main_window::set_screen_size");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1798
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1799 evmgr.post_event
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1800 ([ht, wd] (void)
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1801 {
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1802 // INTERPRETER THREAD
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1803
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1804 command_editor::set_screen_size (ht, wd);
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1805 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1806 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1807
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1808 void main_window::clipboard_has_changed (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1809 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1810 if (m_clipboard->text ().isEmpty ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1811 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1812 m_paste_action->setEnabled (false);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1813 m_clear_clipboard_action->setEnabled (false);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1814 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1815 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1816 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1817 m_paste_action->setEnabled (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1818 m_clear_clipboard_action->setEnabled (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1819 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1820 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1821
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1822 void main_window::clear_clipboard (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1823 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1824 m_clipboard->clear (QClipboard::Clipboard);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1825 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1826
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1827 void main_window::disable_menu_shortcuts (bool disable)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1828 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1829 QHash<QMenu*, QStringList>::const_iterator i = m_hash_menu_text.constBegin ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1830
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1831 while (i != m_hash_menu_text.constEnd ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1832 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1833 i.key ()->setTitle (i.value ().at (disable));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1834 ++i;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1835 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1836 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1837
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1838 void main_window::restore_create_file_setting (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1839 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1840 // restore the new files creation setting
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1841 QSettings *settings = resource_manager::get_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1842 settings->setValue ("editor/create_new_file",false);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1843 disconnect (m_editor_window, SIGNAL (file_loaded_signal (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1844 this, SLOT (restore_create_file_setting (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1845 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1846
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1847 void main_window::set_file_encoding (const QString& new_encoding)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1848 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1849 m_file_encoding = new_encoding;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1850 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1851
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1852 // The following slot is called after files have been selected in the
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1853 // open file dialog., possibly with a new selected encoding stored in
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1854 // m_file_encoding
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1855 void main_window::request_open_files (const QStringList& open_file_names)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1856 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1857 for (int i = 0; i < open_file_names.count (); i++)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1858 emit open_file_signal (open_file_names.at (i), m_file_encoding, -1);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1859 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1860
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1861 void main_window::edit_variable (const QString &expr, const octave_value& val)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1862 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1863 m_variable_editor_window->edit_variable (expr, val);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1864
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1865 if (! m_variable_editor_window->isVisible ())
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1866 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1867 m_variable_editor_window->show ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1868 m_variable_editor_window->raise ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1869 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1870
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1871 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1872
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1873 void main_window::refresh_variable_editor (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1874 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1875 m_variable_editor_window->refresh ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1876 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1877
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1878 void main_window::handle_variable_editor_update (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1879 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1880 // Called when the variable editor emits the updated signal. The size
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1881 // of a variable may have changed, so we refresh the workspace in the
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1882 // interpreter. That will eventually cause the workspace view in the
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1883 // GUI to be updated.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1884
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1885 event_manager& evmgr
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1886 = __get_event_manager__ ("main_window::handle_variable_editor_update");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1887
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1888 evmgr.post_event
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1889 ([] (void)
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1890 {
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1891 // INTERPRETER THREAD
c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1892
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	1893 interpreter& interp
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	1894 = __get_interpreter__ ("main_window::handle_variable_editor_update");
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	1895
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	1896 tree_evaluator& tw = interp.get_evaluator ();
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	1897
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1898 event_manager& xevmgr = interp.get_event_manager ();
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1899
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1900 xevmgr.set_workspace (true, tw.get_symbol_info (), false);
27243 c6807f5cc48b replace some explicit callback functions with lambda expressions John W. Eaton <jwe@octave.org> parents: 27220 diff changeset	1901 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1902 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1903
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1904 void main_window::closeEvent (QCloseEvent *e)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1905 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1906 e->ignore ();
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1907
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1908 event_manager& evmgr = __get_event_manager__ ("main_window::closeEvent");
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1909
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1910 evmgr.post_event
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1911 ([] (void)
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1912 {
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1913 // INTERPRETER THREAD
420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1914
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	1915 interpreter& interp = __get_interpreter__ ("main_window::closeEvent");
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	1916
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	1917 Fquit (interp);
27255 420611c61298 eliminate octave_cmd classes John W. Eaton <jwe@octave.org> parents: 27243 diff changeset	1918 });
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1919 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1920
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1921 void main_window::construct_central_widget (void)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1922 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1923 // Create and set the central widget. QMainWindow takes ownership of
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1924 // the widget (pointer) so there is no need to delete the object upon
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1925 // destroying this main_window.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1926
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1927 QWidget *dummyWidget = new QWidget ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1928 dummyWidget->setObjectName ("CentralDummyWidget");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1929 dummyWidget->resize (10, 10);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1930 dummyWidget->setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Minimum);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1931 dummyWidget->hide ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	1932 setCentralWidget (dummyWidget);
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1933 }
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1934
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1935 // Main subroutine of the constructor
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1936
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1937 void main_window::construct (void)
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1938 {
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1939 setWindowIcon (QIcon (":/actions/icons/logo.png"));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1940
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1941 m_workspace_window->setModel (m_workspace_model);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1942
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1943 connect (m_workspace_model, SIGNAL (model_changed (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1944 m_workspace_window, SLOT (handle_model_changed (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1945
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1946 interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1947
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1948 qt_interpreter_events *qt_link = interp_qobj->qt_link ();
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1949
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1950 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1951 SIGNAL (edit_variable_signal (const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1952 const octave_value&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1953 this,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1954 SLOT (edit_variable (const QString&, const octave_value&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1955
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	1956 connect (qt_link, SIGNAL (refresh_variable_editor_signal (void)),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1957 this, SLOT (refresh_variable_editor (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1958
27220 9a4a9fcc186b connect workspace view rename variable signal to main window slot John W. Eaton <jwe@octave.org> parents: 27219 diff changeset	1959 connect (m_workspace_window,
9a4a9fcc186b connect workspace view rename variable signal to main window slot John W. Eaton <jwe@octave.org> parents: 27219 diff changeset	1960 SIGNAL (rename_variable_signal (const QString&, const QString&)),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1961 this,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1962 SLOT (handle_rename_variable_request (const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1963 const QString&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1964
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1965 connect (m_variable_editor_window, SIGNAL (updated (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1966 this, SLOT (handle_variable_editor_update (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1967
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1968 construct_menu_bar ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1969
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1970 construct_tool_bar ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1971
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1972 // Order is important. Deleting QSettings must be last.
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1973 connect (qApp, SIGNAL (aboutToQuit (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1974 m_command_window, SLOT (save_settings (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1975
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1976 connect (qApp, SIGNAL (aboutToQuit (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1977 m_history_window, SLOT (save_settings (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1978
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1979 connect (qApp, SIGNAL (aboutToQuit (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1980 m_file_browser_window, SLOT (save_settings (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1981
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1982 connect (qApp, SIGNAL (aboutToQuit (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1983 m_doc_browser_window, SLOT (save_settings (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1984
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1985 connect (qApp, SIGNAL (aboutToQuit (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1986 m_workspace_window, SLOT (save_settings (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1987
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1988 connect (qApp, SIGNAL (aboutToQuit (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1989 m_editor_window, SLOT (save_settings (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1990
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1991 connect (qApp, SIGNAL (aboutToQuit (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1992 m_variable_editor_window, SLOT (save_settings (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1993
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1994 connect (qApp, SIGNAL (aboutToQuit (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1995 this, SLOT (prepare_to_exit (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1996
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1997 connect (qApp, SIGNAL (aboutToQuit (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1998 shortcut_manager::instance, SLOT (cleanup_instance (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	1999
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2000 // QSettings are saved upon deletion (i.e., cleanup_instance)
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2001 connect (qApp, SIGNAL (aboutToQuit (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2002 resource_manager::instance, SLOT (cleanup_instance (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2003
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2004 connect (qApp, SIGNAL (focusChanged (QWidget, QWidget)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2005 this, SLOT (focus_changed (QWidget, QWidget)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2006
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2007 connect (this, SIGNAL (settings_changed (const QSettings *)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2008 this, SLOT (notice_settings (const QSettings *)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2009
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2010 connect (this, SIGNAL (editor_focus_changed (bool)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2011 this, SLOT (disable_menu_shortcuts (bool)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2012
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2013 connect (this, SIGNAL (editor_focus_changed (bool)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2014 m_editor_window, SLOT (enable_menu_shortcuts (bool)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2015
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2016 connect (this, SIGNAL (step_into_file_signal (void)),
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2017 m_editor_window, SLOT (request_step_into_file (void)));
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2018
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2019 connect (m_editor_window, SIGNAL (editor_tabs_changed_signal (bool)),
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2020 this, SLOT (editor_tabs_changed (bool)));
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2021
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2022 connect (m_editor_window,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2023 SIGNAL (request_open_file_external (const QString&, int)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2024 m_external_editor,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2025 SLOT (call_custom_editor (const QString&, int)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2026
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2027 connect (m_external_editor,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2028 SIGNAL (request_settings_dialog (const QString&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2029 this, SLOT (process_settings_dialog_request (const QString&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2030
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2031 connect (m_file_browser_window, SIGNAL (load_file_signal (const QString&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2032 this, SLOT (handle_load_workspace_request (const QString&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2033
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2034 connect (m_file_browser_window, SIGNAL (open_any_signal (const QString&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2035 this, SLOT (handle_open_any_request (const QString&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2036
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2037 connect (m_file_browser_window, SIGNAL (find_files_signal (const QString&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2038 this, SLOT (find_files (const QString&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2039
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2040 setWindowTitle ("Octave");
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2041
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2042 // See Octave bug #53409 and https://bugreports.qt.io/browse/QTBUG-55357
25091 2b8442c890d8 Fix locked GUI panels for Qt 5.6.1 through 5.7.0 series versions (bug #53409) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25060 diff changeset	2043 #if (QT_VERSION < 0x050601) \|\| (QT_VERSION >= 0x050701)
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2044 setDockOptions (QMainWindow::AnimatedDocks
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2045 \| QMainWindow::AllowNestedDocks
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2046 \| QMainWindow::AllowTabbedDocks);
25091 2b8442c890d8 Fix locked GUI panels for Qt 5.6.1 through 5.7.0 series versions (bug #53409) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25060 diff changeset	2047 #else
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2048 setDockNestingEnabled (true);
25091 2b8442c890d8 Fix locked GUI panels for Qt 5.6.1 through 5.7.0 series versions (bug #53409) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25060 diff changeset	2049 #endif
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2050
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2051 addDockWidget (Qt::RightDockWidgetArea, m_command_window);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2052 addDockWidget (Qt::RightDockWidgetArea, m_doc_browser_window);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2053 tabifyDockWidget (m_command_window, m_doc_browser_window);
24019 fc4ba8b1ff87 style fixes for GUI main window John W. Eaton <jwe@octave.org> parents: 24016 diff changeset	2054
fc4ba8b1ff87 style fixes for GUI main window John W. Eaton <jwe@octave.org> parents: 24016 diff changeset	2055 #if defined (HAVE_QSCINTILLA)
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2056 addDockWidget (Qt::RightDockWidgetArea, m_editor_window);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2057 tabifyDockWidget (m_command_window, m_editor_window);
24019 fc4ba8b1ff87 style fixes for GUI main window John W. Eaton <jwe@octave.org> parents: 24016 diff changeset	2058 #endif
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2059 addDockWidget (Qt::RightDockWidgetArea, m_variable_editor_window);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2060 tabifyDockWidget (m_command_window, m_variable_editor_window);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2061
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2062 addDockWidget (Qt::LeftDockWidgetArea, m_file_browser_window);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2063 addDockWidget (Qt::LeftDockWidgetArea, m_workspace_window);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2064 addDockWidget (Qt::LeftDockWidgetArea, m_history_window);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2065
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2066 int win_x = QApplication::desktop ()->width ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2067 int win_y = QApplication::desktop ()->height ();
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2068
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2069 if (win_x > 960)
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2070 win_x = 960;
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2071
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2072 if (win_y > 720)
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2073 win_y = 720;
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2074
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2075 setGeometry (0, 0, win_x, win_y);
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2076
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2077 setStatusBar (m_status_bar);
24019 fc4ba8b1ff87 style fixes for GUI main window John W. Eaton <jwe@octave.org> parents: 24016 diff changeset	2078
fc4ba8b1ff87 style fixes for GUI main window John W. Eaton <jwe@octave.org> parents: 24016 diff changeset	2079 #if defined (HAVE_QSCINTILLA)
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2080 connect (this,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2081 SIGNAL (insert_debugger_pointer_signal (const QString&, int)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2082 m_editor_window,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2083 SLOT (handle_insert_debugger_pointer_request (const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2084 int)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2085
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2086 connect (this,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2087 SIGNAL (delete_debugger_pointer_signal (const QString&, int)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2088 m_editor_window,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2089 SLOT (handle_delete_debugger_pointer_request (const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2090 int)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2091
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2092 connect (this,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2093 SIGNAL (update_breakpoint_marker_signal (bool, const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2094 int, const QString&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2095 m_editor_window,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2096 SLOT (handle_update_breakpoint_marker_request (bool,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2097 const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2098 int,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2099 const QString&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2100
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2101 // Signals for removing/renaming files/dirs in the file browser
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2102 connect (m_file_browser_window,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2103 SIGNAL (file_remove_signal (const QString&, const QString&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2104 m_editor_window,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2105 SLOT (handle_file_remove (const QString&, const QString&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2106
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2107 connect (m_file_browser_window, SIGNAL (file_renamed_signal (bool)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2108 m_editor_window, SLOT (handle_file_renamed (bool)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2109
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2110 // Signals for removing/renaming files/dirs in the temrinal window
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2111 connect (qt_link, SIGNAL (file_renamed_signal (bool)),
27039 32d9f57d7245 fix missing unlock of mutex when gui editor is not present (bug #56097) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2112 m_editor_window, SLOT (handle_file_renamed (bool)));
32d9f57d7245 fix missing unlock of mutex when gui editor is not present (bug #56097) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2113 #endif
32d9f57d7245 fix missing unlock of mutex when gui editor is not present (bug #56097) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2114
32d9f57d7245 fix missing unlock of mutex when gui editor is not present (bug #56097) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2115 // Signals for removing/renaming files/dirs in the temrinal window
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2116 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2117 SIGNAL (file_remove_signal (const QString&, const QString&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2118 this, SLOT (file_remove_proxy (const QString&, const QString&)));
24019 fc4ba8b1ff87 style fixes for GUI main window John W. Eaton <jwe@octave.org> parents: 24016 diff changeset	2119
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2120 configure_shortcuts ();
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2121 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2122
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2123 void main_window::construct_octave_qt_link (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2124 {
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2125 interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2126
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	2127 qt_interpreter_events *qt_link = interp_qobj->qt_link ();
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2128
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2129 connect (qt_link,
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 26115 diff changeset	2130 SIGNAL (set_workspace_signal (bool, bool, const symbol_info_list&)),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2131 m_workspace_model,
26117 a6df420457ac use symbol_info_list instead of symbol_scope to pass workspace info to gui John W. Eaton <jwe@octave.org> parents: 26115 diff changeset	2132 SLOT (set_workspace (bool, bool, const symbol_info_list&)));
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2133
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2134 connect (qt_link, SIGNAL (clear_workspace_signal (void)),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2135 m_workspace_model, SLOT (clear_workspace (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2136
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2137 connect (qt_link, SIGNAL (change_directory_signal (QString)),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2138 this, SLOT (change_directory (QString)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2139
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2140 connect (qt_link, SIGNAL (change_directory_signal (QString)),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2141 m_file_browser_window, SLOT (update_octave_directory (QString)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2142
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2143 connect (qt_link, SIGNAL (change_directory_signal (QString)),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2144 m_editor_window, SLOT (update_octave_directory (QString)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2145
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2146 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2147 SIGNAL (execute_command_in_terminal_signal (QString)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2148 this, SLOT (execute_command_in_terminal (QString)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2149
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2150 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2151 SIGNAL (set_history_signal (const QStringList&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2152 m_history_window, SLOT (set_history (const QStringList&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2153
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2154 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2155 SIGNAL (append_history_signal (const QString&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2156 m_history_window, SLOT (append_history (const QString&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2157
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2158 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2159 SIGNAL (clear_history_signal (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2160 m_history_window, SLOT (clear_history (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2161
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2162 connect (qt_link, SIGNAL (enter_debugger_signal (void)),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2163 this, SLOT (handle_enter_debugger (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2164
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2165 connect (qt_link, SIGNAL (exit_debugger_signal (void)),
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2166 this, SLOT (handle_exit_debugger (void)));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2167
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2168 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2169 SIGNAL (show_preferences_signal (void)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2170 this, SLOT (process_settings_dialog_request (void)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2171
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2172 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2173 SIGNAL (gui_preference_signal (const QString&, const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2174 QString*)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2175 this, SLOT (gui_preference (const QString&, const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2176 QString*)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2177
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2178 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2179 SIGNAL (edit_file_signal (const QString&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2180 m_active_editor,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2181 SLOT (handle_edit_file_request (const QString&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2182
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2183 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2184 SIGNAL (insert_debugger_pointer_signal (const QString&, int)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2185 this,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2186 SLOT (handle_insert_debugger_pointer_request (const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2187 int)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2188
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2189 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2190 SIGNAL (delete_debugger_pointer_signal (const QString&, int)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2191 this,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2192 SLOT (handle_delete_debugger_pointer_request (const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2193 int)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2194
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2195 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2196 SIGNAL (update_breakpoint_marker_signal (bool, const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2197 int, const QString&)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2198 this,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2199 SLOT (handle_update_breakpoint_marker_request (bool, const QString&,
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2200 int, const QString&)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2201
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2202 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2203 SIGNAL (show_doc_signal (const QString &)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2204 this, SLOT (handle_show_doc (const QString &)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2205
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2206 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2207 SIGNAL (register_doc_signal (const QString &)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2208 this, SLOT (handle_register_doc (const QString &)));
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2209
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2210 connect (qt_link,
25944 ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2211 SIGNAL (unregister_doc_signal (const QString &)),
ceb508ea92ee refactor GUI main_window class John W. Eaton <jwe@octave.org> parents: 25940 diff changeset	2212 this, SLOT (handle_unregister_doc (const QString &)));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2213 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2214
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2215 QAction* main_window::add_action (QMenu *menu, const QIcon& icon,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2216 const QString& text, const char *member,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2217 const QWidget *receiver)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2218 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2219 QAction *a;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2220
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2221 if (receiver)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2222 a = menu->addAction (icon, text, receiver, member);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2223 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2224 a = menu->addAction (icon, text, this, member);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2225
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2226 addAction (a); // important for shortcut context
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2227 a->setShortcutContext (Qt::ApplicationShortcut);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2228 return a;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2229 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2230
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2231 QMenu* main_window::m_add_menu (QMenuBar *p, QString name)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2232 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2233 QMenu *menu = p->addMenu (name);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2234
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2235 QString base_name = name; // get a copy
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2236 // replace intended '&' ("&&") by a temp. string
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2237 base_name.replace ("&&", "___octave_amp_replacement___");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2238 // remove single '&' (shortcut)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2239 base_name.remove ("&");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2240 // restore intended '&'
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2241 base_name.replace ("___octave_amp_replacement___", "&&");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2242
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2243 // remember names with and without shortcut
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2244 m_hash_menu_text[menu] = QStringList () << name << base_name;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2245
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2246 return menu;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2247 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2248
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2249 void main_window::construct_menu_bar (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2250 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2251 QMenuBar *menu_bar = menuBar ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2252
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2253 construct_file_menu (menu_bar);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2254
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2255 construct_edit_menu (menu_bar);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2256
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2257 construct_debug_menu (menu_bar);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2258
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2259 construct_window_menu (menu_bar);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2260
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2261 construct_help_menu (menu_bar);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2262
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2263 construct_news_menu (menu_bar);
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	2264
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	2265 #if defined (HAVE_QSCINTILLA)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2266 // call the editor to add actions which should also be available in the
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2267 // editor's menu and tool bar
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2268 QList<QAction*> shared_actions;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2269 shared_actions << m_new_script_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2270 << m_new_function_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2271 << m_open_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2272 << m_find_files_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2273 << m_undo_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2274 << m_copy_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2275 << m_paste_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2276 <<m_select_all_action;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2277 m_editor_window->insert_global_actions (shared_actions);
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	2278 #endif
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2279 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2280
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2281 void main_window::construct_file_menu (QMenuBar *p)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2282 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2283 QMenu *file_menu = m_add_menu (p, tr ("&File"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2284
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2285 construct_new_menu (file_menu);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2286
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2287 m_open_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2288 = file_menu->addAction (resource_manager::icon ("document-open"),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2289 tr ("Open..."));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2290 m_open_action->setShortcutContext (Qt::ApplicationShortcut);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2291 m_open_action->setToolTip (tr ("Open an existing file in editor"));
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2292
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	2293 #if defined (HAVE_QSCINTILLA)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2294 file_menu->addMenu (m_editor_window->get_mru_menu ());
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2295 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2296
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2297 file_menu->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2298
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2299 m_load_workspace_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2300 = file_menu->addAction (tr ("Load Workspace..."));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2301
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2302 m_save_workspace_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2303 = file_menu->addAction (tr ("Save Workspace As..."));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2304
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2305 file_menu->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2306
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2307 m_exit_action = file_menu->addAction (tr ("Exit"));
27118 99adef2c6e10 Enable "Quit" menu item on Mac application menu (bug #56155) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27102 diff changeset	2308 m_exit_action->setMenuRole (QAction::QuitRole);
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2309 m_exit_action->setShortcutContext (Qt::ApplicationShortcut);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2310
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2311 connect (m_open_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2312 this, SLOT (request_open_file (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2313
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2314 connect (m_load_workspace_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2315 this, SLOT (handle_load_workspace_request (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2316
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2317 connect (m_save_workspace_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2318 this, SLOT (handle_save_workspace_request (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2319
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2320 connect (m_exit_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2321 this, SLOT (close (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2322 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2323
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2324 void main_window::construct_new_menu (QMenu *p)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2325 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2326 QMenu *new_menu = p->addMenu (tr ("New"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2327
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2328 m_new_script_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2329 = new_menu->addAction (resource_manager::icon ("document-new"),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2330 tr ("New Script"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2331 m_new_script_action->setShortcutContext (Qt::ApplicationShortcut);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2332
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2333 m_new_function_action = new_menu->addAction (tr ("New Function..."));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2334 m_new_function_action->setEnabled (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2335 m_new_function_action->setShortcutContext (Qt::ApplicationShortcut);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2336
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2337 m_new_figure_action = new_menu->addAction (tr ("New Figure"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2338 m_new_figure_action->setEnabled (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2339
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2340 connect (m_new_script_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2341 this, SLOT (request_new_script (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2342
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2343 connect (m_new_function_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2344 this, SLOT (request_new_function (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2345
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2346 connect (this, SIGNAL (new_file_signal (const QString&)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2347 m_active_editor, SLOT (request_new_file (const QString&)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2348
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2349 connect (this, SIGNAL (open_file_signal (const QString&)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2350 m_active_editor, SLOT (request_open_file (const QString&)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2351
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2352 connect (this,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2353 SIGNAL (open_file_signal (const QString&, const QString&, int)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2354 m_active_editor,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2355 SLOT (request_open_file (const QString&, const QString&, int)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2356
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2357 connect (m_new_figure_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2358 this, SLOT (handle_new_figure_request (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2359 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2360
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2361 void main_window::construct_edit_menu (QMenuBar *p)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2362 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2363 QMenu *edit_menu = m_add_menu (p, tr ("&Edit"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2364
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2365 QKeySequence ctrl_shift = Qt::ControlModifier + Qt::ShiftModifier;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2366
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2367 m_undo_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2368 = edit_menu->addAction (resource_manager::icon ("edit-undo"), tr ("Undo"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2369 m_undo_action->setShortcutContext (Qt::ApplicationShortcut);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2370
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2371 edit_menu->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2372
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2373 m_copy_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2374 = edit_menu->addAction (resource_manager::icon ("edit-copy"),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2375 tr ("Copy"), this, SLOT (copyClipboard (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2376 m_copy_action->setShortcutContext (Qt::ApplicationShortcut);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2377
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2378 m_paste_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2379 = edit_menu->addAction (resource_manager::icon ("edit-paste"),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2380 tr ("Paste"), this, SLOT (pasteClipboard (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2381 m_paste_action->setShortcutContext (Qt::ApplicationShortcut);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2382
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2383 m_select_all_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2384 = edit_menu->addAction (tr ("Select All"), this, SLOT (selectAll (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2385 m_select_all_action->setShortcutContext (Qt::ApplicationShortcut);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2386
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2387 m_clear_clipboard_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2388 = edit_menu->addAction (tr ("Clear Clipboard"), this,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2389 SLOT (clear_clipboard (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2390
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2391 edit_menu->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2392
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2393 m_find_files_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2394 = edit_menu->addAction (resource_manager::icon ("edit-find"),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2395 tr ("Find Files..."));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2396
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2397 edit_menu->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2398
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2399 m_clear_command_window_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2400 = edit_menu->addAction (tr ("Clear Command Window"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2401
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2402 m_clear_command_history_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2403 = edit_menu->addAction (tr ("Clear Command History"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2404
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2405 m_clear_workspace_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2406 = edit_menu->addAction (tr ("Clear Workspace"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2407
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2408 edit_menu->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2409
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2410 m_preferences_action
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2411 = edit_menu->addAction (resource_manager::icon ("preferences-system"),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2412 tr ("Preferences..."));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2413
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2414 connect (m_find_files_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2415 this, SLOT (find_files (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2416
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2417 connect (m_clear_command_window_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2418 this, SLOT (handle_clear_command_window_request (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2419
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2420 connect (m_clear_command_history_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2421 this, SLOT (handle_clear_history_request (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2422
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2423 connect (m_clear_workspace_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2424 this, SLOT (handle_clear_workspace_request (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2425
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2426 connect (m_clipboard, SIGNAL (dataChanged (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2427 this, SLOT (clipboard_has_changed (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2428 clipboard_has_changed ();
24625 be37df6e1fb4 always enable paste action in windows (bug #52361) Torsten <mttl@mailbox.org> parents: 24534 diff changeset	2429 #if defined (Q_OS_WIN32)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2430 // Always enable paste action (unreliable clipboard signals in windows)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2431 // FIXME: This has to be removed, when the clipboards signals in windows
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2432 // are working again
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2433 m_paste_action->setEnabled (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2434 m_clear_clipboard_action->setEnabled (true);
24625 be37df6e1fb4 always enable paste action in windows (bug #52361) Torsten <mttl@mailbox.org> parents: 24534 diff changeset	2435 #endif
20039 3538c2824dd8 GUI: Move preferences to edit menu (Bug #44725) John Donoghue parents: 19985 diff changeset	2436
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2437 connect (m_preferences_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2438 this, SLOT (process_settings_dialog_request (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2439 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2440
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2441 QAction * main_window::construct_debug_menu_item (const char *icon,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2442 const QString& item,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2443 const char *member)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2444 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2445 QAction *action = add_action (m_debug_menu,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2446 resource_manager::icon (QString (icon)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2447 item, member);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2448
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2449 action->setEnabled (false);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2450
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	2451 #if defined (HAVE_QSCINTILLA)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2452 m_editor_window->debug_menu ()->addAction (action);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2453 m_editor_window->toolbar ()->addAction (action);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2454 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2455
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2456 return action;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2457 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2458
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2459 void main_window::construct_debug_menu (QMenuBar *p)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2460 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2461 m_debug_menu = m_add_menu (p, tr ("De&bug"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2462
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2463 m_debug_step_over
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2464 = construct_debug_menu_item ("db-step", tr ("Step"),
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2465 SLOT (debug_step_over (void)));
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2466
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2467 m_debug_step_into
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2468 = construct_debug_menu_item ("db-step-in", tr ("Step In"),
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2469 SLOT (debug_step_into (void)));
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2470
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2471 m_debug_step_out
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2472 = construct_debug_menu_item ("db-step-out", tr ("Step Out"),
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2473 SLOT (debug_step_out (void)));
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2474
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2475 m_debug_continue
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2476 = construct_debug_menu_item ("db-cont", tr ("Continue"),
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2477 SLOT (debug_continue (void)));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2478
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2479 m_debug_menu->addSeparator ();
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	2480 #if defined (HAVE_QSCINTILLA)
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2481 m_editor_window->debug_menu ()->addSeparator ();
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2482 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2483
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2484 m_debug_quit
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2485 = construct_debug_menu_item ("db-stop", tr ("Quit Debug Mode"),
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2486 SLOT (debug_quit (void)));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2487 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2488
26873 9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2489 void main_window::editor_tabs_changed (bool have_tabs)
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2490 {
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2491 // Set state of action which depend on the existance of editor tabs
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2492 m_editor_has_tabs = have_tabs;
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2493 m_debug_step_over->setEnabled (have_tabs);
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2494 }
9ec36417c262 debug step starts script if not already running in debug mode (bug #44728) Torsten Lilge <ttl-octave@mailbox.org> parents: 26643 diff changeset	2495
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2496 QAction * main_window::construct_window_menu_item (QMenu *p,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2497 const QString& item,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2498 bool checkable,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2499 QWidget *widget)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2500 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2501 QAction *action = p->addAction (QIcon (), item);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2502
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2503 addAction (action); // important for shortcut context
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2504 action->setCheckable (checkable);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2505 action->setShortcutContext (Qt::ApplicationShortcut);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2506
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2507 if (widget) // might be zero for m_editor_window
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2508 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2509 if (checkable)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2510 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2511 // action for visibilty of dock widget
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2512 connect (action, SIGNAL (toggled (bool)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2513 widget, SLOT (setVisible (bool)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2514
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2515 connect (widget, SIGNAL (active_changed (bool)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2516 action, SLOT (setChecked (bool)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2517 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2518 else
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2519 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2520 // action for focus of dock widget
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	2521 connect (action, SIGNAL (triggered (void)), widget, SLOT (activate (void)));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2522 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2523 }
27258 922c47ff5218 disable editor actions in window menu when editor is not available (bug #56114) Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	2524 else
922c47ff5218 disable editor actions in window menu when editor is not available (bug #56114) Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	2525 {
922c47ff5218 disable editor actions in window menu when editor is not available (bug #56114) Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	2526 action->setEnabled (false);
922c47ff5218 disable editor actions in window menu when editor is not available (bug #56114) Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	2527 }
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2528
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2529 return action;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2530 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2531
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2532 void main_window::construct_window_menu (QMenuBar *p)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2533 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2534 QMenu *window_menu = m_add_menu (p, tr ("&Window"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2535
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2536 m_show_command_window_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2537 (window_menu, tr ("Show Command Window"), true, m_command_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2538
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2539 m_show_history_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2540 (window_menu, tr ("Show Command History"), true, m_history_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2541
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2542 m_show_file_browser_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2543 (window_menu, tr ("Show File Browser"), true, m_file_browser_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2544
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2545 m_show_workspace_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2546 (window_menu, tr ("Show Workspace"), true, m_workspace_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2547
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2548 m_show_editor_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2549 (window_menu, tr ("Show Editor"), true, m_editor_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2550
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2551 m_show_documentation_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2552 (window_menu, tr ("Show Documentation"), true, m_doc_browser_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2553
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2554 m_show_variable_editor_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2555 (window_menu, tr ("Show Variable Editor"), true, m_variable_editor_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2556
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2557 window_menu->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2558
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2559 m_command_window_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2560 (window_menu, tr ("Command Window"), false, m_command_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2561
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2562 m_history_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2563 (window_menu, tr ("Command History"), false, m_history_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2564
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2565 m_file_browser_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2566 (window_menu, tr ("File Browser"), false, m_file_browser_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2567
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2568 m_workspace_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2569 (window_menu, tr ("Workspace"), false, m_workspace_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2570
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2571 m_editor_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2572 (window_menu, tr ("Editor"), false, m_editor_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2573
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2574 m_documentation_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2575 (window_menu, tr ("Documentation"), false, m_doc_browser_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2576
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2577 m_variable_editor_action = construct_window_menu_item
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2578 (window_menu, tr ("Variable Editor"), false, m_variable_editor_window);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2579
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2580 window_menu->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2581
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2582 m_reset_windows_action = add_action (window_menu, QIcon (),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2583 tr ("Reset Default Window Layout"), SLOT (reset_windows (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2584 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2585
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2586 void main_window::construct_help_menu (QMenuBar *p)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2587 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2588 QMenu *help_menu = m_add_menu (p, tr ("&Help"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2589
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2590 construct_documentation_menu (help_menu);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2591
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2592 help_menu->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2593
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2594 m_report_bug_action = add_action (help_menu, QIcon (),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2595 tr ("Report Bug"), SLOT (open_bug_tracker_page ()));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2596
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2597 m_octave_packages_action = add_action (help_menu, QIcon (),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2598 tr ("Octave Packages"), SLOT (open_octave_packages_page ()));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2599
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2600 m_contribute_action = add_action (help_menu, QIcon (),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2601 tr ("Contribute"), SLOT (open_contribute_page ()));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2602
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2603 m_developer_action = add_action (help_menu, QIcon (),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2604 tr ("Donate to Octave"), SLOT (open_donate_page ()));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2605
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2606 help_menu->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2607
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2608 m_about_octave_action = add_action (help_menu, QIcon (),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2609 tr ("About Octave"), SLOT (show_about_octave ()));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2610 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2611
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2612 void main_window::construct_documentation_menu (QMenu *p)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2613 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2614 QMenu *doc_menu = p->addMenu (tr ("Documentation"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2615
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2616 m_ondisk_doc_action = add_action (doc_menu, QIcon (),
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27277 diff changeset	2617 tr ("On Disk"), SLOT (activate ()), m_doc_browser_window);
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2618
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2619 m_online_doc_action = add_action (doc_menu, QIcon (),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2620 tr ("Online"), SLOT (open_online_documentation_page ()));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2621 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2622
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2623 void main_window::construct_news_menu (QMenuBar *p)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2624 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2625 QMenu *news_menu = m_add_menu (p, tr ("&News"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2626
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2627 m_release_notes_action = add_action (news_menu, QIcon (),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2628 tr ("Release Notes"), SLOT (display_release_notes ()));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2629
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2630 m_current_news_action = add_action (news_menu, QIcon (),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2631 tr ("Community News"), SLOT (load_and_display_community_news ()));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2632 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2633
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2634 void main_window::construct_tool_bar (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2635 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2636 m_main_tool_bar = addToolBar (tr ("Toolbar"));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2637
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2638 m_main_tool_bar->setObjectName ("MainToolBar");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2639 m_main_tool_bar->addAction (m_new_script_action);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2640 m_main_tool_bar->addAction (m_open_action);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2641
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2642 m_main_tool_bar->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2643
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2644 m_main_tool_bar->addAction (m_copy_action);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2645 m_main_tool_bar->addAction (m_paste_action);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2646 m_main_tool_bar->addAction (m_undo_action);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2647
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2648 m_main_tool_bar->addSeparator ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2649
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2650 m_current_directory_combo_box = new QComboBox (this);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2651 QFontMetrics fm = m_current_directory_combo_box->fontMetrics ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2652 m_current_directory_combo_box->setFixedWidth (48*fm.averageCharWidth ());
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2653 m_current_directory_combo_box->setEditable (true);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2654 m_current_directory_combo_box->setInsertPolicy (QComboBox::NoInsert);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2655 m_current_directory_combo_box->setToolTip (tr ("Enter directory name"));
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2656 m_current_directory_combo_box->setMaxVisibleItems (current_directory_max_visible);
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2657 m_current_directory_combo_box->setMaxCount (current_directory_max_count);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2658 QSizePolicy sizePol (QSizePolicy::Preferred, QSizePolicy::Preferred);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2659 m_current_directory_combo_box->setSizePolicy (sizePol);
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2660
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2661 // addWidget takes ownership of the objects so there is no
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2662 // need to delete these upon destroying this main_window.
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2663 m_main_tool_bar->addWidget (new QLabel (tr ("Current Directory: ")));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2664 m_main_tool_bar->addWidget (m_current_directory_combo_box);
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2665 QAction *current_dir_up
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2666 = m_main_tool_bar->addAction (resource_manager::icon ("go-up"),
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2667 tr ("One directory up"));
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2668 QAction *current_dir_search
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2669 = m_main_tool_bar->addAction (resource_manager::icon ("folder"),
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27271 diff changeset	2670 tr ("Browse directories"));
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2671
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2672 connect (m_current_directory_combo_box, SIGNAL (activated (QString)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2673 this, SLOT (set_current_working_directory (QString)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2674
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2675 connect (m_current_directory_combo_box->lineEdit (), SIGNAL (returnPressed (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2676 this, SLOT (accept_directory_line_edit (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2677
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2678 connect (current_dir_search, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2679 this, SLOT (browse_for_directory (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2680
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2681 connect (current_dir_up, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2682 this, SLOT (change_directory_up (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2683
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2684 connect (m_undo_action, SIGNAL (triggered (void)),
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2685 this, SLOT (handle_undo_request (void)));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2686 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2687
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2688 QString main_window::gui_preference_adjust (const QString& key,
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2689 const QString& value)
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2690 {
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2691 QString adjusted_value = value;
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2692
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2693 // Immediately return if no new value is given
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2694 if (adjusted_value.isEmpty ())
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2695 return adjusted_value;
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2696
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2697 // Not all encodings are available. Encodings are uppercase and do not
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2698 // use CPxxx but IBMxxx or WINDOWS-xxx.
25702 bd30c6f8cfb7 update internal __mfile_encoding__ when gui default encoding changes (bug #54310) Torsten <mttl@mailbox.org> parents: 25700 diff changeset	2699 if (key == ed_default_enc.key)
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2700 {
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2701 adjusted_value = adjusted_value.toUpper ();
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2702
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2703 QStringList codecs;
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2704 resource_manager::get_codecs (&codecs);
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2705
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2706 QRegExp re ("^CP(\\d+)$");
27271 a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27270 diff changeset	2707 if (adjusted_value == "SYSTEM")
a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27270 diff changeset	2708 adjusted_value =
a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27270 diff changeset	2709 QTextCodec::codecForLocale ()->name ().toUpper ().prepend ("SYSTEM (").append (")");
a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27270 diff changeset	2710 else if (re.indexIn (adjusted_value) > -1)
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2711 {
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2712 if (codecs.contains ("IBM" + re.cap (1)))
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2713 adjusted_value = "IBM" + re.cap (1);
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2714 else if (codecs.contains ("WINDOWS-" + re.cap (1)))
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2715 adjusted_value = "WINDOWS-" + re.cap (1);
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2716 else
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2717 adjusted_value.clear ();
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2718 }
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2719 else if (! codecs.contains (adjusted_value))
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2720 adjusted_value.clear ();
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2721 }
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2722
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2723 return adjusted_value;
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2724 }
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2725
25639 7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2726 void main_window::gui_preference (const QString& key, const QString& value,
25678 3418d3729a51 use exisitng mutex in octave_qt_link for changing gui preferences (bug #54369) Torsten <mttl@mailbox.org> parents: 25639 diff changeset	2727 QString* read_value)
25639 7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2728 {
7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2729 QSettings *settings = resource_manager::get_settings ();
7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2730 *read_value = settings->value (key).toString ();
7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2731
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2732 interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2733
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	2734 qt_interpreter_events *qt_link = interp_qobj->qt_link ();
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2735
25678 3418d3729a51 use exisitng mutex in octave_qt_link for changing gui preferences (bug #54369) Torsten <mttl@mailbox.org> parents: 25639 diff changeset	2736 // Wait for worker to suspend
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2737 qt_link->lock ();
25678 3418d3729a51 use exisitng mutex in octave_qt_link for changing gui preferences (bug #54369) Torsten <mttl@mailbox.org> parents: 25639 diff changeset	2738
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2739 // Some preferences need extra handling
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2740 QString adjusted_value = gui_preference_adjust (key, value);
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2741
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2742 if (! adjusted_value.isEmpty () && (*read_value != adjusted_value))
25639 7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2743 {
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2744 // Change settings only for new, non-empty values
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25678 diff changeset	2745 settings->setValue (key, QVariant (adjusted_value));
25639 7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2746 emit settings_changed (settings);
7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2747 }
7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2748
25678 3418d3729a51 use exisitng mutex in octave_qt_link for changing gui preferences (bug #54369) Torsten <mttl@mailbox.org> parents: 25639 diff changeset	2749 // We are done: Unlock and wake the worker thread
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2750 qt_link->unlock ();
a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27209 diff changeset	2751 qt_link->wake_all ();
25639 7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2752 }
7644e7f1721f change gui preferences from within the worker thread (bug #49119) Torsten <mttl@mailbox.org> parents: 25616 diff changeset	2753
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2754 bool main_window::focus_console_after_command (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2755 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2756 QSettings *settings = resource_manager::get_settings ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2757 return settings->value ("terminal/focus_after_command",false).toBool ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2758 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2759
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2760 void main_window::configure_shortcuts (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2761 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2762 // file menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2763 shortcut_manager::set_shortcut (m_open_action, "main_file:open_file");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2764 shortcut_manager::set_shortcut (m_new_script_action, "main_file:new_file");
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	2765 shortcut_manager::set_shortcut (m_new_function_action,
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	2766 "main_file:new_function");
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2767 shortcut_manager::set_shortcut (m_new_function_action, "main_file:new_figure");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2768 shortcut_manager::set_shortcut (m_load_workspace_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2769 "main_file:load_workspace");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2770 shortcut_manager::set_shortcut (m_save_workspace_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2771 "main_file:save_workspace");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2772 shortcut_manager::set_shortcut (m_preferences_action, "main_file:preferences");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2773 shortcut_manager::set_shortcut (m_exit_action,"main_file:exit");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2774
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2775 // edit menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2776 shortcut_manager::set_shortcut (m_copy_action, "main_edit:copy");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2777 shortcut_manager::set_shortcut (m_paste_action, "main_edit:paste");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2778 shortcut_manager::set_shortcut (m_undo_action, "main_edit:undo");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2779 shortcut_manager::set_shortcut (m_select_all_action, "main_edit:select_all");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2780 shortcut_manager::set_shortcut (m_clear_clipboard_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2781 "main_edit:clear_clipboard");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2782 shortcut_manager::set_shortcut (m_find_files_action, "main_edit:find_in_files");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2783 shortcut_manager::set_shortcut (m_clear_command_history_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2784 "main_edit:clear_history");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2785 shortcut_manager::set_shortcut (m_clear_command_window_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2786 "main_edit:clear_command_window");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2787 shortcut_manager::set_shortcut (m_clear_workspace_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2788 "main_edit:clear_workspace");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2789
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2790 // debug menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2791 shortcut_manager::set_shortcut (m_debug_step_over, "main_debug:step_over");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2792 shortcut_manager::set_shortcut (m_debug_step_into, "main_debug:step_into");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2793 shortcut_manager::set_shortcut (m_debug_step_out, "main_debug:step_out");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2794 shortcut_manager::set_shortcut (m_debug_continue, "main_debug:continue");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2795 shortcut_manager::set_shortcut (m_debug_quit, "main_debug:quit");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2796
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2797 // window menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2798 shortcut_manager::set_shortcut (m_show_command_window_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2799 "main_window:show_command");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2800 shortcut_manager::set_shortcut (m_show_history_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2801 "main_window:show_history");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2802 shortcut_manager::set_shortcut (m_show_workspace_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2803 "main_window:show_workspace");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2804 shortcut_manager::set_shortcut (m_show_file_browser_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2805 "main_window:show_file_browser");
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	2806 shortcut_manager::set_shortcut (m_show_editor_action,
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	2807 "main_window:show_editor");
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2808 shortcut_manager::set_shortcut (m_show_documentation_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2809 "main_window:show_doc");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2810 shortcut_manager::set_shortcut (m_show_variable_editor_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2811 "main_window:show_variable_editor");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2812 shortcut_manager::set_shortcut (m_command_window_action, "main_window:command");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2813 shortcut_manager::set_shortcut (m_history_action, "main_window:history");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2814 shortcut_manager::set_shortcut (m_workspace_action, "main_window:workspace");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2815 shortcut_manager::set_shortcut (m_file_browser_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2816 "main_window:file_browser");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2817 shortcut_manager::set_shortcut (m_editor_action, "main_window:editor");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2818 shortcut_manager::set_shortcut (m_documentation_action, "main_window:doc");
25042 ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	2819 shortcut_manager::set_shortcut (m_variable_editor_action,
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006) Torsten <mttl@mailbox.org> parents: 25024 diff changeset	2820 "main_window:variable_editor");
24715 88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2821 shortcut_manager::set_shortcut (m_reset_windows_action, "main_window:reset");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2822
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2823 // help menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2824 shortcut_manager::set_shortcut (m_ondisk_doc_action, "main_help:ondisk_doc");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2825 shortcut_manager::set_shortcut (m_online_doc_action, "main_help:online_doc");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2826 shortcut_manager::set_shortcut (m_report_bug_action, "main_help:report_bug");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2827 shortcut_manager::set_shortcut (m_octave_packages_action, "main_help:packages");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2828 shortcut_manager::set_shortcut (m_contribute_action, "main_help:contribute");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2829 shortcut_manager::set_shortcut (m_developer_action, "main_help:developer");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2830 shortcut_manager::set_shortcut (m_about_octave_action, "main_help:about");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2831
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2832 // news menu
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2833 shortcut_manager::set_shortcut (m_release_notes_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2834 "main_news:release_notes");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2835 shortcut_manager::set_shortcut (m_current_news_action,
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2836 "main_news:community_news");
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2837 }
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2838
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2839 QList<octave_dock_widget *> main_window::dock_widget_list (void)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2840 {
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2841 QList<octave_dock_widget > list = QList<octave_dock_widget > ();
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2842 list.append (static_cast<octave_dock_widget *> (m_command_window));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2843 list.append (static_cast<octave_dock_widget *> (m_history_window));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2844 list.append (static_cast<octave_dock_widget *> (m_file_browser_window));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2845 list.append (static_cast<octave_dock_widget *> (m_doc_browser_window));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2846 #if defined (HAVE_QSCINTILLA)
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2847 list.append (static_cast<octave_dock_widget *> (m_editor_window));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2848 #endif
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2849 list.append (static_cast<octave_dock_widget *> (m_workspace_window));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2850 list.append (static_cast<octave_dock_widget *> (m_variable_editor_window));
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2851 return list;
88bb3f086d9a move GUI main_window and related classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	2852 }
27270 47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2853
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2854 void main_window::update_default_encoding (const QString& default_encoding)
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2855 {
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2856 m_default_encoding = default_encoding;
27271 a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27270 diff changeset	2857 std::string mfile_encoding = m_default_encoding.toStdString ();
a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27270 diff changeset	2858 if (m_default_encoding.startsWith ("SYSTEM", Qt::CaseInsensitive))
a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27270 diff changeset	2859 mfile_encoding = "SYSTEM";
27270 47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2860
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2861 event_manager& evmgr
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2862 = __get_event_manager__ ("main_window::notice_settings");
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2863
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2864 evmgr.post_event
27271 a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27270 diff changeset	2865 ([this, mfile_encoding] (void)
27270 47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2866 {
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2867 // INTERPRETER THREAD
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2868
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2869 interpreter& interp
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2870 = __get_interpreter__ ("main_window::notice_settings");
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2871
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2872 F__mfile_encoding__ (interp,
27271 a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 27270 diff changeset	2873 ovl (mfile_encoding));
27270 47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2874 });
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2875 }
47f42ad90b0b Restore mfile_encoding on startup from GUI settings. Markus Mützel <markus.muetzel@gmx.de> parents: 27267 diff changeset	2876
16539 8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	2877 }

Mercurial > octave

annotate libgui/src/main-window.cc @ 27281:0915fec3d3a9