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

annotate libgui/src/main-window.cc @ 23810:9c24aae7515f

allow cursor flashing to be configured globally in gui (bug #51460) * default-qt-settings.in: remove the related preference in the termibal tab * main-window.cc (notice_settings): read the new preference from the settings file and if not available, use the old one from the terminal tab as fallback; set the flashing period for the scintilla editor * file-editor-tab.cc (notice_settings): read the new preference from the settings file and if not available, use the old one from the terminal tab as fallback; set the application wide flashing period * QTerminal.cc (notice_settings): read the new preference from the settings file and if not available, use the old one from the terminal tab as fallback * settings-dialog.cc (settings_dialog): read the new preference from the settings file and if not available, use the old one from the terminal tab as fallback; remove obsolete preference from terminal tab; (write_changed_settings): save new preference into the settings file * settings-dialog.ui: move preference for cursor blinking from terminal to general tab

author	Torsten <mttl@mailbox.org>
date	Sun, 23 Jul 2017 10:53:55 +0200
parents	336f89b6208b
children	5d8ef9b859f8

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
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23160 diff changeset	3 Copyright (C) 2013-2017 John W. Eaton
22323 bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22254 diff changeset	4 Copyright (C) 2011-2016 Jacob Dawid
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	8 Octave is free software; you can redistribute it and/or modify it
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
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	10 the Free Software Foundation; either version 3 of the License, or
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
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	20 <http://www.gnu.org/licenses/>.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	22 */
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>
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	30 #include <QInputDialog>
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	31 #include <QLabel>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	32 #include <QMenuBar>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	33 #include <QMenu>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	34 #include <QAction>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	35 #include <QSettings>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	36 #include <QStyle>
7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	37 #include <QToolBar>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	38 #include <QDesktopServices>
16391 a695ee2dc17e * main-window.cc: Include <QDesktopWidget> John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	39 #include <QDesktopWidget>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	40 #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	41 #include <QMessageBox>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	42 #include <QIcon>
17764 811b5a562680 Format release notes as preformatted text in the GUI (bug #40367) Mike Miller <mtmiller@ieee.org> parents: 17744 diff changeset	43 #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	44 #include <QThread>
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	45 #include <QDateTime>
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	46 #include <QDebug>
21439 912b8828193b * main-window.cc: include QTimer header file Mike Miller <mtmiller@octave.org> parents: 21428 diff changeset	47 #include <QTimer>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	48
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	49 #include <utility>
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	50
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	51 #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	52 # 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	53 #endif
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	54 #include "main-window.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	55 #include "settings-dialog.h"
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	56 #include "shortcut-manager.h"
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	57
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	58 #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	59 #include "cmd-edit.h"
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	60 #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	61
19893 67cb2f421255 restore include statement removed in changeset c7c50030e76c John W. Eaton <jwe@octave.org> parents: 19882 diff changeset	62 #include "builtin-defun-decls.h"
15404 f52a62a6db3a eliminate copy and paste copyright info in GUI about info box John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	63 #include "defaults.h"
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	64 #if defined (HAVE_QT_GRAPHICS)
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	65 # include "__init_qt__.h"
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	66 #endif
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	67 #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	68 #include "interpreter.h"
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	69 #include "oct-map.h"
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	70 #include "octave.h"
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	71 #include "symtab.h"
23479 06bf3a0b08bf maint: Use "" instead of <> for our own include files. John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	72 #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	73 #include "version.h"
23380 c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	74
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	75 static file_editor_interface *
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	76 create_default_editor (QWidget *p)
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	77 {
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	78 #if defined (HAVE_QSCINTILLA)
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	79 return new file_editor (p);
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	80 #else
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	81 octave_unused_parameter (p);
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	82
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	83 return 0;
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	84 #endif
c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	85 }
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	86
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	87 octave_interpreter::octave_interpreter (octave::application *app_context)
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	88 : QObject (), thread_manager (), m_app_context (app_context)
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	89 { }
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	90
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	91 void
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	92 octave_interpreter::execute (void)
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	93 {
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	94 thread_manager.register_current_thread ();
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	95
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	96 octave_thread_manager::unblock_interrupt_signal ();
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	97
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	98 // The application context owns the interpreter.
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	99
23773 5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	100 octave::interpreter& interp = m_app_context->create_interpreter ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	101
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	102 int exit_status = 0;
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	103
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	104 try
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	105 {
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	106 // Final initialization including executing startup files. If
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	107 // initialization fails, return the last available status from
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	108 // that process.
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	109
23773 5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	110 exit_status = interp.initialize ();
5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	111
5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	112 if (interp.initialized ())
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	113 {
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	114 // The interpreter should be completely ready at this point so let
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	115 // the GUI know.
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	116
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	117 emit octave_ready_signal ();
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	118
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	119 // Start executing commands in the command window.
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	120
23773 5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	121 #if defined (HAVE_QT_GRAPHICS)
5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	122 install___init_qt___functions ();
5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	123
23774 41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23773 diff changeset	124 Fregister_graphics_toolkit (interp, ovl ("qt"));
23773 5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	125 #endif
5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	126
5ff24576b783 defer installing qt graphics toolkit until interpreter is ready John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	127 exit_status = interp.execute ();
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	128 }
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	129 }
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	130 catch (const octave::exit_exception& ex)
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	131 {
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	132 exit_status = ex.exit_status ();
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	133 }
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	134
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	135 // Whether or not initialization succeeds we need to clean up the
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	136 // interpreter once we are done with it.
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	137
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	138 m_app_context->delete_interpreter ();
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	139
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	140 qApp->exit (exit_status);
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	141 }
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	142
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	143 void
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	144 octave_interpreter::interrupt (void)
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	145 {
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	146 thread_manager.interrupt ();
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	147 }
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	148
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	149
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	150 main_window::main_window (QWidget p, octave::gui_application app_context)
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	151 : QMainWindow (p), m_app_context (app_context),
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	152 m_interpreter (new octave_interpreter (app_context)),
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	153 m_main_thread (new QThread ()), _workspace_model (nullptr), status_bar (nullptr),
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	154 command_window (nullptr), history_window (nullptr), file_browser_window (nullptr),
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	155 doc_browser_window (nullptr), editor_window (nullptr), workspace_window (nullptr),
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	156 _settings_dlg (nullptr), find_files_dlg (nullptr), release_notes_window (nullptr),
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	157 community_news_window (nullptr), _octave_qt_link (nullptr),
17329 352b442a72a5 queue and synchronize mutliple commands executed fro history (bug #39723) Torsten <ttl@justmail.de> parents: 17117 diff changeset	158 _clipboard (QApplication::clipboard ()),
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	159 _prevent_readline_conflicts (true),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	160 _suppress_dbg_location (true),
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	161 _start_gui (app_context && app_context->start_gui_p ()),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	162 _file_encoding (QString ())
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	163 {
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	164 if (_start_gui)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	165 {
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	166 _workspace_model = new workspace_model ();
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	167 status_bar = new QStatusBar ();
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	168 command_window = new terminal_dock_widget (this);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	169 history_window = new history_dock_widget (this);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	170 file_browser_window = new files_dock_widget (this);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	171 doc_browser_window = new documentation_dock_widget (this);
23380 c319e6d737f2 Backed out changeset 7332287221a9 Torsten <mttl@mailbox.org> parents: 23379 diff changeset	172 editor_window = create_default_editor (this);
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	173 workspace_window = new workspace_view (this);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	174 }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	175
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	176 _external_editor = new external_editor_interface (this);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	177 _active_editor = editor_window; // for connecting signals
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	178 if (! editor_window)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	179 _active_editor = _external_editor;
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	180
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	181 QSettings *settings = resource_manager::get_settings ();
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	182
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	183 bool connect_to_web = true;
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	184 QDateTime last_checked;
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	185 int serial = 0;
23796 4f12819a634f Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23795 diff changeset	186 _active_dock = nullptr;
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	187
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	188 if (settings)
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	189 {
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	190 connect_to_web
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	191 = settings->value ("news/allow_web_connection", true).toBool ();
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	192
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	193 last_checked
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	194 = settings->value ("news/last_time_checked", QDateTime ()).toDateTime ();
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	195
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	196 serial = settings->value ("news/last_news_item", 0).toInt ();
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	197 }
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	198
17982 7c48493d98e1 Use currentDateTime instead of currentDateTimeUtc for Qt compatibility Mike Miller <mtmiller@ieee.org> parents: 17954 diff changeset	199 QDateTime current = QDateTime::currentDateTime ();
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	200 QDateTime one_day_ago = current.addDays (-1);
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	201
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	202 if (_start_gui && connect_to_web
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	203 && (! last_checked.isValid () \|\| one_day_ago > last_checked))
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	204 load_and_display_community_news (serial);
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	205
14599 97cb9286919c Cleaned up code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14588 diff changeset	206 // We have to set up all our windows, before we finally launch octave.
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	207 construct ();
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	208
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	209 connect (m_interpreter, SIGNAL (octave_ready_signal ()),
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	210 this, SLOT (handle_octave_ready ()));
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	211
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	212 connect (m_interpreter, SIGNAL (octave_ready_signal ()),
b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	213 doc_browser_window, SLOT (load_info_file ()));
b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	214
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	215 m_interpreter->moveToThread (m_main_thread);
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	216
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	217 m_main_thread->start ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	218 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	219
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	220 main_window::~main_window (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	221 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	222 // Destroy the terminal first so that STDERR stream is redirected back
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	223 // to its original pipe to capture error messages at exit.
16484 fa842e78f491 Restore STDERR stream pipe before exit to capture error messages. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16479 diff changeset	224
16638 3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	225 delete editor_window; // first one for dialogs of modified editor-tabs
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	226 delete _external_editor;
16484 fa842e78f491 Restore STDERR stream pipe before exit to capture error messages. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16479 diff changeset	227 delete command_window;
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	228 delete workspace_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	229 delete doc_browser_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	230 delete file_browser_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	231 delete history_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	232 delete status_bar;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	233 delete _workspace_model;
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	234 delete m_interpreter;
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	235 delete m_main_thread;
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	236 if (find_files_dlg)
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	237 {
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	238 delete find_files_dlg;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	239 find_files_dlg = nullptr;
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	240 }
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	241 if (release_notes_window)
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	242 {
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	243 delete release_notes_window;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	244 release_notes_window = nullptr;
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	245 }
19632 101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	246 if (_settings_dlg)
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	247 {
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	248 delete _settings_dlg;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	249 _settings_dlg = nullptr;
19632 101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	250 }
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	251 if (community_news_window)
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	252 {
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	253 delete community_news_window;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	254 community_news_window = nullptr;
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	255 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	256 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	257
19422 476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	258 // catch focus changes and determine the active dock widget
476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	259 void
19425 5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	260 main_window::focus_changed (QWidget , QWidget new_widget)
19422 476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	261 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	262 octave_dock_widget *dock = nullptr;
19425 5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	263 QWidget *w_new = new_widget; // get a copy of new focus widget
5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	264 QWidget *start = w_new; // Save it as start of our search
5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	265 int count = 0; // fallback to prevent endless loop
5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	266
5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	267 while (w_new && w_new != _main_tool_bar && count < 100)
19422 476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	268 {
21661 1b9a36a66b01 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21568 diff changeset	269 dock = qobject_cast<octave_dock_widget *> (w_new);
19422 476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	270 if (dock)
19425 5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	271 break; // it is a QDockWidget ==> exit loop
5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	272
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	273 #if defined (HAVE_QSCINTILLA)
21661 1b9a36a66b01 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21568 diff changeset	274 if (qobject_cast<octave_qscintilla *> (w_new))
19533 52c51472b6b9 improved search for active dock-widget after focus has changed Torsten <ttl@justmail.de> parents: 19437 diff changeset	275 {
19739 3fa35defe495 Adjust spacing of static_cast<> calls to follow Octave coding conventions. Rik <rik@octave.org> parents: 19714 diff changeset	276 dock = static_cast<octave_dock_widget *> (editor_window);
19533 52c51472b6b9 improved search for active dock-widget after focus has changed Torsten <ttl@justmail.de> parents: 19437 diff changeset	277 break; // it is the editor window ==> exit loop
52c51472b6b9 improved search for active dock-widget after focus has changed Torsten <ttl@justmail.de> parents: 19437 diff changeset	278 }
19589 4fe86a372f10 Fix compilation error when building without QScintilla Mike Miller <mtmiller@ieee.org> parents: 19585 diff changeset	279 #endif
19533 52c51472b6b9 improved search for active dock-widget after focus has changed Torsten <ttl@justmail.de> parents: 19437 diff changeset	280
21661 1b9a36a66b01 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21568 diff changeset	281 w_new = qobject_cast<QWidget *> (w_new->previousInFocusChain ());
19425 5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	282 if (w_new == start)
5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	283 break; // we have arrived where we began ==> exit loop
5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	284
5e93d228ff6b fix regression from 476032040df9 (endless loop while looking for active widget) Torsten <ttl@justmail.de> parents: 19422 diff changeset	285 count++;
19422 476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	286 }
476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	287
19533 52c51472b6b9 improved search for active dock-widget after focus has changed Torsten <ttl@justmail.de> parents: 19437 diff changeset	288 // editor needs extra handling
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	289 octave_dock_widget *edit_dock_widget
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	290 = static_cast<octave_dock_widget *> (editor_window);
19422 476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	291 // if new dock has focus, emit signal and store active focus
19533 52c51472b6b9 improved search for active dock-widget after focus has changed Torsten <ttl@justmail.de> parents: 19437 diff changeset	292 // except editor changes to a dialog (dock=0)
52c51472b6b9 improved search for active dock-widget after focus has changed Torsten <ttl@justmail.de> parents: 19437 diff changeset	293 if ((dock \|\| _active_dock != edit_dock_widget) && (dock != _active_dock))
19422 476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	294 {
19426 f90bb1e30de2 switching between edit and main shortcuts depending on active dock widget now Torsten <ttl@justmail.de> parents: 19425 diff changeset	295 // signal to all dock widgets for updating the style
19422 476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	296 emit active_dock_changed (_active_dock, dock);
19426 f90bb1e30de2 switching between edit and main shortcuts depending on active dock widget now Torsten <ttl@justmail.de> parents: 19425 diff changeset	297
19983 643de08e524c save and restore previously active widget in a tabbed stack (bug #42980) Torsten <ttl@justmail.de> parents: 19970 diff changeset	298 QList<QDockWidget *> tabbed = tabifiedDockWidgets (dock);
643de08e524c save and restore previously active widget in a tabbed stack (bug #42980) Torsten <ttl@justmail.de> parents: 19970 diff changeset	299 if (tabbed.contains (_active_dock))
643de08e524c save and restore previously active widget in a tabbed stack (bug #42980) Torsten <ttl@justmail.de> parents: 19970 diff changeset	300 dock->set_predecessor_widget (_active_dock);
643de08e524c save and restore previously active widget in a tabbed stack (bug #42980) Torsten <ttl@justmail.de> parents: 19970 diff changeset	301
19426 f90bb1e30de2 switching between edit and main shortcuts depending on active dock widget now Torsten <ttl@justmail.de> parents: 19425 diff changeset	302 if (edit_dock_widget == dock)
19429 be53bf420464 fix access to already removed editor window at exit Torsten <ttl@justmail.de> parents: 19426 diff changeset	303 emit editor_focus_changed (true);
19426 f90bb1e30de2 switching between edit and main shortcuts depending on active dock widget now Torsten <ttl@justmail.de> parents: 19425 diff changeset	304 else if (edit_dock_widget == _active_dock)
19429 be53bf420464 fix access to already removed editor window at exit Torsten <ttl@justmail.de> parents: 19426 diff changeset	305 emit editor_focus_changed (false);
19426 f90bb1e30de2 switching between edit and main shortcuts depending on active dock widget now Torsten <ttl@justmail.de> parents: 19425 diff changeset	306
19422 476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	307 _active_dock = dock;
476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	308 }
476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	309 }
476032040df9 determining the active dock from focus changes in the gui Torsten <ttl@justmail.de> parents: 19411 diff changeset	310
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	311 bool
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	312 main_window::command_window_has_focus (void) const
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	313 {
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	314 return command_window->has_focus ();
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	315 }
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	316
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	317 void
16449 c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	318 main_window::focus_command_window (void)
c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	319 {
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	320 command_window->focus ();
16449 c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	321 }
c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	322
c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	323 void
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16451 diff changeset	324 main_window::new_file (const QString& commands)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	325 {
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	326 emit new_file_signal (commands);
14875 3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	327 }
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	328
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	329 void
23497 f45402b9dcc4 parse error messages clickable in gui console for opening the file (bug #35619) Torsten <mttl@mailbox.org> parents: 23488 diff changeset	330 main_window::open_file (const QString& file_name, int line)
14875 3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	331 {
23497 f45402b9dcc4 parse error messages clickable in gui console for opening the file (bug #35619) Torsten <mttl@mailbox.org> parents: 23488 diff changeset	332 if (line < 0)
f45402b9dcc4 parse error messages clickable in gui console for opening the file (bug #35619) Torsten <mttl@mailbox.org> parents: 23488 diff changeset	333 emit open_file_signal (file_name);
f45402b9dcc4 parse error messages clickable in gui console for opening the file (bug #35619) Torsten <mttl@mailbox.org> parents: 23488 diff changeset	334 else
f45402b9dcc4 parse error messages clickable in gui console for opening the file (bug #35619) Torsten <mttl@mailbox.org> parents: 23488 diff changeset	335 emit open_file_signal (file_name, QString (), line);
13558 248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	336 }
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	337
20995 aab7a3c7168e edit a file from an error message in the terminal (bug #35619) Torsten <ttl@justmail.de> parents: 20989 diff changeset	338 void
aab7a3c7168e edit a file from an error message in the terminal (bug #35619) Torsten <ttl@justmail.de> parents: 20989 diff changeset	339 main_window::edit_mfile (const QString& name, int line)
aab7a3c7168e edit a file from an error message in the terminal (bug #35619) Torsten <ttl@justmail.de> parents: 20989 diff changeset	340 {
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	341 handle_edit_mfile_request (name, QString (), QString (), line);
20995 aab7a3c7168e edit a file from an error message in the terminal (bug #35619) Torsten <ttl@justmail.de> parents: 20989 diff changeset	342 }
13558 248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	343
248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	344 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	345 main_window::report_status_message (const QString& statusMessage)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	346 {
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	347 status_bar->showMessage (statusMessage, 1000);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	348 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	349
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	350 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	351 main_window::handle_save_workspace_request (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	352 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	353 QString file
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	354 = QFileDialog::getSaveFileName (this, tr ("Save Workspace As"), ".",
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	355 nullptr, nullptr,
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	356 QFileDialog::DontUseNativeDialog);
16532 67d4111d078d look for save/load files starting in current directory John W. Eaton <jwe@octave.org> parents: 16526 diff changeset	357
67d4111d078d look for save/load files starting in current directory John W. Eaton <jwe@octave.org> parents: 16526 diff changeset	358 if (! file.isEmpty ())
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	359 octave_link::post_event (this, &main_window::save_workspace_callback,
16532 67d4111d078d look for save/load files starting in current directory John W. Eaton <jwe@octave.org> parents: 16526 diff changeset	360 file.toStdString ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	361 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	362
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	363 void
16504 49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	364 main_window::handle_load_workspace_request (const QString& file_arg)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	365 {
16504 49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	366 QString file = file_arg;
49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	367
49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	368 if (file.isEmpty ())
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	369 file = QFileDialog::getOpenFileName (this, tr ("Load Workspace"), ".",
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	370 nullptr, nullptr,
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	371 QFileDialog::DontUseNativeDialog);
16532 67d4111d078d look for save/load files starting in current directory John W. Eaton <jwe@octave.org> parents: 16526 diff changeset	372
16504 49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	373 if (! file.isEmpty ())
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	374 octave_link::post_event (this, &main_window::load_workspace_callback,
16504 49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	375 file.toStdString ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	376 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	377
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	378 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	379 main_window::handle_clear_workspace_request (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	380 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	381 octave_link::post_event (this, &main_window::clear_workspace_callback);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	382 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	383
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	384 void
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	385 main_window::handle_rename_variable_request (const QString& old_name,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	386 const QString& new_name)
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	387
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	388 {
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	389 name_pair names (old_name.toStdString (), new_name.toStdString ());
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	390
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	391 octave_link::post_event (this, &main_window::rename_variable_callback,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	392 names);
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	393 }
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	394
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	395 void
16539 8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	396 main_window::handle_undo_request (void)
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	397 {
19945 f7a805f02723 link undo in main window to editor if the latter has focus (bug #44402) Torsten <ttl@justmail.de> parents: 19938 diff changeset	398 if (command_window_has_focus ())
f7a805f02723 link undo in main window to editor if the latter has focus (bug #44402) Torsten <ttl@justmail.de> parents: 19938 diff changeset	399 octave_link::post_event (this, &main_window::command_window_undo_callback);
f7a805f02723 link undo in main window to editor if the latter has focus (bug #44402) Torsten <ttl@justmail.de> parents: 19938 diff changeset	400 else
f7a805f02723 link undo in main window to editor if the latter has focus (bug #44402) Torsten <ttl@justmail.de> parents: 19938 diff changeset	401 emit undo_signal ();
16539 8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	402 }
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	403
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	404 void
16514 db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	405 main_window::handle_clear_command_window_request (void)
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	406 {
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	407 octave_link::post_event (this, &main_window::clear_command_window_callback);
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	408 }
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	409
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	410 void
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	411 main_window::handle_clear_history_request (void)
14814 61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	412 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	413 octave_link::post_event (this, &main_window::clear_history_callback);
14814 61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	414 }
61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	415
18156 14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	416 bool
14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	417 main_window::focus_console_after_command ()
14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	418 {
14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	419 QSettings *settings = resource_manager::get_settings ();
14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	420 return settings->value ("terminal/focus_after_command",false).toBool ();
14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	421 }
14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	422
14814 61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	423 void
16570 d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	424 main_window::execute_command_in_terminal (const QString& command)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	425 {
19773 034bcac0b61c use of C++ API for running a file (bug #42307) Torsten <ttl@justmail.de> parents: 19739 diff changeset	426 octave_cmd_exec *cmd = new octave_cmd_exec (command);
21028 4a7d9c335402 GUI: move the command queue into a separate class Torsten <ttl@justmail.de> parents: 21027 diff changeset	427 _cmd_queue.add_cmd (cmd);
18156 14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	428 if (focus_console_after_command ())
14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	429 focus_command_window ();
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	430 }
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	431
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	432 void
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	433 main_window::run_file_in_terminal (const QFileInfo& info)
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	434 {
17331 636d75a58cd9 fix running file from editor that is not in the search path (bug #39870) Torsten <ttl@justmail.de> parents: 17329 diff changeset	435 octave_link::post_event (this, &main_window::run_file_callback, info);
18156 14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	436 if (focus_console_after_command ())
14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 18117 diff changeset	437 focus_command_window ();
17331 636d75a58cd9 fix running file from editor that is not in the search path (bug #39870) Torsten <ttl@justmail.de> parents: 17329 diff changeset	438 }
636d75a58cd9 fix running file from editor that is not in the search path (bug #39870) Torsten <ttl@justmail.de> parents: 17329 diff changeset	439
636d75a58cd9 fix running file from editor that is not in the search path (bug #39870) Torsten <ttl@justmail.de> parents: 17329 diff changeset	440 void
636d75a58cd9 fix running file from editor that is not in the search path (bug #39870) Torsten <ttl@justmail.de> parents: 17329 diff changeset	441 main_window::run_file_callback (const QFileInfo& info)
636d75a58cd9 fix running file from editor that is not in the search path (bug #39870) Torsten <ttl@justmail.de> parents: 17329 diff changeset	442 {
19773 034bcac0b61c use of C++ API for running a file (bug #42307) Torsten <ttl@justmail.de> parents: 19739 diff changeset	443 octave_cmd_eval *cmd = new octave_cmd_eval (info);
21028 4a7d9c335402 GUI: move the command queue into a separate class Torsten <ttl@justmail.de> parents: 21027 diff changeset	444 _cmd_queue.add_cmd (cmd);
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	445 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	446
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	447 void
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	448 main_window::handle_new_figure_request (void)
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	449 {
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	450 octave_link::post_event (this, &main_window::new_figure_callback);
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	451 }
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	452
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	453 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	454 main_window::open_online_documentation_page (void)
15989 afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	455 {
21669 7cb63f3994b0 Use correct URL for Online Documentation (bug #47835). Rik <rik@octave.org> parents: 20243 diff changeset	456 QDesktopServices::openUrl (
7cb63f3994b0 Use correct URL for Online Documentation (bug #47835). Rik <rik@octave.org> parents: 20243 diff changeset	457 QUrl ("http://octave.org/doc/interpreter/index.html"));
15989 afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	458 }
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	459
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	460 void
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	461 main_window::display_release_notes (void)
f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	462 {
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	463 if (! release_notes_window)
17764 811b5a562680 Format release notes as preformatted text in the GUI (bug #40367) Mike Miller <mtmiller@ieee.org> parents: 17744 diff changeset	464 {
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23693 diff changeset	465 std::string news_file = octave::config::oct_etc_dir () + "/NEWS";
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	466
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	467 QString news;
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	468
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	469 QFile *file = new QFile (QString::fromStdString (news_file));
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	470 if (file->open (QFile::ReadOnly))
17764 811b5a562680 Format release notes as preformatted text in the GUI (bug #40367) Mike Miller <mtmiller@ieee.org> parents: 17744 diff changeset	471 {
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	472 QTextStream *stream = new QTextStream (file);
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	473 news = stream->readAll ();
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	474 if (! news.isEmpty ())
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	475 {
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	476 news.prepend ("<pre>");
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	477 news.append ("</pre>");
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	478 }
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	479 else
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	480 news = (tr ("The release notes file '%1' is empty.")
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	481 . arg (QString::fromStdString (news_file)));
17764 811b5a562680 Format release notes as preformatted text in the GUI (bug #40367) Mike Miller <mtmiller@ieee.org> parents: 17744 diff changeset	482 }
811b5a562680 Format release notes as preformatted text in the GUI (bug #40367) Mike Miller <mtmiller@ieee.org> parents: 17744 diff changeset	483 else
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	484 news = (tr ("The release notes file '%1' cannot be read.")
17771 7690c3477da1 if NEWS file is missing, include expected file name in release notes message John W. Eaton <jwe@octave.org> parents: 17764 diff changeset	485 . arg (QString::fromStdString (news_file)));
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	486
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	487 release_notes_window = new QWidget;
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	488
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	489 QTextBrowser *browser = new QTextBrowser (release_notes_window);
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	490 browser->setText (news);
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	491
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	492 QVBoxLayout *vlayout = new QVBoxLayout;
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	493 vlayout->addWidget (browser);
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	494
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	495 release_notes_window->setLayout (vlayout);
17936 8c23f844bd30 set maximum size for release notes window from screen size John W. Eaton <jwe@octave.org> parents: 17935 diff changeset	496 release_notes_window->setWindowTitle (tr ("Octave Release Notes"));
8c23f844bd30 set maximum size for release notes window from screen size John W. Eaton <jwe@octave.org> parents: 17935 diff changeset	497
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	498 browser->document ()->adjustSize ();
18840 e7b5be5a7f80 improve size of the release notes window Torsten <ttl@justmail.de> parents: 18839 diff changeset	499
e7b5be5a7f80 improve size of the release notes window Torsten <ttl@justmail.de> parents: 18839 diff changeset	500 // center the window on the screen where octave is running
e7b5be5a7f80 improve size of the release notes window Torsten <ttl@justmail.de> parents: 18839 diff changeset	501 QDesktopWidget *m_desktop = QApplication::desktop ();
e7b5be5a7f80 improve size of the release notes window Torsten <ttl@justmail.de> parents: 18839 diff changeset	502 int screen = m_desktop->screenNumber (this); // screen of the main window
e7b5be5a7f80 improve size of the release notes window Torsten <ttl@justmail.de> parents: 18839 diff changeset	503 QRect screen_geo = m_desktop->availableGeometry (screen);
e7b5be5a7f80 improve size of the release notes window Torsten <ttl@justmail.de> parents: 18839 diff changeset	504 int win_x = screen_geo.width (); // width of the screen
e7b5be5a7f80 improve size of the release notes window Torsten <ttl@justmail.de> parents: 18839 diff changeset	505 int win_y = screen_geo.height (); // height of the screen
21396 309bba07a4f6 Change size of Release Notes window so it displays without hz scrollbar. Rik <rik@octave.org> parents: 21310 diff changeset	506 int reln_x = std::min (720, win_x-80); // desired width of release notes
309bba07a4f6 Change size of Release Notes window so it displays without hz scrollbar. Rik <rik@octave.org> parents: 21310 diff changeset	507 int reln_y = std::min (740, win_y-80); // desired height of release notes
18840 e7b5be5a7f80 improve size of the release notes window Torsten <ttl@justmail.de> parents: 18839 diff changeset	508 release_notes_window->resize (reln_x, reln_y); // set size
e7b5be5a7f80 improve size of the release notes window Torsten <ttl@justmail.de> parents: 18839 diff changeset	509 release_notes_window->move (20, 0); // move to the top left corner
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	510 }
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	511
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	512 if (! release_notes_window->isVisible ())
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	513 release_notes_window->show ();
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	514 else if (release_notes_window->isMinimized ())
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	515 release_notes_window->showNormal ();
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	516
18002 67978cb5d269 fix icons for the release and community windows Torsten <ttl@justmail.de> parents: 18001 diff changeset	517 release_notes_window->setWindowIcon (QIcon (_release_notes_icon));
67978cb5d269 fix icons for the release and community windows Torsten <ttl@justmail.de> parents: 18001 diff changeset	518
17883 3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	519 release_notes_window->raise ();
3851e5fde76d GUI: allow only one release notes windows to be open John Donoghue <john.donoghue@ieee.org> parents: 17824 diff changeset	520 release_notes_window->activateWindow ();
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	521 }
f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	522
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	523 void
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	524 news_reader::process (void)
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	525 {
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	526 QString html_text;
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	527
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	528 if (connect_to_web)
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	529 {
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	530 // Run this part in a separate thread so Octave can continue to
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	531 // run while we wait for the page to load. Then emit the signal
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	532 // to display it when we have the page contents.
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	533
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23796 diff changeset	534 QString url = base_url + '/' + page;
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	535 std::ostringstream buf;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	536 octave::url_transfer octave_dot_org (url.toStdString (), buf);
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	537
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 18261 diff changeset	538 if (octave_dot_org.is_valid ())
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 18261 diff changeset	539 {
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 18261 diff changeset	540 Array<std::string> param;
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 18261 diff changeset	541 octave_dot_org.http_get (param);
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 18261 diff changeset	542
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 18261 diff changeset	543 if (octave_dot_org.good ())
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 18261 diff changeset	544 html_text = QString::fromStdString (buf.str ());
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 18261 diff changeset	545 }
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	546
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	547 if (html_text.contains ("this-is-the-gnu-octave-community-news-page"))
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	548 {
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	549 if (serial >= 0)
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	550 {
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	551 QSettings *settings = resource_manager::get_settings ();
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	552
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	553 if (settings)
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	554 {
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	555 settings->setValue ("news/last_time_checked",
17982 7c48493d98e1 Use currentDateTime instead of currentDateTimeUtc for Qt compatibility Mike Miller <mtmiller@ieee.org> parents: 17954 diff changeset	556 QDateTime::currentDateTime ());
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	557
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	558 settings->sync ();
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	559 }
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	560
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	561 QString tag ("community-news-page-serial=");
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	562
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	563 int b = html_text.indexOf (tag);
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	564
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	565 if (b)
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	566 {
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	567 b += tag.length ();
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	568
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	569 int e = html_text.indexOf ("\n", b);
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	570
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	571 QString tmp = html_text.mid (b, e-b);
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	572
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	573 int curr_page_serial = tmp.toInt ();
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	574
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	575 if (curr_page_serial > serial)
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	576 {
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	577 if (settings)
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	578 {
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	579 settings->setValue ("news/last_news_item",
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	580 curr_page_serial);
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	581
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	582 settings->sync ();
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	583 }
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	584 }
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	585 else
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	586 return;
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	587 }
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	588 else
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	589 return;
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	590 }
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	591 }
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	592 else
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	593 html_text = QString
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	594 (tr ("<html>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	595 "<body>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	596 "<p>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	597 "Octave's community news source seems to be unavailable.\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	598 "</p>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	599 "<p>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	600 "For the latest news, please check\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	601 "<a href=\"http://octave.org/community-news.html\">http://octave.org/community-news.html</a>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	602 "when you have a connection to the web (link opens in an external browser).\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	603 "</p>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	604 "<p>\n"
18251 0b5f669f5b03 fix some translation issues (bug #41159) Torsten <ttl@justmail.de> parents: 18250 diff changeset	605 "<small><em>— The Octave Developers, ") + OCTAVE_RELEASE_DATE + "</em></small>\n"
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	606 "</p>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	607 "</body>\n"
18251 0b5f669f5b03 fix some translation issues (bug #41159) Torsten <ttl@justmail.de> parents: 18250 diff changeset	608 "</html>\n");
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	609 }
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	610 else
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	611 html_text = QString
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	612 (tr ("<html>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	613 "<body>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	614 "<p>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	615 "Connecting to the web to display the latest Octave Community news has been disabled.\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	616 "</p>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	617 "<p>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	618 "For the latest news, please check\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	619 "<a href=\"http://octave.org/community-news.html\">http://octave.org/community-news.html</a>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	620 "when you have a connection to the web (link opens in an external browser)\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	621 "or enable web connections for news in Octave's network settings dialog.\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	622 "</p>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	623 "<p>\n"
18251 0b5f669f5b03 fix some translation issues (bug #41159) Torsten <ttl@justmail.de> parents: 18250 diff changeset	624 "<small><em>— The Octave Developers, ") + OCTAVE_RELEASE_DATE + "</em></small>\n"
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	625 "</p>\n"
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	626 "</body>\n"
18251 0b5f669f5b03 fix some translation issues (bug #41159) Torsten <ttl@justmail.de> parents: 18250 diff changeset	627 "</html>\n");
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	628
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	629 emit display_news_signal (html_text);
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	630
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	631 emit finished ();
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	632 }
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	633
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	634 void
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	635 main_window::load_and_display_community_news (int serial)
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	636 {
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	637 QSettings *settings = resource_manager::get_settings ();
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	638
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	639 bool connect_to_web
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	640 = (settings
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	641 ? settings->value ("news/allow_web_connection", true).toBool ()
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	642 : true);
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	643
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	644 QString base_url = "http://octave.org";
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	645 QString page = "community-news.html";
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	646
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	647 QThread *worker_thread = new QThread;
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	648
17940 b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	649 news_reader *reader = new news_reader (base_url, page, serial,
b3e4ee8f4d6d respect option for opting out of web connections for community news John W. Eaton <jwe@octave.org> parents: 17939 diff changeset	650 connect_to_web);
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	651
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	652 reader->moveToThread (worker_thread);
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	653
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	654 connect (reader, SIGNAL (display_news_signal (const QString&)),
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	655 this, SLOT (display_community_news (const QString&)));
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	656
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	657 connect (worker_thread, SIGNAL (started (void)),
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	658 reader, SLOT (process ()));
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	659
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	660 connect (reader, SIGNAL (finished (void)), worker_thread, SLOT (quit ()));
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	661
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	662 connect (reader, SIGNAL (finished (void)), reader, SLOT (deleteLater ()));
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	663
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	664 connect (worker_thread, SIGNAL (finished (void)),
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	665 worker_thread, SLOT (deleteLater ()));
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	666
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	667 worker_thread->start ();
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	668 }
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	669
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	670 void
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	671 main_window::display_community_news (const QString& news)
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	672 {
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	673 if (! community_news_window)
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	674 {
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	675 community_news_window = new QWidget;
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	676
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	677 QTextBrowser *browser = new QTextBrowser (community_news_window);
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	678
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	679 browser->setHtml (news);
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	680 browser->setObjectName ("OctaveNews");
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	681 browser->setOpenExternalLinks (true);
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	682
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	683 QVBoxLayout *vlayout = new QVBoxLayout;
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	684
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	685 vlayout->addWidget (browser);
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	686
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	687 community_news_window->setLayout (vlayout);
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	688 community_news_window->setWindowTitle (tr ("Octave Community News"));
18839 41980d0a5fd2 center the community news window on the screen not on the desktop (bug #42567) Torsten <ttl@justmail.de> parents: 18833 diff changeset	689
41980d0a5fd2 center the community news window on the screen not on the desktop (bug #42567) Torsten <ttl@justmail.de> parents: 18833 diff changeset	690 // center the window on the screen where octave is running
41980d0a5fd2 center the community news window on the screen not on the desktop (bug #42567) Torsten <ttl@justmail.de> parents: 18833 diff changeset	691 QDesktopWidget *m_desktop = QApplication::desktop ();
41980d0a5fd2 center the community news window on the screen not on the desktop (bug #42567) Torsten <ttl@justmail.de> parents: 18833 diff changeset	692 int screen = m_desktop->screenNumber (this); // screen of the main window
41980d0a5fd2 center the community news window on the screen not on the desktop (bug #42567) Torsten <ttl@justmail.de> parents: 18833 diff changeset	693 QRect screen_geo = m_desktop->availableGeometry (screen);
41980d0a5fd2 center the community news window on the screen not on the desktop (bug #42567) Torsten <ttl@justmail.de> parents: 18833 diff changeset	694 int win_x = screen_geo.width (); // width of the screen
41980d0a5fd2 center the community news window on the screen not on the desktop (bug #42567) Torsten <ttl@justmail.de> parents: 18833 diff changeset	695 int win_y = screen_geo.height (); // height of the screen
41980d0a5fd2 center the community news window on the screen not on the desktop (bug #42567) Torsten <ttl@justmail.de> parents: 18833 diff changeset	696 int news_x = std::min (640, win_x-80); // desired width of news window
41980d0a5fd2 center the community news window on the screen not on the desktop (bug #42567) Torsten <ttl@justmail.de> parents: 18833 diff changeset	697 int news_y = std::min (480, win_y-80); // desired height of news window
41980d0a5fd2 center the community news window on the screen not on the desktop (bug #42567) Torsten <ttl@justmail.de> parents: 18833 diff changeset	698 community_news_window->resize (news_x, news_y); // set size and center
17948 73f46593a51c Center the Octave Community News window only when constructed (bug #40618) Daniel J Sebald <daniel.sebald@ieee.org> parents: 17947 diff changeset	699 community_news_window->move ((win_x - community_news_window->width ())/2,
73f46593a51c Center the Octave Community News window only when constructed (bug #40618) Daniel J Sebald <daniel.sebald@ieee.org> parents: 17947 diff changeset	700 (win_y - community_news_window->height ())/2);
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	701 }
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	702
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	703 if (! community_news_window->isVisible ())
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	704 community_news_window->show ();
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	705 else if (community_news_window->isMinimized ())
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	706 community_news_window->showNormal ();
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	707
18002 67978cb5d269 fix icons for the release and community windows Torsten <ttl@justmail.de> parents: 18001 diff changeset	708 // same icon as release notes
67978cb5d269 fix icons for the release and community windows Torsten <ttl@justmail.de> parents: 18001 diff changeset	709 community_news_window->setWindowIcon (QIcon (_release_notes_icon));
67978cb5d269 fix icons for the release and community windows Torsten <ttl@justmail.de> parents: 18001 diff changeset	710
17939 16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	711 community_news_window->raise ();
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	712 community_news_window->activateWindow ();
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	713 }
16cf38c39915 display community news in simple window; check timestamp and serial number John W. Eaton <jwe@octave.org> parents: 17936 diff changeset	714
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	715 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	716 main_window::open_bug_tracker_page (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	717 {
17509 d0fa3568eb5d update links in Help menu John W. Eaton <jwe@octave.org> parents: 17331 diff changeset	718 QDesktopServices::openUrl (QUrl ("http://octave.org/bugs.html"));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	719 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	720
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	721 void
17509 d0fa3568eb5d update links in Help menu John W. Eaton <jwe@octave.org> parents: 17331 diff changeset	722 main_window::open_octave_packages_page (void)
15989 afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	723 {
17509 d0fa3568eb5d update links in Help menu John W. Eaton <jwe@octave.org> parents: 17331 diff changeset	724 QDesktopServices::openUrl (QUrl ("http://octave.org/packages.html"));
15989 afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	725 }
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	726
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	727 void
17509 d0fa3568eb5d update links in Help menu John W. Eaton <jwe@octave.org> parents: 17331 diff changeset	728 main_window::open_contribute_page (void)
d0fa3568eb5d update links in Help menu John W. Eaton <jwe@octave.org> parents: 17331 diff changeset	729 {
22211 6065bd58db2b use contribute/donate consistently in GUI (bug #44335) Sahil Badyal <sbadyals@gmail.com> parents: 22177 diff changeset	730 QDesktopServices::openUrl (QUrl ("http://octave.org/contribute.html"));
17509 d0fa3568eb5d update links in Help menu John W. Eaton <jwe@octave.org> parents: 17331 diff changeset	731 }
d0fa3568eb5d update links in Help menu John W. Eaton <jwe@octave.org> parents: 17331 diff changeset	732
d0fa3568eb5d update links in Help menu John W. Eaton <jwe@octave.org> parents: 17331 diff changeset	733 void
22211 6065bd58db2b use contribute/donate consistently in GUI (bug #44335) Sahil Badyal <sbadyals@gmail.com> parents: 22177 diff changeset	734 main_window::open_donate_page (void)
17509 d0fa3568eb5d update links in Help menu John W. Eaton <jwe@octave.org> parents: 17331 diff changeset	735 {
22211 6065bd58db2b use contribute/donate consistently in GUI (bug #44335) Sahil Badyal <sbadyals@gmail.com> parents: 22177 diff changeset	736 QDesktopServices::openUrl (QUrl ("http://octave.org/donate.html"));
13533 edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	737 }
edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	738
edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	739 void
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 17674 diff changeset	740 main_window::process_settings_dialog_request (const QString& desired_tab)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	741 {
19632 101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	742 if (_settings_dlg) // _settings_dlg is a guarded pointer!
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	743 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	744 // here the dialog is still open and called once again
19632 101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	745 if (! desired_tab.isEmpty ())
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	746 _settings_dlg->show_tab (desired_tab);
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	747 return;
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	748 }
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	749
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	750 _settings_dlg = new settings_dialog (this, desired_tab);
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	751
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	752 connect (_settings_dlg, SIGNAL (apply_new_settings ()),
19631 4e85ca0b4887 add apply button to the settings dialog (bug #44081) Torsten <ttl@justmail.de> parents: 19589 diff changeset	753 this, SLOT (request_reload_settings ()));
4e85ca0b4887 add apply button to the settings dialog (bug #44081) Torsten <ttl@justmail.de> parents: 19589 diff changeset	754
19632 101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	755 _settings_dlg->setModal (false);
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	756 _settings_dlg->setAttribute (Qt::WA_DeleteOnClose);
101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	757 _settings_dlg->show ();
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	758 }
fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	759
19631 4e85ca0b4887 add apply button to the settings dialog (bug #44081) Torsten <ttl@justmail.de> parents: 19589 diff changeset	760 void
20113 c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	761 main_window::copy_image_to_clipboard (const QString& file, bool remove_file)
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	762 {
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	763 QClipboard *clipboard = QApplication::clipboard ();
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	764
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	765 QImage img (file);
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	766
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	767 if (img.isNull ())
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	768 {
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	769 // Report error?
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	770 return;
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	771 }
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	772
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	773 clipboard->setImage (img);
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	774
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	775 if (remove_file)
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	776 QFile::remove (file);
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	777 }
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	778
c36f2b083613 make copying figures to clipboard work (bug #44866) John W. Eaton <jwe@octave.org> parents: 20091 diff changeset	779 void
19631 4e85ca0b4887 add apply button to the settings dialog (bug #44081) Torsten <ttl@justmail.de> parents: 19589 diff changeset	780 main_window::request_reload_settings ()
4e85ca0b4887 add apply button to the settings dialog (bug #44081) Torsten <ttl@justmail.de> parents: 19589 diff changeset	781 {
4e85ca0b4887 add apply button to the settings dialog (bug #44081) Torsten <ttl@justmail.de> parents: 19589 diff changeset	782 QSettings *settings = resource_manager::get_settings ();
4e85ca0b4887 add apply button to the settings dialog (bug #44081) Torsten <ttl@justmail.de> parents: 19589 diff changeset	783
4e85ca0b4887 add apply button to the settings dialog (bug #44081) Torsten <ttl@justmail.de> parents: 19589 diff changeset	784 if (settings)
4e85ca0b4887 add apply button to the settings dialog (bug #44081) Torsten <ttl@justmail.de> parents: 19589 diff changeset	785 emit settings_changed (settings);
4e85ca0b4887 add apply button to the settings dialog (bug #44081) Torsten <ttl@justmail.de> parents: 19589 diff changeset	786 }
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	787
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	788 void
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16399 diff changeset	789 main_window::notice_settings (const QSettings *settings)
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	790 {
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16399 diff changeset	791 // QSettings pointer is checked before emitting.
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	792
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	793 // the widget's icons (when floating)
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	794 QString icon_set
203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	795 = settings->value ("DockWidgets/widget_icon_set", "NONE").toString ();
203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	796
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	797 static struct
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	798 {
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	799 QString name;
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	800 QString path;
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	801 }
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	802
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	803 widget_icon_data[] =
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	804 {
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	805 // array of possible icon sets (name, path (complete for NONE))
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	806 // the first entry here is the default!
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	807 {"NONE", ":/actions/icons/logo.png"},
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	808 {"GRAPHIC", ":/actions/icons/graphic_logo_"},
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	809 {"LETTER", ":/actions/icons/letter_logo_"},
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	810 {"", ""} // end marker has empty name
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	811 };
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	812
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	813 int count = 0;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	814 int icon_set_found = 0; // default
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	815
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20278 diff changeset	816 while (! widget_icon_data[count].name.isEmpty ())
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	817 {
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	818 // while not end of data
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	819 if (widget_icon_data[count].name == icon_set)
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	820 {
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	821 // data of desired icon set found
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	822 icon_set_found = count;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	823 break;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	824 }
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	825 count++;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	826 }
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	827
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	828 QString icon;
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	829 foreach (octave_dock_widget *widget, dock_widget_list ())
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	830 {
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	831 QString name = widget->objectName ();
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	832 if (! name.isEmpty ())
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	833 { // if children has a name
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	834 icon = widget_icon_data[icon_set_found].path; // prefix \| octave-logo
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	835 if (widget_icon_data[icon_set_found].name != "NONE")
20230 e914b5399c67 Use in-place operators in C++ code where possible. Rik <rik@octave.org> parents: 20186 diff changeset	836 icon += name + ".png"; // add widget name and ext.
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	837 widget->setWindowIcon (QIcon (icon));
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	838 }
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	839 }
17619 4288b90f18c4 icons for news and release notes widgets Torsten <ttl@justmail.de> parents: 17617 diff changeset	840 if (widget_icon_data[icon_set_found].name != "NONE")
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	841 _release_notes_icon = widget_icon_data[icon_set_found].path
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	842 + "ReleaseWidget.png";
17619 4288b90f18c4 icons for news and release notes widgets Torsten <ttl@justmail.de> parents: 17617 diff changeset	843 else
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	844 _release_notes_icon = ":/actions/icons/logo.png";
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	845
19847 597fc0fd8e54 make size of toolbar icons depending on scaling of display Torsten <ttl@justmail.de> parents: 19846 diff changeset	846 int icon_size_settings = settings->value ("toolbar_icon_size",0).toInt ();
597fc0fd8e54 make size of toolbar icons depending on scaling of display Torsten <ttl@justmail.de> parents: 19846 diff changeset	847 QStyle *st = style ();
597fc0fd8e54 make size of toolbar icons depending on scaling of display Torsten <ttl@justmail.de> parents: 19846 diff changeset	848 int icon_size = st->pixelMetric (QStyle::PM_ToolBarIconSize);
597fc0fd8e54 make size of toolbar icons depending on scaling of display Torsten <ttl@justmail.de> parents: 19846 diff changeset	849
597fc0fd8e54 make size of toolbar icons depending on scaling of display Torsten <ttl@justmail.de> parents: 19846 diff changeset	850 if (icon_size_settings == 1)
597fc0fd8e54 make size of toolbar icons depending on scaling of display Torsten <ttl@justmail.de> parents: 19846 diff changeset	851 icon_size = st->pixelMetric (QStyle::PM_LargeIconSize);
597fc0fd8e54 make size of toolbar icons depending on scaling of display Torsten <ttl@justmail.de> parents: 19846 diff changeset	852 else if (icon_size_settings == -1)
597fc0fd8e54 make size of toolbar icons depending on scaling of display Torsten <ttl@justmail.de> parents: 19846 diff changeset	853 icon_size = st->pixelMetric (QStyle::PM_SmallIconSize);
597fc0fd8e54 make size of toolbar icons depending on scaling of display Torsten <ttl@justmail.de> parents: 19846 diff changeset	854
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	855 _main_tool_bar->setIconSize (QSize (icon_size,icon_size));
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	856
18733 f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18717 diff changeset	857 if (settings->value ("show_status_bar",true).toBool ())
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18717 diff changeset	858 status_bar->show ();
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18717 diff changeset	859 else
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18717 diff changeset	860 status_bar->hide ();
f6f1f27026bb status bars and code folding a user preference (bug #42306) Torsten <ttl@justmail.de> parents: 18717 diff changeset	861
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	862 _prevent_readline_conflicts
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	863 = settings->value ("shortcuts/prevent_readline_conflicts", true).toBool ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	864
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	865 _suppress_dbg_location
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	866 = ! settings->value ("terminal/print_debug_location", false).toBool ();
19585 f9a944b9e1cb provide a user preference for printing the debug location in the terminal Torsten <ttl@justmail.de> parents: 19572 diff changeset	867
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	868 resource_manager::update_network_settings ();
19882 b403780efe90 make sure shortcuts are active in editor after settings dialog (bug #44397) Torsten <ttl@justmail.de> parents: 19868 diff changeset	869
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	870 emit active_dock_changed (nullptr, _active_dock); // update dock widget styles
19907 7d888f9e94eb fix some shortcut issues Torsten <ttl@justmail.de> parents: 19899 diff changeset	871
7d888f9e94eb fix some shortcut issues Torsten <ttl@justmail.de> parents: 19899 diff changeset	872 configure_shortcuts ();
7d888f9e94eb fix some shortcut issues Torsten <ttl@justmail.de> parents: 19899 diff changeset	873 set_global_shortcuts (_active_dock == command_window);
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	874 disable_menu_shortcuts (_active_dock == editor_window);
23810 9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	875
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	876
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	877 // Set cursor blinking depending on the settings
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	878 // Cursor blinking: consider old terminal related setting if not yet set
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	879 // TODO: This pref. can be deprecated / removed if Qt adds support for
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	880 // getting the cursor blink preferences from all OS environments
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	881 bool cursor_blinking;
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	882
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	883 if (settings->contains ("cursor_blinking"))
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	884 cursor_blinking = settings->value ("cursor_blinking",true).toBool ();
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	885 else
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	886 cursor_blinking = settings->value ("terminal/cursorBlinking",true).toBool ();
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	887
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	888 if (cursor_blinking)
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	889 QApplication::setCursorFlashTime (1000); // 1000 ms flash time
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	890 else
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	891 QApplication::setCursorFlashTime (0); // no flashing
9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	892
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	893 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	894
23810 9c24aae7515f allow cursor flashing to be configured globally in gui (bug #51460) Torsten <mttl@mailbox.org> parents: 23807 diff changeset	895
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	896 void
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	897 main_window::confirm_shutdown_octave (void)
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	898 {
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	899 bool closenow = true;
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	900
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	901 if (_start_gui)
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	902 {
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	903 QSettings *settings = resource_manager::get_settings ();
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	904
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	905 if (settings->value ("prompt_to_exit", false).toBool ())
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	906 {
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	907 int ans = QMessageBox::question (this, tr ("Octave"),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	908 tr ("Are you sure you want to exit Octave?"),
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	909 (QMessageBox::Ok
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	910 \| QMessageBox::Cancel),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	911 QMessageBox::Ok);
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	912
21568 3d60ed163b70 maint: Eliminate bad spacing around '='. Rik <rik@octave.org> parents: 21439 diff changeset	913 if (ans != QMessageBox::Ok)
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	914 closenow = false;
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	915 }
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	916
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	917 #if defined (HAVE_QSCINTILLA)
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	918 if (closenow)
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	919 closenow = 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	920 #endif
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	921 }
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	922
20091 89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 20039 diff changeset	923 // Wait for link thread to go to sleep state.
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 20039 diff changeset	924 _octave_qt_link->mutex.lock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 20039 diff changeset	925
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	926 _octave_qt_link->shutdown_confirmation (closenow);
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	927
20091 89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 20039 diff changeset	928 _octave_qt_link->mutex.unlock ();
89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 20039 diff changeset	929
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	930 // Awake the worker thread so that it continues shutting down (or not).
21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	931 _octave_qt_link->waitcondition.wakeAll ();
20091 89d843d6de14 Add mutex lock to shutdown confirmation for proper thread timing (bug #44751). Daniel J Sebald <daniel.sebald@ieee.org> parents: 20039 diff changeset	932
19714 21015ca26566 Restructure shutdown flow and behavior for improved robustness Daniel J Sebald <daniel.sebald@ieee.org> parents: 19702 diff changeset	933 }
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	934
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	935 void
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	936 main_window::prepare_to_exit (void)
14693 c952f1e35e50 Added patch from Marco Atzeri for QTerminal to build with cygwin. Removed some compiler warnings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14692 diff changeset	937 {
22177 6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	938 // Find files dialog is constructed dynamically, not at time of main_window
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	939 // construction. Connecting it to qApp aboutToQuit signal would have
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	940 // caused it to run after QSettings deleted.
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	941 if (find_files_dlg)
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	942 find_files_dlg->save_settings ();
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	943
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	944 write_settings ();
14693 c952f1e35e50 Added patch from Marco Atzeri for QTerminal to build with cygwin. Removed some compiler warnings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14692 diff changeset	945 }
c952f1e35e50 Added patch from Marco Atzeri for QTerminal to build with cygwin. Removed some compiler warnings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14692 diff changeset	946
c952f1e35e50 Added patch from Marco Atzeri for QTerminal to build with cygwin. Removed some compiler warnings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14692 diff changeset	947 void
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	948 main_window::reset_windows (void)
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	949 {
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	950 QSettings *settings = resource_manager::get_default_settings ();
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	951
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	952 set_window_layout (settings);
18117 a829f40933a8 fix minimized main window after resetting window layout (bug #40832) Torsten <ttl@justmail.de> parents: 18034 diff changeset	953 showNormal (); // make sure main window is not minimized
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	954 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	955
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	956 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	957 main_window::change_directory (const QString& dir)
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	958 {
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	959 // Remove existing entry, if any, then add new directory at top and
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	960 // mark it as the current directory. Finally, update the file list
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	961 // widget.
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	962
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	963 int index = _current_directory_combo_box->findText (dir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	964
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	965 if (index >= 0)
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	966 _current_directory_combo_box->removeItem (index);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	967
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	968 _current_directory_combo_box->insertItem (0, dir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	969 _current_directory_combo_box->setCurrentIndex (0);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	970 }
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	971
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	972 void
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	973 main_window::browse_for_directory (void)
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	974 {
16578 0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	975 QString dir
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23774 diff changeset	976 = QFileDialog::getExistingDirectory (this, tr ("Browse directories"), nullptr,
18778 6e2b1de8348e only show directories in dialog box for setting new octave directory Torsten <ttl@justmail.de> parents: 18572 diff changeset	977 QFileDialog::ShowDirsOnly \|
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	978 QFileDialog::DontUseNativeDialog);
16578 0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	979
0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	980 set_current_working_directory (dir);
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	981
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	982 // FIXME: on Windows systems, the command window freezes after the
16578 0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	983 // previous actions. Forcing the focus appears to unstick it.
0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	984
0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	985 focus_command_window ();
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	986 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	987
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	988 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	989 main_window::set_current_working_directory (const QString& dir)
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	990 {
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	991 // Change to dir if it is an existing directory.
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	992
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	993 QString xdir = (dir.isEmpty () ? "." : dir);
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	994
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	995 QFileInfo fileInfo (xdir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	996
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	997 if (fileInfo.exists () && fileInfo.isDir ())
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	998 octave_link::post_event (this, &main_window::change_directory_callback,
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	999 xdir.toStdString ());
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	1000 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	1001
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	1002 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1003 main_window::change_directory_up (void)
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	1004 {
16526 01541f7321f7 correctly track directory for cd .. John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	1005 set_current_working_directory ("..");
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	1006 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	1007
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1008 // Slot that is called if return is pressed in the line edit of the
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1009 // combobox to change to a new directory or a directory that is already
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1010 // in the drop down list.
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1011
15626 1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	1012 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1013 main_window::accept_directory_line_edit (void)
15626 1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	1014 {
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1015 // Get new directory name, and change to it if it is new. Otherwise,
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1016 // the combo box will triggers the "activated" signal to change to the
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1017 // directory.
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1018
16518 59dbdaeeea40 * main_window.cc(construct_tool_bar): code cleanup and tool tips for combo box Torsten <ttl@justmail.de> parents: 16514 diff changeset	1019 QString dir = _current_directory_combo_box->currentText ();
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1020
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1021 int index = _current_directory_combo_box->findText (dir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1022
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1023 if (index < 0)
15626 1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	1024 set_current_working_directory (dir);
1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	1025 }
1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	1026
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	1027 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	1028 main_window::handle_enter_debugger (void)
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	1029 {
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	1030 setWindowTitle ("Octave (Debugging)");
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	1031
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	1032 _debug_continue->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	1033 _debug_step_into->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	1034 _debug_step_over->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	1035 _debug_step_out->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	1036 _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	1037
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1038 #if defined (HAVE_QSCINTILLA)
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	1039 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	1040 #endif
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	1041 }
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	1042
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	1043 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	1044 main_window::handle_exit_debugger (void)
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	1045 {
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	1046 setWindowTitle ("Octave");
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	1047
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	1048 _debug_continue->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	1049 _debug_step_into->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	1050 _debug_step_over->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	1051 _debug_step_out->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	1052 _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	1053
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1054 #if defined (HAVE_QSCINTILLA)
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	1055 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	1056 #endif
14752 564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1057 }
564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1058
564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1059 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1060 main_window::debug_continue (void)
14752 564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1061 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1062 octave_cmd_debug *cmd
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1063 = new octave_cmd_debug ("cont", _suppress_dbg_location);
21028 4a7d9c335402 GUI: move the command queue into a separate class Torsten <ttl@justmail.de> parents: 21027 diff changeset	1064 _cmd_queue.add_cmd (cmd);
14752 564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1065 }
564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1066
564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1067 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1068 main_window::debug_step_into (void)
14752 564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1069 {
21027 8000dacaea98 GUI: no more extra command queue for debug commands Torsten <ttl@justmail.de> parents: 20995 diff changeset	1070 octave_cmd_debug *cmd = new octave_cmd_debug ("in", _suppress_dbg_location);
21028 4a7d9c335402 GUI: move the command queue into a separate class Torsten <ttl@justmail.de> parents: 21027 diff changeset	1071 _cmd_queue.add_cmd (cmd);
14752 564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1072 }
564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1073
564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1074 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1075 main_window::debug_step_over (void)
14752 564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1076 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1077 octave_cmd_debug *cmd
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1078 = new octave_cmd_debug ("step", _suppress_dbg_location);
21028 4a7d9c335402 GUI: move the command queue into a separate class Torsten <ttl@justmail.de> parents: 21027 diff changeset	1079 _cmd_queue.add_cmd (cmd);
14752 564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1080 }
564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1081
564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1082 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1083 main_window::debug_step_out (void)
14752 564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1084 {
21027 8000dacaea98 GUI: no more extra command queue for debug commands Torsten <ttl@justmail.de> parents: 20995 diff changeset	1085 octave_cmd_debug *cmd = new octave_cmd_debug ("out", _suppress_dbg_location);
21028 4a7d9c335402 GUI: move the command queue into a separate class Torsten <ttl@justmail.de> parents: 21027 diff changeset	1086 _cmd_queue.add_cmd (cmd);
14752 564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1087 }
564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1088
564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1089 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1090 main_window::debug_quit (void)
14752 564cc673bcc5 Added menu for debugging. Now sending debug control events, but these seem to not work flawlessly Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	1091 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1092 octave_cmd_debug *cmd
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1093 = new octave_cmd_debug ("quit", _suppress_dbg_location);
21028 4a7d9c335402 GUI: move the command queue into a separate class Torsten <ttl@justmail.de> parents: 21027 diff changeset	1094 _cmd_queue.add_cmd (cmd);
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	1095 }
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	1096
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	1097 void
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1098 main_window::handle_insert_debugger_pointer_request (const QString& file,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1099 int line)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1100 {
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1101 bool cmd_focus = command_window_has_focus ();
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1102
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1103 emit insert_debugger_pointer_signal (file, line);
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1104
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1105 if (cmd_focus)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1106 focus_command_window ();
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1107 }
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1108
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1109 void
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1110 main_window::handle_delete_debugger_pointer_request (const QString& file,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1111 int line)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1112 {
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1113 bool cmd_focus = command_window_has_focus ();
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1114
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1115 emit delete_debugger_pointer_signal (file, line);
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1116
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1117 if (cmd_focus)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1118 focus_command_window ();
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1119 }
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1120
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1121 void
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1122 main_window::handle_update_breakpoint_marker_request (bool insert,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1123 const QString& file,
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	1124 int line,
22599 51b395d24782 maint: strip tabs and trailing whitespace from C++ sources. John W. Eaton <jwe@octave.org> parents: 22587 diff changeset	1125 const QString& cond)
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1126 {
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1127 bool cmd_focus = command_window_has_focus ();
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1128
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	1129 emit update_breakpoint_marker_signal (insert, file, line, cond);
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1130
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1131 if (cmd_focus)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1132 focus_command_window ();
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1133 }
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1134
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1135 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1136 main_window::show_about_octave (void)
13548 5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	1137 {
17510 7542f4496974 eliminate some macros in version.h John W. Eaton <jwe@octave.org> parents: 17509 diff changeset	1138 std::string message
7542f4496974 eliminate some macros in version.h John W. Eaton <jwe@octave.org> parents: 17509 diff changeset	1139 = octave_name_version_copyright_copying_warranty_and_bugs (true);
13548 5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	1140
17510 7542f4496974 eliminate some macros in version.h John W. Eaton <jwe@octave.org> parents: 17509 diff changeset	1141 QMessageBox::about (this, tr ("About Octave"),
7542f4496974 eliminate some macros in version.h John W. Eaton <jwe@octave.org> parents: 17509 diff changeset	1142 QString::fromStdString (message));
13548 5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	1143 }
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	1144
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	1145 void
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	1146 main_window::closeEvent (QCloseEvent *e)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	1147 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	1148 e->ignore ();
19773 034bcac0b61c use of C++ API for running a file (bug #42307) Torsten <ttl@justmail.de> parents: 19739 diff changeset	1149 octave_cmd_exec *cmd = new octave_cmd_exec ("exit");
21028 4a7d9c335402 GUI: move the command queue into a separate class Torsten <ttl@justmail.de> parents: 21027 diff changeset	1150 _cmd_queue.add_cmd (cmd);
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	1151 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1152
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	1153 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1154 main_window::read_settings (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	1155 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	1156 QSettings *settings = resource_manager::get_settings ();
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1157
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20278 diff changeset	1158 if (! settings)
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16399 diff changeset	1159 {
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1160 qDebug ("Error: QSettings pointer from resource manager is NULL.");
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16399 diff changeset	1161 return;
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16399 diff changeset	1162 }
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	1163
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1164 set_window_layout (settings);
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1165
15465 ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1166 // restore the list of the last directories
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1167 QStringList curr_dirs
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1168 = settings->value ("MainWindow/current_directory_list").toStringList ();
15465 ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1169 for (int i=0; i < curr_dirs.size (); i++)
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1170 {
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1171 _current_directory_combo_box->addItem (curr_dirs.at (i));
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1172 }
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16399 diff changeset	1173 emit settings_changed (settings);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1174 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1175
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	1176 void
19303 c6615ca0a11d horizontal scrollbar for GUI terminal on Windows systems John W. Eaton <jwe@octave.org> parents: 19302 diff changeset	1177 main_window::init_terminal_size (void)
c6615ca0a11d horizontal scrollbar for GUI terminal on Windows systems John W. Eaton <jwe@octave.org> parents: 19302 diff changeset	1178 {
c6615ca0a11d horizontal scrollbar for GUI terminal on Windows systems John W. Eaton <jwe@octave.org> parents: 19302 diff changeset	1179 emit init_terminal_size_signal ();
c6615ca0a11d horizontal scrollbar for GUI terminal on Windows systems John W. Eaton <jwe@octave.org> parents: 19302 diff changeset	1180 }
c6615ca0a11d horizontal scrollbar for GUI terminal on Windows systems John W. Eaton <jwe@octave.org> parents: 19302 diff changeset	1181
c6615ca0a11d horizontal scrollbar for GUI terminal on Windows systems John W. Eaton <jwe@octave.org> parents: 19302 diff changeset	1182 void
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1183 main_window::set_window_layout (QSettings *settings)
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1184 {
18435 4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1185 #if ! defined (Q_OS_WIN32)
4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1186 restoreState (settings->value ("MainWindow/windowState").toByteArray ());
4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1187 restoreGeometry (settings->value ("MainWindow/geometry").toByteArray ());
4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1188 #endif
17083 ceca3e65a8fe make sure a central menu bar does not show a widgets title but "Octave" Torsten <ttl@justmail.de> parents: 17029 diff changeset	1189
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1190 // Restore the geometry of all dock-widgets
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	1191 foreach (octave_dock_widget *widget, dock_widget_list ())
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1192 {
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	1193 QString name = widget->objectName ();
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1194
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	1195 if (! name.isEmpty ())
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1196 {
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	1197 bool floating = settings->value
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	1198 ("DockWidgets/" + name + "Floating", false).toBool ();
17899 14c427b5c5c1 Restore geometry of floating widgets after restart in windows (bug #40485) Torsten <ttl@justmail.de> parents: 17890 diff changeset	1199 bool visible = settings->value
14c427b5c5c1 Restore geometry of floating widgets after restart in windows (bug #40485) Torsten <ttl@justmail.de> parents: 17890 diff changeset	1200 ("DockWidgets/" + name + "Visible", true).toBool ();
14c427b5c5c1 Restore geometry of floating widgets after restart in windows (bug #40485) Torsten <ttl@justmail.de> parents: 17890 diff changeset	1201
14c427b5c5c1 Restore geometry of floating widgets after restart in windows (bug #40485) Torsten <ttl@justmail.de> parents: 17890 diff changeset	1202 // If floating, make window from widget.
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	1203 if (floating)
16818 caf3d2a45da0 clean up some code for undocking and docking widgets Torsten <ttl@justmail.de> parents: 16811 diff changeset	1204 widget->make_window ();
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	1205 else if (! widget->parent ()) // should not be floating but is
17090 1d544ac39369 show correct undock-button of widgets when window layout is resetted Torsten <ttl@justmail.de> parents: 17083 diff changeset	1206 widget->make_widget (false); // no docking, just reparent
18435 4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1207 #if ! defined (Q_OS_WIN32)
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	1208 // restore geometry
17686 65544374c1cf restore (un)docking of widgets without reparenting on non-windows systems Torsten <ttl@justmail.de> parents: 17676 diff changeset	1209 QVariant val = settings->value ("DockWidgets/" + name);
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	1210 widget->restoreGeometry (val.toByteArray ());
17899 14c427b5c5c1 Restore geometry of floating widgets after restart in windows (bug #40485) Torsten <ttl@justmail.de> parents: 17890 diff changeset	1211 #endif
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	1212 // make widget visible if desired
17083 ceca3e65a8fe make sure a central menu bar does not show a widgets title but "Octave" Torsten <ttl@justmail.de> parents: 17029 diff changeset	1213 if (floating && visible) // floating and visible
18435 4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1214 {
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1215 if (settings->value ("DockWidgets/" + widget->objectName ()
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1216 + "_minimized").toBool ())
18435 4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1217 widget->showMinimized ();
4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1218 else
4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1219 widget->setVisible (true);
4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1220 }
17083 ceca3e65a8fe make sure a central menu bar does not show a widgets title but "Octave" Torsten <ttl@justmail.de> parents: 17029 diff changeset	1221 else
17090 1d544ac39369 show correct undock-button of widgets when window layout is resetted Torsten <ttl@justmail.de> parents: 17083 diff changeset	1222 {
1d544ac39369 show correct undock-button of widgets when window layout is resetted Torsten <ttl@justmail.de> parents: 17083 diff changeset	1223 widget->make_widget ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1224 widget->setVisible (visible); // not floating -> show
17090 1d544ac39369 show correct undock-button of widgets when window layout is resetted Torsten <ttl@justmail.de> parents: 17083 diff changeset	1225 }
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1226 }
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1227 }
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1228
18435 4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1229 #if defined (Q_OS_WIN32)
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	1230 restoreState (settings->value ("MainWindow/windowState").toByteArray ());
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1231 restoreGeometry (settings->value ("MainWindow/geometry").toByteArray ());
18435 4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1232 #endif
4e49bc41f899 fix problems with gui startup (bug #41452) and focus issues (bug #40823) Torsten <ttl@justmail.de> parents: 18287 diff changeset	1233
17995 ea1db0ede4ce make sure Octave is displayed in a global menu bar, not another widget name Torsten <ttl@justmail.de> parents: 17988 diff changeset	1234 show ();
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1235 }
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1236
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1237 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1238 main_window::write_settings (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	1239 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	1240 QSettings *settings = resource_manager::get_settings ();
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20278 diff changeset	1241 if (! settings)
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16399 diff changeset	1242 {
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1243 qDebug ("Error: QSettings pointer from resource manager is NULL.");
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16399 diff changeset	1244 return;
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16399 diff changeset	1245 }
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	1246
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	1247 settings->setValue ("MainWindow/geometry", saveGeometry ());
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	1248 settings->setValue ("MainWindow/windowState", saveState ());
15465 ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1249 // write the list of recent used directories
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1250 QStringList curr_dirs;
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1251 for (int i=0; i<_current_directory_combo_box->count (); i++)
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1252 {
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1253 curr_dirs.append (_current_directory_combo_box->itemText (i));
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	1254 }
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1255 settings->setValue ("MainWindow/current_directory_list", curr_dirs);
14694 ea11c9d8aa47 Calling qApp->quit () via QMetaObject::invoke caused a segfault, now exits cleanly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14693 diff changeset	1256 settings->sync ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1257 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1258
15987 47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	1259 // Connecting the signals emitted when the visibility of a widget changes.
47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	1260 // This has to be done after the window is shown (see octave-gui.cc)
47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	1261 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1262 main_window::connect_visibility_changed (void)
15987 47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	1263 {
17617 9abb1422d60b correct indication of news-windows visibility in the window menu Torsten <ttl@justmail.de> parents: 17599 diff changeset	1264 foreach (octave_dock_widget *widget, dock_widget_list ())
9abb1422d60b correct indication of news-windows visibility in the window menu Torsten <ttl@justmail.de> parents: 17599 diff changeset	1265 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	1266
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1267 #if defined (HAVE_QSCINTILLA)
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	1268 editor_window->enable_menu_shortcuts (false);
19589 4fe86a372f10 Fix compilation error when building without QScintilla Mike Miller <mtmiller@ieee.org> parents: 19585 diff changeset	1269 #endif
15987 47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	1270 }
47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	1271
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1272 void
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1273 main_window::copyClipboard (void)
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1274 {
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1275 if (_current_directory_combo_box->hasFocus ())
944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1276 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23387 diff changeset	1277 QLineEdit *edit = _current_directory_combo_box->lineEdit ();
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1278 if (edit && edit->hasSelectedText ())
944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1279 {
944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1280 QClipboard *clipboard = QApplication::clipboard ();
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1281 clipboard->setText (edit->selectedText ());
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1282 }
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1283 }
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1284 else
944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1285 emit copyClipboard_signal ();
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1286 }
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1287
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1288 void
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1289 main_window::pasteClipboard (void)
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1290 {
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1291 if (_current_directory_combo_box->hasFocus ())
944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1292 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23387 diff changeset	1293 QLineEdit *edit = _current_directory_combo_box->lineEdit ();
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1294 QClipboard *clipboard = QApplication::clipboard ();
21568 3d60ed163b70 maint: Eliminate bad spacing around '='. Rik <rik@octave.org> parents: 21439 diff changeset	1295 QString str = clipboard->text ();
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1296 if (edit && str.length () > 0)
944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1297 {
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1298 edit->insert (str);
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1299 }
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1300 }
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1301 else
944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16818 diff changeset	1302 emit pasteClipboard_signal ();
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1303 }
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1304
18555 2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1305 void
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1306 main_window::selectAll (void)
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1307 {
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1308 if (_current_directory_combo_box->hasFocus ())
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1309 {
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23387 diff changeset	1310 QLineEdit *edit = _current_directory_combo_box->lineEdit ();
18555 2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1311 if (edit)
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1312 {
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1313 edit->selectAll ();
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1314 }
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1315 }
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1316 else
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1317 emit selectAll_signal ();
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1318 }
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	1319
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1320 // Connect the signals emitted when the Octave thread wants to create
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1321 // a dialog box of some sort. Perhaps a better place for this would be
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1322 // as part of the QUIWidgetCreator class. However, mainWindow currently
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1323 // is not a global variable and not accessible for connecting.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1324
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1325 void
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1326 main_window::connect_uiwidget_links (void)
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1327 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1328 connect (&uiwidget_creator,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1329 SIGNAL (create_dialog (const QString&, const QString&,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1330 const QString&, const QStringList&,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1331 const QString&, const QStringList&)),
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1332 this,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1333 SLOT (handle_create_dialog (const QString&, const QString&,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1334 const QString&, const QStringList&,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1335 const QString&, const QStringList&)));
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1336
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1337 // Register QIntList so that list of ints may be part of a signal.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1338 qRegisterMetaType<QIntList> ("QIntList");
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1339 connect (&uiwidget_creator,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1340 SIGNAL (create_listview (const QStringList&, const QString&,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1341 int, int, const QIntList&,
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	1342 const QString&, const QStringList&,
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1343 const QString&, const QString&)),
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1344 this,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1345 SLOT (handle_create_listview (const QStringList&, const QString&,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1346 int, int, const QIntList&,
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	1347 const QString&, const QStringList&,
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1348 const QString&, const QString&)));
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1349
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	1350 // Register QFloatList so that list of floats may be part of a signal.
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1351 qRegisterMetaType<QFloatList> ("QFloatList");
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1352 connect (&uiwidget_creator,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1353 SIGNAL (create_inputlayout (const QStringList&, const QString&,
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	1354 const QFloatList&, const QFloatList&,
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1355 const QStringList&)),
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1356 this,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1357 SLOT (handle_create_inputlayout (const QStringList&, const QString&,
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1358 const QFloatList&,
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1359 const QFloatList&,
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1360 const QStringList&)));
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	1361
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	1362 connect (&uiwidget_creator,
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	1363 SIGNAL (create_filedialog (const QStringList &,const QString&,
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1364 const QString&, const QString&,
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1365 const QString&)),
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	1366 this,
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	1367 SLOT (handle_create_filedialog (const QStringList &, const QString&,
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	1368 const QString&, const QString&,
16581 fa4a035e0cf4 Add octave_link uiputfile implementation John Donoghue <john.donoghue@ieee.org> parents: 16580 diff changeset	1369 const QString&)));
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1370 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1371
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1372 // Create a message dialog with specified string, buttons and decorative
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1373 // text.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1374
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1375 void
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1376 main_window::handle_create_dialog (const QString& message,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1377 const QString& title,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1378 const QString& icon,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1379 const QStringList& button,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1380 const QString& defbutton,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1381 const QStringList& role)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1382 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1383 MessageDialog *message_dialog = new MessageDialog (message, title, icon,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1384 button, defbutton, role);
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1385 message_dialog->setAttribute (Qt::WA_DeleteOnClose);
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1386 message_dialog->show ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1387 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1388
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1389 // Create a list dialog with specified list, initially selected, mode,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1390 // view size and decorative text.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1391
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1392 void
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1393 main_window::handle_create_listview (const QStringList& list,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1394 const QString& mode,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1395 int wd, int ht,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1396 const QIntList& initial,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1397 const QString& name,
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	1398 const QStringList& prompt,
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1399 const QString& ok_string,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1400 const QString& cancel_string)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1401 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1402 ListDialog *list_dialog = new ListDialog (list, mode, wd, ht,
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	1403 initial, name, prompt,
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1404 ok_string, cancel_string);
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1405
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1406 list_dialog->setAttribute (Qt::WA_DeleteOnClose);
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1407 list_dialog->show ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1408 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1409
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1410 // Create an input dialog with specified prompts and defaults, title and
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1411 // row/column size specifications.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1412 void
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1413 main_window::handle_create_inputlayout (const QStringList& prompt,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1414 const QString& title,
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	1415 const QFloatList& nr,
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	1416 const QFloatList& nc,
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1417 const QStringList& defaults)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1418 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1419 InputDialog *input_dialog = new InputDialog (prompt, title, nr, nc,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1420 defaults);
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1421
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1422 input_dialog->setAttribute (Qt::WA_DeleteOnClose);
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1423 input_dialog->show ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1424 }
15987 47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	1425
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	1426 void
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	1427 main_window::handle_create_filedialog (const QStringList& filters,
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1428 const QString& title,
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	1429 const QString& filename,
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	1430 const QString& dirname,
16581 fa4a035e0cf4 Add octave_link uiputfile implementation John Donoghue <john.donoghue@ieee.org> parents: 16580 diff changeset	1431 const QString& multimode)
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	1432 {
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	1433 FileDialog *file_dialog = new FileDialog (filters, title, filename,
16581 fa4a035e0cf4 Add octave_link uiputfile implementation John Donoghue <john.donoghue@ieee.org> parents: 16580 diff changeset	1434 dirname, multimode);
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	1435
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	1436 file_dialog->setAttribute (Qt::WA_DeleteOnClose);
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	1437 file_dialog->show ();
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	1438 }
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	1439
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1440
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1441 //
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1442 // Functions related to file editing
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1443 //
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1444 // These are moved from editor to here for also using them when octave
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1445 // is built without qscintilla
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1446 //
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1447 void
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1448 main_window::request_open_file (void)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1449 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1450 // Open file isn't a file_editor_tab or editor function since the file
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1451 // might be opened in an external editor. Hence, functionality is here.
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1452
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1453 QSettings *settings = resource_manager::get_settings ();
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1454 bool is_internal = editor_window
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1455 && ! settings->value ("useCustomFileEditor",false).toBool ();
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1456
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1457 // Create a NonModal message.
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1458 QWidget *p = this;
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1459 if (is_internal)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1460 p = editor_window;
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1461 QFileDialog *fileDialog = new QFileDialog (p);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1462 fileDialog->setNameFilter (tr ("Octave Files (.m);;All Files ()"));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1463
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1464 // Giving trouble under KDE (problem is related to Qt signal handling on unix,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1465 // see https://bugs.kde.org/show_bug.cgi?id=260719 ,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1466 // it had/has no effect on Windows, though)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1467 fileDialog->setOption (QFileDialog::DontUseNativeDialog, true);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1468
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1469 // define a new grid layout with the extra elements
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1470 QGridLayout *extra = new QGridLayout (fileDialog);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1471 QFrame *separator = new QFrame (fileDialog);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1472 separator->setFrameShape (QFrame::HLine); // horizontal line as separator
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1473 separator->setFrameStyle (QFrame::Sunken);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1474
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1475 if (is_internal)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1476 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1477 // combo box for encoding, only when using the internal editor
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1478 QLabel *label_enc = new QLabel (tr ("File Encoding:"));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1479 QComboBox *combo_enc = new QComboBox ();
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1480 resource_manager::combo_encoding (combo_enc);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1481 _file_encoding = QString (); // default
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1482
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1483 // track changes in the combo boxes
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1484 connect (combo_enc, SIGNAL (currentIndexChanged (QString)),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1485 this, SLOT (set_file_encoding (QString)));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1486
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1487 // build the extra grid layout
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1488 extra->addWidget (separator,0,0,1,3);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1489 extra->addWidget (label_enc,1,0);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1490 extra->addWidget (combo_enc,1,1);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1491 extra->addItem (new QSpacerItem (1,20,QSizePolicy::Expanding,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1492 QSizePolicy::Fixed), 1,2);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1493
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1494 // and add the extra grid layout to the dialog's layout
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23433 diff changeset	1495 QGridLayout dialog_layout = dynamic_cast<QGridLayout > (
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1496 fileDialog->layout ());
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1497 dialog_layout->addLayout (extra,dialog_layout->rowCount (),0,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1498 1,dialog_layout->columnCount ());
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1499 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1500
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1501 fileDialog->setAcceptMode (QFileDialog::AcceptOpen);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1502 fileDialog->setViewMode (QFileDialog::Detail);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1503 fileDialog->setFileMode (QFileDialog::ExistingFiles);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1504 fileDialog->setDirectory (_current_directory_combo_box->itemText (0));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1505
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1506 connect (fileDialog, SIGNAL (filesSelected (const QStringList&)),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1507 this, SLOT (request_open_files (const QStringList&)));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1508
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1509 fileDialog->setWindowModality (Qt::NonModal);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1510 fileDialog->setAttribute (Qt::WA_DeleteOnClose);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1511 fileDialog->show ();
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1512 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1513
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1514 void
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1515 main_window::set_file_encoding (const QString& new_encoding)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1516 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1517 _file_encoding = new_encoding;
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1518 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1519
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1520 // The following slot is called after files have been selected in the
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1521 // open file dialog., possibly with a new selected encoding stored in
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1522 // _file_encoding
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1523 void
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1524 main_window::request_open_files (const QStringList& open_file_names)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1525 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1526 for (int i = 0; i < open_file_names.count (); i++)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1527 emit open_file_signal (open_file_names.at (i), _file_encoding, -1);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1528 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1529
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1530 void
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1531 main_window::handle_edit_mfile_request (const QString& fname,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1532 const QString& ffile,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1533 const QString& curr_dir, int line)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1534 {
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	1535 octave::interpreter& interp
b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	1536 = octave::__get_interpreter__ ("main_window::clear_workspace_callback");
b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	1537
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1538 // Is it a regular function within the search path? (Call __which__)
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	1539 octave_value_list fct = F__which__ (interp, ovl (fname.toStdString ()),0);
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1540 octave_map map = fct(0).map_value ();
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1541
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1542 QString type = QString::fromStdString (
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1543 map.contents ("type").data ()[0].string_value ());
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1544 QString name = QString::fromStdString (
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1545 map.contents ("name").data ()[0].string_value ());
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1546
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1547 QString message = QString ();
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1548 QString filename = QString ();
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1549
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1550 if (type == QString ("built-in function"))
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1551 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1552 // built in function: can't edit
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1553 message = tr ("%1 is a built-in function");
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1554 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1555 else if (type.isEmpty ())
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1556 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1557 // function not known to octave -> try directory of edited file
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1558 // get directory
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1559 QDir dir;
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1560 if (ffile.isEmpty ())
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1561 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1562 if (curr_dir.isEmpty ())
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1563 dir = QDir (_current_directory_combo_box->itemText (0));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1564 else
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1565 dir = QDir (curr_dir);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1566 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1567 else
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1568 dir = QDir (QFileInfo (ffile).canonicalPath ());
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1569
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1570 // function not known to octave -> try directory of edited file
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1571 QFileInfo file = QFileInfo (dir, fname + ".m");
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1572
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1573 if (file.exists ())
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1574 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1575 filename = file.canonicalFilePath (); // local file exists
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1576 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1577 else
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1578 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1579 // local file does not exist -> try private directory
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1580 file = QFileInfo (ffile);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1581 file = QFileInfo (QDir (file.canonicalPath () + "/private"),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1582 fname + ".m");
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1583
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1584 if (file.exists ())
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1585 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1586 filename = file.canonicalFilePath (); // private function exists
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1587 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1588 else
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1589 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1590 message = tr ("Can not find function %1"); // no file found
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1591 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1592 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1593 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1594
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1595 if (! message.isEmpty ())
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1596 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1597 QMessageBox *msgBox
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1598 = new QMessageBox (QMessageBox::Critical,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1599 tr ("Octave Editor"),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1600 message.arg (name),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1601 QMessageBox::Ok, this);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1602
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1603 msgBox->setWindowModality (Qt::NonModal);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1604 msgBox->setAttribute (Qt::WA_DeleteOnClose);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1605 msgBox->show ();
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1606 return;
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1607 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1608
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1609 if (filename.isEmpty ())
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1610 filename = QString::fromStdString (
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1611 map.contents ("file").data ()[0].string_value ());
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1612
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1613 if (! filename.endsWith (".m"))
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1614 filename.append (".m");
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1615
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1616 emit open_file_signal (filename, QString (), line); // default encoding
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1617 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1618
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1619 // Create a new script
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1620 void
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1621 main_window::request_new_script (const QString& commands)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1622 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1623 emit new_file_signal (commands);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1624 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1625
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1626 // Create a new function and open it
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1627 void
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1628 main_window::request_new_function (bool)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1629 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1630 bool ok;
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1631 // Get the name of the new function: Parent of the input dialog is the
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1632 // editor window or the main window. The latter is chosen, if a custom
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1633 // editor is used or qscintilla is not available
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1634 QWidget *p = editor_window;
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1635 QSettings *settings = resource_manager::get_settings ();
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1636 if (! p \|\| settings->value ("useCustomFileEditor",false).toBool ())
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1637 p = this;
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1638 QString new_name = QInputDialog::getText (p, tr ("New Function"),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1639 tr ("New function name:\n"), QLineEdit::Normal, "", &ok);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1640
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1641 if (ok && new_name.length () > 0)
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1642 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1643 // append suffix if it not already exists
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1644 if (new_name.rightRef (2) != ".m")
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1645 new_name.append (".m");
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1646 // check whether new files are created without prompt
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1647 if (! settings->value ("editor/create_new_file",false).toBool ())
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1648 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1649 // no, so enable this settings and wait for end of new file loading
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1650 settings->setValue ("editor/create_new_file",true);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1651 connect (editor_window, SIGNAL (file_loaded_signal ()),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1652 this, SLOT (restore_create_file_setting ()));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1653 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1654 // start the edit command
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1655 execute_command_in_terminal ("edit " + new_name);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1656 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1657 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1658
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1659 void
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1660 main_window::restore_create_file_setting ()
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1661 {
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1662 // restore the new files creation setting
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1663 QSettings *settings = resource_manager::get_settings ();
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1664 settings->setValue ("editor/create_new_file",false);
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1665 disconnect (editor_window, SIGNAL (file_loaded_signal ()),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1666 this, SLOT (restore_create_file_setting ()));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1667 }
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1668
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1669
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1670 //
15987 47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	1671 // Main subroutine of the constructor
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1672 //
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	1673 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1674 main_window::construct (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	1675 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	1676 _closing = false; // flag for editor files when closed
16445 3f8d3fc907af store workspace model in main_window, not in workspace view John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	1677
15607 c9c79d4a0a00 Delete dynamic objects in the main_window destructor for proper cleanup. (bug #37234) Daniel J Sebald <daniel.sebald@ieee.org> parents: 15591 diff changeset	1678 // Create and set the central widget. QMainWindow takes ownership of
c9c79d4a0a00 Delete dynamic objects in the main_window destructor for proper cleanup. (bug #37234) Daniel J Sebald <daniel.sebald@ieee.org> parents: 15591 diff changeset	1679 // the widget (pointer) so there is no need to delete the object upon
c9c79d4a0a00 Delete dynamic objects in the main_window destructor for proper cleanup. (bug #37234) Daniel J Sebald <daniel.sebald@ieee.org> parents: 15591 diff changeset	1680 // destroying this main_window.
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1681
14693 c952f1e35e50 Added patch from Marco Atzeri for QTerminal to build with cygwin. Removed some compiler warnings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14692 diff changeset	1682 QWidget *dummyWidget = new QWidget ();
14698 79c9a6d06590 Wrote SymbolInformation struct and refactored code that updates the symbol table. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14695 diff changeset	1683 dummyWidget->setObjectName ("CentralDummyWidget");
79c9a6d06590 Wrote SymbolInformation struct and refactored code that updates the symbol table. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14695 diff changeset	1684 dummyWidget->resize (10, 10);
14693 c952f1e35e50 Added patch from Marco Atzeri for QTerminal to build with cygwin. Removed some compiler warnings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14692 diff changeset	1685 dummyWidget->setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Minimum);
14698 79c9a6d06590 Wrote SymbolInformation struct and refactored code that updates the symbol table. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14695 diff changeset	1686 dummyWidget->hide ();
79c9a6d06590 Wrote SymbolInformation struct and refactored code that updates the symbol table. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14695 diff changeset	1687 setCentralWidget (dummyWidget);
14692 d6d250812c01 Made the terminal window dockable, too. Now the whole interface is fully dockable. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14690 diff changeset	1688
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1689 connect_uiwidget_links ();
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	1690
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1691 construct_octave_qt_link ();
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1692
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1693 if (_start_gui)
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1694 {
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1695 setWindowIcon (QIcon (":/actions/icons/logo.png"));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1696
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1697 workspace_window->setModel (_workspace_model);
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1698
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1699 connect (_workspace_model, SIGNAL (model_changed (void)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1700 workspace_window, SLOT (handle_model_changed (void)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1701
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1702 connect (_workspace_model,
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1703 SIGNAL (rename_variable (const QString&, const QString&)),
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1704 this,
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1705 SLOT (handle_rename_variable_request (const QString&,
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1706 const QString&)));
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1707
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1708 connect (command_window, SIGNAL (interrupt_signal (void)),
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1709 this, SLOT (interrupt_interpreter (void)));
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1710
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1711 construct_menu_bar ();
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1712
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1713 construct_tool_bar ();
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1714
22177 6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1715 // Order is important. Deleting QSettings must be last.
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1716 connect (qApp, SIGNAL (aboutToQuit ()),
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1717 command_window, SLOT (save_settings ()));
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1718 connect (qApp, SIGNAL (aboutToQuit ()),
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1719 history_window, SLOT (save_settings ()));
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1720 connect (qApp, SIGNAL (aboutToQuit ()),
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1721 file_browser_window, SLOT (save_settings ()));
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1722 connect (qApp, SIGNAL (aboutToQuit ()),
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1723 doc_browser_window, SLOT (save_settings ()));
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1724 connect (qApp, SIGNAL (aboutToQuit ()),
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1725 workspace_window, SLOT (save_settings ()));
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1726 connect (qApp, SIGNAL (aboutToQuit ()),
23160 50e3a3e962c0 make editor save its widget settings again when octave quits Torsten <mttl@mailbox.org> parents: 22599 diff changeset	1727 editor_window, SLOT (save_settings ()));
50e3a3e962c0 make editor save its widget settings again when octave quits Torsten <mttl@mailbox.org> parents: 22599 diff changeset	1728 connect (qApp, SIGNAL (aboutToQuit ()),
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1729 this, SLOT (prepare_to_exit ()));
22177 6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1730 connect (qApp, SIGNAL (aboutToQuit ()),
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1731 shortcut_manager::instance, SLOT (cleanup_instance ()));
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1732 // QSettings are saved upon deletion (i.e., cleanup_instance)
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1733 connect (qApp, SIGNAL (aboutToQuit ()),
6e9f5408c0db Save settings in Qt convention, delete all children in destructors (bug #45366) Daniel J Sebald <daniel.sebald@ieee.org> parents: 22089 diff changeset	1734 resource_manager::instance, SLOT (cleanup_instance ()));
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1735
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1736 connect (qApp, SIGNAL (focusChanged (QWidget, QWidget)),
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	1737 this, SLOT (focus_changed (QWidget, QWidget)));
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1738
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1739 connect (this, SIGNAL (settings_changed (const QSettings *)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1740 this, SLOT (notice_settings (const QSettings *)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1741
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1742 connect (this, SIGNAL (editor_focus_changed (bool)),
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	1743 this, SLOT (disable_menu_shortcuts (bool)));
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1744
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1745 connect (this, SIGNAL (editor_focus_changed (bool)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1746 editor_window, SLOT (enable_menu_shortcuts (bool)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1747
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1748 connect (editor_window,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1749 SIGNAL (request_open_file_external (const QString&, int)),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1750 _external_editor,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1751 SLOT (call_custom_editor (const QString&, int)));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1752
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1753 connect (_external_editor,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1754 SIGNAL (request_settings_dialog (const QString&)),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1755 this, SLOT (process_settings_dialog_request (const QString&)));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1756
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1757 connect (file_browser_window, SIGNAL (load_file_signal (const QString&)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1758 this, SLOT (handle_load_workspace_request (const QString&)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1759
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1760 connect (file_browser_window, SIGNAL (find_files_signal (const QString&)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1761 this, SLOT (find_files (const QString&)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1762
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1763 setWindowTitle ("Octave");
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1764
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1765 setDockOptions (QMainWindow::AnimatedDocks
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1766 \| QMainWindow::AllowNestedDocks
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1767 \| QMainWindow::AllowTabbedDocks);
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1768
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1769 addDockWidget (Qt::RightDockWidgetArea, command_window);
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1770 addDockWidget (Qt::RightDockWidgetArea, doc_browser_window);
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1771 tabifyDockWidget (command_window, doc_browser_window);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1772
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1773 #if defined (HAVE_QSCINTILLA)
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1774 addDockWidget (Qt::RightDockWidgetArea, editor_window);
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1775 tabifyDockWidget (command_window, editor_window);
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	1776 #endif
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1777
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1778 addDockWidget (Qt::LeftDockWidgetArea, file_browser_window);
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1779 addDockWidget (Qt::LeftDockWidgetArea, workspace_window);
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1780 addDockWidget (Qt::LeftDockWidgetArea, history_window);
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1781
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1782 int win_x = QApplication::desktop ()->width ();
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1783 int win_y = QApplication::desktop ()->height ();
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1784
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1785 if (win_x > 960)
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1786 win_x = 960;
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1787
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1788 if (win_y > 720)
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1789 win_y = 720;
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1790
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1791 setGeometry (0, 0, win_x, win_y);
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1792
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1793 setStatusBar (status_bar);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1794
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1795 #if defined (HAVE_QSCINTILLA)
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1796 connect (this,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1797 SIGNAL (insert_debugger_pointer_signal (const QString&, int)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1798 editor_window,
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1799 SLOT (handle_insert_debugger_pointer_request (const QString&,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1800 int)));
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1801
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1802 connect (this,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1803 SIGNAL (delete_debugger_pointer_signal (const QString&, int)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1804 editor_window,
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1805 SLOT (handle_delete_debugger_pointer_request (const QString&,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1806 int)));
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1807
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1808 connect (this,
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	1809 SIGNAL (update_breakpoint_marker_signal (bool, const QString&,
22599 51b395d24782 maint: strip tabs and trailing whitespace from C++ sources. John W. Eaton <jwe@octave.org> parents: 22587 diff changeset	1810 int, const QString&)),
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1811 editor_window,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1812 SLOT (handle_update_breakpoint_marker_request (bool,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1813 const QString&,
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	1814 int,
22599 51b395d24782 maint: strip tabs and trailing whitespace from C++ sources. John W. Eaton <jwe@octave.org> parents: 22587 diff changeset	1815 const QString&)));
16672 fd43631f09c2 Fix Qt error messages w/o QScintilla-dev installed (Bug #38878) John Donoghue <john.donoghue@ieee.org> parents: 16649 diff changeset	1816 #endif
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	1817
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1818 octave_link::post_event (this,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1819 &main_window::resize_command_window_callback);
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1820
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1821 configure_shortcuts ();
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1822 }
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1823 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1824
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1825 void
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1826 main_window::handle_octave_ready ()
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1827 {
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1828 // actions after the startup files are executed
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1829 QSettings *settings = resource_manager::get_settings ();
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1830
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1831 QDir startup_dir = QDir (); // current octave dir after startup
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1832
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1833 if (settings)
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1834 {
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1835 if (settings->value ("restore_octave_dir").toBool ())
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1836 {
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1837 // restore last dir from previous session
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1838 QStringList curr_dirs
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1839 = settings->value ("MainWindow/current_directory_list").toStringList ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1840 startup_dir
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1841 = QDir (curr_dirs.at (0)); // last dir in previous session
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1842 }
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1843 else if (! settings->value ("octave_startup_dir").toString ().isEmpty ())
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1844 {
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1845 // do not restore but there is a startup dir configured
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1846 startup_dir
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1847 = QDir (settings->value ("octave_startup_dir").toString ());
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1848 }
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1849 }
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1850
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1851 if (! startup_dir.exists ())
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1852 {
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1853 // the configured startup dir does not exist, take actual one
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1854 startup_dir = QDir ();
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1855 }
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1856
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1857 set_current_working_directory (startup_dir.absolutePath ());
18833 6504a1932637 auto completion offers builtins and file functions for octave (bug #41371) Torsten <ttl@justmail.de> parents: 18823 diff changeset	1858
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1859 if (editor_window)
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1860 {
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1861 #if defined (HAVE_QSCINTILLA)
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1862 // Octave ready, determine whether to create an empty script.
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1863 // This can not be done when the editor is created because all functions
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1864 // must be known for the lexer's auto completion informations
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1865 editor_window->empty_script (true, false);
23488 52a74f14345c restore last editor session not before octave is ready Torsten <mttl@mailbox.org> parents: 23479 diff changeset	1866 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	1867 #endif
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1868 }
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1869
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1870 if (_start_gui)
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1871 focus_command_window (); // make sure that the command window has focus
18945 d2100cb2331a make sure the command has focus at startup Torsten <ttl@justmail.de> parents: 18944 diff changeset	1872
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1873 }
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18288 diff changeset	1874
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1875 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1876 main_window::construct_octave_qt_link (void)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1877 {
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1878 _octave_qt_link = new octave_qt_link (this, m_app_context);
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	1879
23092 0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23070 diff changeset	1880 octave_link::connect_link (_octave_qt_link);
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	1881
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1882 connect (_octave_qt_link, SIGNAL (confirm_shutdown_signal ()),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1883 this, SLOT (confirm_shutdown_octave ()));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1884
20243 ede7224d062f Allow copying a figure to clipboard even in --no-gui mode (bug #44886) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20186 diff changeset	1885 connect (_octave_qt_link,
ede7224d062f Allow copying a figure to clipboard even in --no-gui mode (bug #44886) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20186 diff changeset	1886 SIGNAL (copy_image_to_clipboard_signal (const QString&, bool)),
ede7224d062f Allow copying a figure to clipboard even in --no-gui mode (bug #44886) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20186 diff changeset	1887 this, SLOT (copy_image_to_clipboard (const QString&, bool)));
ede7224d062f Allow copying a figure to clipboard even in --no-gui mode (bug #44886) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20186 diff changeset	1888
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1889 if (_start_gui)
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1890 {
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1891 connect (_octave_qt_link,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1892 SIGNAL (set_workspace_signal
19970 f7846f0ea6db GUI: enable workspace update when debugging (Bug #44455) John Donoghue parents: 19949 diff changeset	1893 (bool, bool, const QString&, const QStringList&,
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1894 const QStringList&, const QStringList&,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1895 const QStringList&, const QIntList&)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1896 _workspace_model,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1897 SLOT (set_workspace
19970 f7846f0ea6db GUI: enable workspace update when debugging (Bug #44455) John Donoghue parents: 19949 diff changeset	1898 (bool, bool, const QString&, const QStringList&,
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1899 const QStringList&, const QStringList&,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1900 const QStringList&, const QIntList&)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1901
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1902 connect (_octave_qt_link, SIGNAL (clear_workspace_signal ()),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1903 _workspace_model, SLOT (clear_workspace ()));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1904
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1905 connect (_octave_qt_link, SIGNAL (change_directory_signal (QString)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1906 this, SLOT (change_directory (QString)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1907 connect (_octave_qt_link, SIGNAL (change_directory_signal (QString)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1908 file_browser_window, SLOT (update_octave_directory (QString)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1909 connect (_octave_qt_link, SIGNAL (change_directory_signal (QString)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1910 editor_window, SLOT (update_octave_directory (QString)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1911
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1912 connect (_octave_qt_link,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1913 SIGNAL (execute_command_in_terminal_signal (QString)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1914 this, SLOT (execute_command_in_terminal (QString)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1915
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1916 connect (_octave_qt_link,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1917 SIGNAL (set_history_signal (const QStringList&)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1918 history_window, SLOT (set_history (const QStringList&)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1919
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1920 connect (_octave_qt_link,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1921 SIGNAL (append_history_signal (const QString&)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1922 history_window, SLOT (append_history (const QString&)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1923
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1924 connect (_octave_qt_link,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1925 SIGNAL (clear_history_signal (void)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1926 history_window, SLOT (clear_history (void)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1927
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1928 connect (_octave_qt_link, SIGNAL (enter_debugger_signal ()),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1929 this, SLOT (handle_enter_debugger ()));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1930
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1931 connect (_octave_qt_link, SIGNAL (exit_debugger_signal ()),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1932 this, SLOT (handle_exit_debugger ()));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1933
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1934 connect (_octave_qt_link,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1935 SIGNAL (show_preferences_signal (void)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1936 this, SLOT (process_settings_dialog_request ()));
17010 c50ee84842a9 Add preferences and prefdir functions John Donoghue <john.donoghue@ieee.org> parents: 16970 diff changeset	1937
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1938 connect (_octave_qt_link,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1939 SIGNAL (edit_file_signal (const QString&)),
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	1940 _active_editor,
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1941 SLOT (handle_edit_file_request (const QString&)));
16424 ad052cdc89ad use signal for octave_link::edit_file John W. Eaton <jwe@octave.org> parents: 16423 diff changeset	1942
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1943 connect (_octave_qt_link,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1944 SIGNAL (insert_debugger_pointer_signal (const QString&, int)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1945 this,
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1946 SLOT (handle_insert_debugger_pointer_request (const QString&,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1947 int)));
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1948
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1949 connect (_octave_qt_link,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1950 SIGNAL (delete_debugger_pointer_signal (const QString&, int)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1951 this,
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1952 SLOT (handle_delete_debugger_pointer_request (const QString&,
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	1953 int)));
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1954
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1955 connect (_octave_qt_link,
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	1956 SIGNAL (update_breakpoint_marker_signal (bool, const QString&,
22599 51b395d24782 maint: strip tabs and trailing whitespace from C++ sources. John W. Eaton <jwe@octave.org> parents: 22587 diff changeset	1957 int, const QString&)),
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1958 this,
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	1959 SLOT (handle_update_breakpoint_marker_request (bool,
22599 51b395d24782 maint: strip tabs and trailing whitespace from C++ sources. John W. Eaton <jwe@octave.org> parents: 22587 diff changeset	1960 const QString&,
21158 65827e9cccb8 Gui support for enhancement of dbstop. Lachlan Andrew <lachlanbis@gmail.com> parents: 21148 diff changeset	1961 int,
22599 51b395d24782 maint: strip tabs and trailing whitespace from C++ sources. John W. Eaton <jwe@octave.org> parents: 22587 diff changeset	1962 const QString&)));
19949 857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1963
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1964 connect (_octave_qt_link,
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1965 SIGNAL (show_doc_signal (const QString &)),
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1966 this, SLOT (handle_show_doc (const QString &)));
857a8f018f53 set up octave_link when running with --no-gui option (bug #44116) John W. Eaton <jwe@octave.org> parents: 19945 diff changeset	1967 }
17920 5c3f22dd0bbb raise SIGINT in octave_interpreter instead of in QTerminal John W. Eaton <jwe@octave.org> parents: 17918 diff changeset	1968
21428 217e6e97085b Prevent race conditions in GUI and interpreter initialization (bug #47326) Mike Miller <mtmiller@octave.org> parents: 21396 diff changeset	1969 // Defer initializing and executing the interpreter until after the main
217e6e97085b Prevent race conditions in GUI and interpreter initialization (bug #47326) Mike Miller <mtmiller@octave.org> parents: 21396 diff changeset	1970 // window and QApplication are running to prevent race conditions
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	1971 QTimer::singleShot (0, m_interpreter, SLOT (execute ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1972 }
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	1973
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1974 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1975 main_window::construct_menu_bar (void)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1976 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1977 QMenuBar *menu_bar = menuBar ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1978
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1979 construct_file_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1980
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1981 construct_edit_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1982
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1983 construct_debug_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1984
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1985 construct_window_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1986
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1987 construct_help_menu (menu_bar);
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	1988
f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	1989 construct_news_menu (menu_bar);
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	1990
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	1991 #if defined (HAVE_QSCINTILLA)
20989 98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	1992 // call the editor to add actions which should also be available in the
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	1993 // editor's menu and tool bar
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	1994 QList<QAction*> shared_actions;
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	1995 shared_actions << _new_script_action
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	1996 << _new_function_action
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	1997 << _open_action
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	1998 << _find_files_action
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	1999 << _undo_action
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	2000 << _copy_action
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	2001 << _paste_action
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	2002 <<_select_all_action;
98e75f952a36 add find files action also to the editor menu Torsten <ttl@justmail.de> parents: 20986 diff changeset	2003 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	2004 #endif
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2005 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2006
18697 908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2007 QAction*
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23432 diff changeset	2008 main_window::add_action (QMenu *menu, const QIcon& icon, const QString& text,
18710 584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2009 const char member, const QWidget receiver)
18697 908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2010 {
18710 584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2011 QAction *a;
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2012
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2013 if (receiver)
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2014 a = menu->addAction (icon, text, receiver, member);
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2015 else
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2016 a = menu->addAction (icon, text, this, member);
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2017
18697 908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2018 addAction (a); // important for shortcut context
908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2019 a->setShortcutContext (Qt::ApplicationShortcut);
908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2020 return a;
908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2021 }
908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2022
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2023 void
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	2024 main_window::disable_menu_shortcuts (bool disable)
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2025 {
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	2026 QHash<QMenu*, QStringList>::const_iterator i = _hash_menu_text.constBegin ();
bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	2027
bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	2028 while (i != _hash_menu_text.constEnd ())
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2029 {
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	2030 i.key ()->setTitle (i.value ().at (disable));
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2031 ++i;
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2032 }
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2033 }
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2034
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2035 QMenu*
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2036 main_window::m_add_menu (QMenuBar *p, QString name)
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2037 {
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2038 QMenu *menu = p->addMenu (name);
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2039
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2040 QString base_name = name; // get a copy
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2041 // replace intended '&' ("&&") by a temp. string
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23796 diff changeset	2042 base_name.replace ("&&", "___octave_amp_replacement___");
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2043 // remove single '&' (shortcut)
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2044 base_name.remove ("&");
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2045 // restore intended '&'
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23796 diff changeset	2046 base_name.replace ("___octave_amp_replacement___", "&&");
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2047
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2048 // remember names with and without shortcut
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2049 _hash_menu_text[menu] = QStringList () << name << base_name;
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2050
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2051 return menu;
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2052 }
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2053
b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2054 void
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2055 main_window::construct_file_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2056 {
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2057 QMenu *file_menu = m_add_menu (p, tr ("&File"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2058
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2059 construct_new_menu (file_menu);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2060
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2061 _open_action
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2062 = file_menu->addAction (resource_manager::icon ("document-open"),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2063 tr ("Open..."));
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2064 _open_action->setShortcutContext (Qt::ApplicationShortcut);
19180 a748865bfafb improve some menu texts and tool tips (bug #43200) Torsten <ttl@justmail.de> parents: 18945 diff changeset	2065 _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	2066
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	2067 #if defined (HAVE_QSCINTILLA)
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	2068 file_menu->addMenu (editor_window->get_mru_menu ());
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2069 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2070
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2071 file_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2072
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2073 _load_workspace_action
18257 cae24b7cfaf4 minor fix of text strings and related translations (part of bug #41201) Torsten <ttl@justmail.de> parents: 18251 diff changeset	2074 = file_menu->addAction (tr ("Load Workspace..."));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2075
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2076 _save_workspace_action
18257 cae24b7cfaf4 minor fix of text strings and related translations (part of bug #41201) Torsten <ttl@justmail.de> parents: 18251 diff changeset	2077 = file_menu->addAction (tr ("Save Workspace As..."));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2078
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2079 file_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2080
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2081 _exit_action = file_menu->addAction (tr ("Exit"));
78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2082 _exit_action->setShortcutContext (Qt::ApplicationShortcut);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2083
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2084 connect (_open_action, SIGNAL (triggered ()),
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2085 this, SLOT (request_open_file ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2086
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2087 connect (_load_workspace_action, SIGNAL (triggered ()),
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	2088 this, SLOT (handle_load_workspace_request ()));
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	2089
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2090 connect (_save_workspace_action, SIGNAL (triggered ()),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2091 this, SLOT (handle_save_workspace_request ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2092
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2093 connect (_exit_action, SIGNAL (triggered ()),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2094 this, SLOT (close ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2095 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2096
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2097 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2098 main_window::construct_new_menu (QMenu *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2099 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2100 QMenu *new_menu = p->addMenu (tr ("New"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2101
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2102 _new_script_action
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2103 = new_menu->addAction (resource_manager::icon ("document-new"),
18345 dfc6ef6ac455 some text improvements in the gui (#bug 41201) Torsten <ttl@justmail.de> parents: 18318 diff changeset	2104 tr ("New Script"));
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2105 _new_script_action->setShortcutContext (Qt::ApplicationShortcut);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2106
19180 a748865bfafb improve some menu texts and tool tips (bug #43200) Torsten <ttl@justmail.de> parents: 18945 diff changeset	2107 _new_function_action = new_menu->addAction (tr ("New Function..."));
17901 2c241092b47b use edit.m for creating a new function with the gui (bug #40502) Torsten <ttl@justmail.de> parents: 17899 diff changeset	2108 _new_function_action->setEnabled (true);
2c241092b47b use edit.m for creating a new function with the gui (bug #40502) Torsten <ttl@justmail.de> parents: 17899 diff changeset	2109 _new_function_action->setShortcutContext (Qt::ApplicationShortcut);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2110
19180 a748865bfafb improve some menu texts and tool tips (bug #43200) Torsten <ttl@justmail.de> parents: 18945 diff changeset	2111 _new_figure_action = new_menu->addAction (tr ("New Figure"));
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2112 _new_figure_action->setEnabled (true);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2113
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2114 connect (_new_script_action, SIGNAL (triggered ()),
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2115 this, SLOT (request_new_script ()));
17901 2c241092b47b use edit.m for creating a new function with the gui (bug #40502) Torsten <ttl@justmail.de> parents: 17899 diff changeset	2116 connect (_new_function_action, SIGNAL (triggered ()),
23385 41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2117 this, SLOT (request_new_function ()));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2118 connect (this, SIGNAL (new_file_signal (const QString&)),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2119 _active_editor, SLOT (request_new_file (const QString&)));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2120 connect (this, SIGNAL (open_file_signal (const QString&)),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2121 _active_editor, SLOT (request_open_file (const QString&)));
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2122 connect (this,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2123 SIGNAL (open_file_signal (const QString&, const QString&, int)),
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2124 _active_editor,
41639665aa34 improve opening files from gui when built without qscintilla (bug #39179) Torsten <mttl@mailbox.org> parents: 23380 diff changeset	2125 SLOT (request_open_file (const QString&, const QString&, int)));
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	2126
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2127 connect (_new_figure_action, SIGNAL (triggered ()),
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	2128 this, SLOT (handle_new_figure_request ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2129 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2130
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2131 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2132 main_window::construct_edit_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2133 {
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2134 QMenu *edit_menu = m_add_menu (p, tr ("&Edit"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2135
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2136 QKeySequence ctrl_shift = Qt::ControlModifier + Qt::ShiftModifier;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2137
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2138 _undo_action
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2139 = edit_menu->addAction (resource_manager::icon ("edit-undo"), tr ("Undo"));
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	2140 _undo_action->setShortcutContext (Qt::ApplicationShortcut);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2141
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2142 edit_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2143
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2144 _copy_action
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2145 = edit_menu->addAction (resource_manager::icon ("edit-copy"),
16649 de1f8e4b6b9b more copy/paste tweaks John W. Eaton <jwe@octave.org> parents: 16648 diff changeset	2146 tr ("Copy"), this, SLOT (copyClipboard ()));
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	2147 _copy_action->setShortcutContext (Qt::ApplicationShortcut);
17117 47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2148
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2149 _paste_action
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2150 = edit_menu->addAction (resource_manager::icon ("edit-paste"),
16649 de1f8e4b6b9b more copy/paste tweaks John W. Eaton <jwe@octave.org> parents: 16648 diff changeset	2151 tr ("Paste"), this, SLOT (pasteClipboard ()));
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	2152 _paste_action->setShortcutContext (Qt::ApplicationShortcut);
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2153
086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2154 _select_all_action
18555 2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18498 diff changeset	2155 = edit_menu->addAction (tr ("Select All"), this, SLOT (selectAll ()));
20986 00835323fb44 prevent shortcut ambiguity between main and editor window Torsten <ttl@justmail.de> parents: 20955 diff changeset	2156 _select_all_action->setShortcutContext (Qt::ApplicationShortcut);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2157
17117 47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2158 _clear_clipboard_action
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2159 = edit_menu->addAction (tr ("Clear Clipboard"), this,
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2160 SLOT (clear_clipboard ()));
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2161
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2162 edit_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2163
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20132 diff changeset	2164 _find_files_action
19908 4e15e8cb16ae gui: added icons menu items that have icons used elsewhere John Donoghue parents: 19907 diff changeset	2165 = edit_menu->addAction (resource_manager::icon ("edit-find"),
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	2166 tr ("Find Files..."));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2167
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2168 edit_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2169
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2170 _clear_command_window_action
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2171 = edit_menu->addAction (tr ("Clear Command Window"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2172
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2173 _clear_command_history_action
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2174 = edit_menu->addAction (tr ("Clear Command History"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2175
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2176 _clear_workspace_action
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2177 = edit_menu->addAction (tr ("Clear Workspace"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2178
20039 3538c2824dd8 GUI: Move preferences to edit menu (Bug #44725) John Donoghue parents: 19985 diff changeset	2179 edit_menu->addSeparator ();
3538c2824dd8 GUI: Move preferences to edit menu (Bug #44725) John Donoghue parents: 19985 diff changeset	2180
3538c2824dd8 GUI: Move preferences to edit menu (Bug #44725) John Donoghue parents: 19985 diff changeset	2181 _preferences_action
3538c2824dd8 GUI: Move preferences to edit menu (Bug #44725) John Donoghue parents: 19985 diff changeset	2182 = edit_menu->addAction (resource_manager::icon ("preferences-system"),
3538c2824dd8 GUI: Move preferences to edit menu (Bug #44725) John Donoghue parents: 19985 diff changeset	2183 tr ("Preferences..."));
3538c2824dd8 GUI: Move preferences to edit menu (Bug #44725) John Donoghue parents: 19985 diff changeset	2184
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2185 connect (_find_files_action, SIGNAL (triggered ()),
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2186 this, SLOT (find_files ()));
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2187
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2188 connect (_clear_command_window_action, SIGNAL (triggered ()),
16514 db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	2189 this, SLOT (handle_clear_command_window_request ()));
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	2190
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2191 connect (_clear_command_history_action, SIGNAL (triggered ()),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2192 this, SLOT (handle_clear_history_request ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2193
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2194 connect (_clear_workspace_action, SIGNAL (triggered ()),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2195 this, SLOT (handle_clear_workspace_request ()));
17117 47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2196
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2197 connect (_clipboard, SIGNAL (changed (QClipboard::Mode)),
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2198 this, SLOT (clipboard_has_changed (QClipboard::Mode)));
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2199 clipboard_has_changed (QClipboard::Clipboard);
20039 3538c2824dd8 GUI: Move preferences to edit menu (Bug #44725) John Donoghue parents: 19985 diff changeset	2200
3538c2824dd8 GUI: Move preferences to edit menu (Bug #44725) John Donoghue parents: 19985 diff changeset	2201 connect (_preferences_action, SIGNAL (triggered ()),
3538c2824dd8 GUI: Move preferences to edit menu (Bug #44725) John Donoghue parents: 19985 diff changeset	2202 this, SLOT (process_settings_dialog_request ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2203 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2204
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2205 QAction *
18697 908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2206 main_window::construct_debug_menu_item (const char *icon, const QString& item,
908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2207 const char *member)
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2208 {
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20132 diff changeset	2209 QAction *action = add_action (_debug_menu,
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	2210 resource_manager::icon (QString (icon)),
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2211 item, member);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2212
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2213 action->setEnabled (false);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2214
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	2215 #if defined (HAVE_QSCINTILLA)
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	2216 editor_window->debug_menu ()->addAction (action);
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	2217 editor_window->toolbar ()->addAction (action);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2218 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2219
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2220 return action;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2221 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2222
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2223 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2224 main_window::construct_debug_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2225 {
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2226 _debug_menu = m_add_menu (p, tr ("De&bug"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2227
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2228 _debug_step_over = construct_debug_menu_item (
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	2229 "db-step", tr ("Step"),
18697 908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2230 SLOT (debug_step_over ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2231
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2232 _debug_step_into = construct_debug_menu_item (
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	2233 "db-step-in", tr ("Step In"),
18697 908523bd79b4 use shortcut manager for the debug menu Torsten <ttl@justmail.de> parents: 18684 diff changeset	2234 SLOT (debug_step_into ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2235
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2236 _debug_step_out = construct_debug_menu_item (
a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2237 "db-step-out", tr ("Step Out"),
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	2238 SLOT (debug_step_out ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2239
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2240 _debug_continue = construct_debug_menu_item (
a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2241 "db-cont", tr ("Continue"),
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	2242 SLOT (debug_continue ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2243
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2244 _debug_menu->addSeparator ();
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	2245 #if defined (HAVE_QSCINTILLA)
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	2246 editor_window->debug_menu ()->addSeparator ();
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2247 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2248
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2249 _debug_quit = construct_debug_menu_item (
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	2250 "db-stop", tr ("Quit Debug Mode"),
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22323 diff changeset	2251 SLOT (debug_quit ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2252 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2253
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2254 QAction *
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2255 main_window::construct_window_menu_item (QMenu *p, const QString& item,
18707 f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2256 bool checkable, QWidget *widget)
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2257 {
18707 f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2258 QAction *action = p->addAction (QIcon (), item);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2259
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2260 addAction (action); // important for shortcut context
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2261 action->setCheckable (checkable);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2262 action->setShortcutContext (Qt::ApplicationShortcut);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2263
18707 f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2264 if (widget) // might be zero for editor_window
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2265 {
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2266 if (checkable)
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2267 {
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2268 // action for visibilty of dock widget
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2269 connect (action, SIGNAL (toggled (bool)),
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2270 widget, SLOT (setVisible (bool)));
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2271
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2272 connect (widget, SIGNAL (active_changed (bool)),
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2273 action, SLOT (setChecked (bool)));
18707 f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2274 }
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2275 else
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2276 {
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2277 // action for focus of dock widget
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2278 connect (action, SIGNAL (triggered ()), widget, SLOT (focus ()));
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2279 }
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2280 }
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2281
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2282 return action;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2283 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2284
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2285 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2286 main_window::construct_window_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2287 {
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2288 QMenu *window_menu = m_add_menu (p, tr ("&Window"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2289
18707 f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2290 _show_command_window_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2291 (window_menu, tr ("Show Command Window"), true, command_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2292
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2293 _show_history_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2294 (window_menu, tr ("Show Command History"), true, history_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2295
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2296 _show_file_browser_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2297 (window_menu, tr ("Show File Browser"), true, file_browser_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2298
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2299 _show_workspace_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2300 (window_menu, tr ("Show Workspace"), true, workspace_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2301
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2302 _show_editor_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2303 (window_menu, tr ("Show Editor"), true, editor_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2304
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2305 _show_documentation_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2306 (window_menu, tr ("Show Documentation"), true, doc_browser_window);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2307
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2308 window_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2309
18707 f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2310 _command_window_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2311 (window_menu, tr ("Command Window"), false, command_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2312
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2313 _history_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2314 (window_menu, tr ("Command History"), false, history_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2315
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2316 _file_browser_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2317 (window_menu, tr ("File Browser"), false, file_browser_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2318
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2319 _workspace_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2320 (window_menu, tr ("Workspace"), false, workspace_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2321
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2322 _editor_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2323 (window_menu, tr ("Editor"), false, editor_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2324
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2325 _documentation_action = construct_window_menu_item
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2326 (window_menu, tr ("Documentation"), false, doc_browser_window);
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2327
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2328 window_menu->addSeparator ();
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2329
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2330 _reset_windows_action = add_action (window_menu, QIcon (),
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2331 tr ("Reset Default Window Layout"), SLOT (reset_windows ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2332 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2333
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2334 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2335 main_window::construct_help_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2336 {
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2337 QMenu *help_menu = m_add_menu (p, tr ("&Help"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2338
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2339 construct_documentation_menu (help_menu);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2340
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2341 help_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2342
18710 584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2343 _report_bug_action = add_action (help_menu, QIcon (),
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2344 tr ("Report Bug"), SLOT (open_bug_tracker_page ()));
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2345
21568 3d60ed163b70 maint: Eliminate bad spacing around '='. Rik <rik@octave.org> parents: 21439 diff changeset	2346 _octave_packages_action = add_action (help_menu, QIcon (),
18710 584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2347 tr ("Octave Packages"), SLOT (open_octave_packages_page ()));
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2348
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2349 _contribute_action = add_action (help_menu, QIcon (),
22211 6065bd58db2b use contribute/donate consistently in GUI (bug #44335) Sahil Badyal <sbadyals@gmail.com> parents: 22177 diff changeset	2350 tr ("Contribute"), SLOT (open_contribute_page ()));
18710 584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2351
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2352 _developer_action = add_action (help_menu, QIcon (),
22211 6065bd58db2b use contribute/donate consistently in GUI (bug #44335) Sahil Badyal <sbadyals@gmail.com> parents: 22177 diff changeset	2353 tr ("Donate to Octave"), SLOT (open_donate_page ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2354
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2355 help_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2356
18710 584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2357 _about_octave_action = add_action (help_menu, QIcon (),
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2358 tr ("About Octave"), SLOT (show_about_octave ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2359 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2360
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2361 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2362 main_window::construct_documentation_menu (QMenu *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2363 {
18710 584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2364 QMenu *doc_menu = p->addMenu (tr ("Documentation"));
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2365
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2366 _ondisk_doc_action = add_action (doc_menu, QIcon (),
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2367 tr ("On Disk"), SLOT (focus ()), doc_browser_window);
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2368
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2369 _online_doc_action = add_action (doc_menu, QIcon (),
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2370 tr ("Online"), SLOT (open_online_documentation_page ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2371 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2372
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2373 void
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	2374 main_window::construct_news_menu (QMenuBar *p)
f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	2375 {
18944 b2c4d6d461f0 fix conflict between main and editor menus when using alt keys (bug #42659) Torsten <ttl@justmail.de> parents: 18840 diff changeset	2376 QMenu *news_menu = m_add_menu (p, tr ("&News"));
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	2377
18711 9ef65c422f53 use shortcut manager for the main news menu Torsten <ttl@justmail.de> parents: 18710 diff changeset	2378 _release_notes_action = add_action (news_menu, QIcon (),
9ef65c422f53 use shortcut manager for the main news menu Torsten <ttl@justmail.de> parents: 18710 diff changeset	2379 tr ("Release Notes"), SLOT (display_release_notes ()));
9ef65c422f53 use shortcut manager for the main news menu Torsten <ttl@justmail.de> parents: 18710 diff changeset	2380
9ef65c422f53 use shortcut manager for the main news menu Torsten <ttl@justmail.de> parents: 18710 diff changeset	2381 _current_news_action = add_action (news_menu, QIcon (),
9ef65c422f53 use shortcut manager for the main news menu Torsten <ttl@justmail.de> parents: 18710 diff changeset	2382 tr ("Community News"), SLOT (load_and_display_community_news ()));
17599 f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	2383 }
f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	2384
f5950975a172 community news dock widget and other user info in GUI John W. Eaton <jwe@octave.org> parents: 17576 diff changeset	2385 void
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2386 main_window::construct_tool_bar (void)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2387 {
19985 8f59e3cca4e7 remove undo-button from main toolbar and rename toolbar title Torsten <ttl@justmail.de> parents: 19983 diff changeset	2388 _main_tool_bar = addToolBar (tr ("Toolbar"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2389
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2390 _main_tool_bar->setObjectName ("MainToolBar");
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2391 _main_tool_bar->addAction (_new_script_action);
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2392 _main_tool_bar->addAction (_open_action);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2393
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2394 _main_tool_bar->addSeparator ();
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2395
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2396 _main_tool_bar->addAction (_copy_action);
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2397 _main_tool_bar->addAction (_paste_action);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2398
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2399 _main_tool_bar->addSeparator ();
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2400
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2401 _current_directory_combo_box = new QComboBox (this);
19846 72fe9df87fe8 improve scalability of gui objects (as discussed in bug #41938) Torsten <ttl@justmail.de> parents: 19803 diff changeset	2402 QFontMetrics fm = _current_directory_combo_box->fontMetrics ();
72fe9df87fe8 improve scalability of gui objects (as discussed in bug #41938) Torsten <ttl@justmail.de> parents: 19803 diff changeset	2403 _current_directory_combo_box->setFixedWidth (48*fm.averageCharWidth ());
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2404 _current_directory_combo_box->setEditable (true);
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2405 _current_directory_combo_box->setInsertPolicy (QComboBox::NoInsert);
16518 59dbdaeeea40 * main_window.cc(construct_tool_bar): code cleanup and tool tips for combo box Torsten <ttl@justmail.de> parents: 16514 diff changeset	2406 _current_directory_combo_box->setToolTip (tr ("Enter directory name"));
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2407 _current_directory_combo_box->setMaxVisibleItems (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2408 current_directory_max_visible);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2409 _current_directory_combo_box->setMaxCount (current_directory_max_count);
19846 72fe9df87fe8 improve scalability of gui objects (as discussed in bug #41938) Torsten <ttl@justmail.de> parents: 19803 diff changeset	2410 QSizePolicy sizePol (QSizePolicy::Preferred, QSizePolicy::Preferred);
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2411 _current_directory_combo_box->setSizePolicy (sizePol);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2412
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2413 // addWidget takes ownership of the objects so there is no
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2414 // need to delete these upon destroying this main_window.
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2415 _main_tool_bar->addWidget (new QLabel (tr ("Current Directory: ")));
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2416 _main_tool_bar->addWidget (_current_directory_combo_box);
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2417 QAction *current_dir_up = _main_tool_bar->addAction (
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2418 resource_manager::icon ("go-up"),
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2419 tr ("One directory up"));
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2420 QAction *current_dir_search = _main_tool_bar->addAction (
19899 a8a5415b05cb new gui icons Torsten <ttl@justmail.de> parents: 19893 diff changeset	2421 resource_manager::icon ("folder"),
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2422 tr ("Browse directories"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2423
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2424 connect (_current_directory_combo_box, SIGNAL (activated (QString)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2425 this, SLOT (set_current_working_directory (QString)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2426
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2427 connect (_current_directory_combo_box->lineEdit (), SIGNAL (returnPressed ()),
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2428 this, SLOT (accept_directory_line_edit ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2429
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2430 connect (current_dir_search, SIGNAL (triggered ()),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2431 this, SLOT (browse_for_directory ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2432
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	2433 connect (current_dir_up, SIGNAL (triggered ()),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	2434 this, SLOT (change_directory_up ()));
16539 8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	2435
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	2436 connect (_undo_action, SIGNAL (triggered ()),
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	2437 this, SLOT (handle_undo_request ()));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	2438 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	2439
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2440 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2441 main_window::save_workspace_callback (const std::string& file)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2442 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	2443 Fsave (ovl (file));
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2444 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2445
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2446 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2447 main_window::load_workspace_callback (const std::string& file)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2448 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	2449 Fload (ovl (file));
16504 49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2450
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2451 octave::symbol_table::scope *scope
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2452 = octave::__get_current_scope__ ("main_window::load_workspace_callback");
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2453
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2454 if (scope)
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2455 octave_link::set_workspace (true, scope->workspace_info ());
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2456 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2457
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2458 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2459 main_window::clear_workspace_callback (void)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2460 {
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	2461 octave::interpreter& interp
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	2462 = octave::__get_interpreter__ ("main_window::clear_workspace_callback");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	2463
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	2464 Fclear (interp);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2465 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2466
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2467 void
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	2468 main_window::rename_variable_callback (const main_window::name_pair& names)
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	2469 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	2470 octave::symbol_table::scope *scope
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2471 = octave::__get_current_scope__ ("main_window::rename_variable_callback");
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2472
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2473 if (scope)
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2474 {
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2475 scope->rename (names.first, names.second);
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2476
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2477 octave_link::set_workspace (true, scope->workspace_info ());
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2478 }
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2479
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2480 // FIXME: if this action fails, do we need a way to display that info
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	2481 // in the GUI?
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	2482 }
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	2483
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	2484 void
16539 8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	2485 main_window::command_window_undo_callback (void)
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	2486 {
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21744 diff changeset	2487 octave::command_editor::undo ();
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21744 diff changeset	2488 octave::command_editor::redisplay ();
16539 8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	2489 }
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	2490
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	2491 void
16514 db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	2492 main_window::clear_command_window_callback (void)
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	2493 {
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21744 diff changeset	2494 octave::command_editor::kill_full_line ();
176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21744 diff changeset	2495 octave::command_editor::clear_screen ();
16514 db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	2496 }
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	2497
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	2498 void
16541 6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	2499 main_window::resize_command_window_callback (void)
6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	2500 {
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21744 diff changeset	2501 octave::command_editor::resize_terminal ();
16541 6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	2502 }
6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	2503
6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	2504 void
19302 37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2505 main_window::set_screen_size_callback (const int_pair& sz)
37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2506 {
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21744 diff changeset	2507 octave::command_editor::set_screen_size (sz.first, sz.second);
19302 37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2508 }
37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2509
37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2510 void
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2511 main_window::clear_history_callback (void)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2512 {
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	2513 Fhistory (ovl ("-c"));
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2514 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2515
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2516 void
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	2517 main_window::new_figure_callback (void)
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	2518 {
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	2519 octave::interpreter& interp
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	2520 = octave::__get_interpreter__ ("main_window::new_figure_callback");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	2521
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23497 diff changeset	2522 Fbuiltin (interp, ovl ("figure"));
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	2523 Fdrawnow ();
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	2524 }
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	2525
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	2526 void
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2527 main_window::change_directory_callback (const std::string& directory)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2528 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	2529 Fcd (ovl (directory));
20132 d7bea5b11fc3 only update file browser and dir selection box when on top-level (bug #44622) Torsten <ttl@justmail.de> parents: 20113 diff changeset	2530 _octave_qt_link->update_directory ();
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2531 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2532
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	2533 void
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23432 diff changeset	2534 main_window::find_files (const QString& start_dir)
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2535 {
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2536
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2537 if (! find_files_dlg)
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2538 {
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2539 find_files_dlg = new find_files_dialog (this);
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2540
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2541 connect (find_files_dlg, SIGNAL (finished (int)),
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2542 this, SLOT (find_files_finished (int)));
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2543
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2544 connect (find_files_dlg, SIGNAL (dir_selected (const QString &)),
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2545 file_browser_window,
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2546 SLOT (set_current_directory (const QString&)));
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2547
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2548 connect (find_files_dlg, SIGNAL (file_selected (const QString &)),
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2549 this, SLOT (open_file (const QString &)));
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2550
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2551 find_files_dlg->setWindowModality (Qt::NonModal);
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2552 }
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2553
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2554 if (! find_files_dlg->isVisible ())
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2555 {
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2556 find_files_dlg->show ();
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2557 }
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2558
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2559 find_files_dlg->set_search_dir (start_dir);
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2560
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2561 find_files_dlg->activateWindow ();
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2562
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2563 }
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2564
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2565 void
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17771 diff changeset	2566 main_window::find_files_finished (int)
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2567 {
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2568
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2569 }
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	2570
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2571 void
18717 f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2572 main_window::configure_shortcuts ()
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2573 {
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2574 // file menu
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2575 shortcut_manager::set_shortcut (_open_action, "main_file:open_file");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2576 shortcut_manager::set_shortcut (_new_script_action, "main_file:new_file");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2577 shortcut_manager::set_shortcut (_new_function_action, "main_file:new_function");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2578 shortcut_manager::set_shortcut (_new_function_action, "main_file:new_figure");
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2579 shortcut_manager::set_shortcut (_load_workspace_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2580 "main_file:load_workspace");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2581 shortcut_manager::set_shortcut (_save_workspace_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2582 "main_file:save_workspace");
18717 f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2583 shortcut_manager::set_shortcut (_preferences_action, "main_file:preferences");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2584 shortcut_manager::set_shortcut (_exit_action,"main_file:exit");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2585
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2586 // edit menu
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2587 shortcut_manager::set_shortcut (_copy_action, "main_edit:copy");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2588 shortcut_manager::set_shortcut (_paste_action, "main_edit:paste");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2589 shortcut_manager::set_shortcut (_undo_action, "main_edit:undo");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2590 shortcut_manager::set_shortcut (_select_all_action, "main_edit:select_all");
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2591 shortcut_manager::set_shortcut (_clear_clipboard_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2592 "main_edit:clear_clipboard");
18717 f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2593 shortcut_manager::set_shortcut (_find_files_action, "main_edit:find_in_files");
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2594 shortcut_manager::set_shortcut (_clear_command_history_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2595 "main_edit:clear_history");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2596 shortcut_manager::set_shortcut (_clear_command_window_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2597 "main_edit:clear_command_window");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2598 shortcut_manager::set_shortcut (_clear_workspace_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2599 "main_edit:clear_workspace");
18717 f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2600
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2601 // debug menu
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2602 shortcut_manager::set_shortcut (_debug_step_over, "main_debug:step_over");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2603 shortcut_manager::set_shortcut (_debug_step_into, "main_debug:step_into");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2604 shortcut_manager::set_shortcut (_debug_step_out, "main_debug:step_out");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2605 shortcut_manager::set_shortcut (_debug_continue, "main_debug:continue");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2606 shortcut_manager::set_shortcut (_debug_quit, "main_debug:quit");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2607
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2608 // window menu
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2609 shortcut_manager::set_shortcut (_show_command_window_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2610 "main_window:show_command");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2611 shortcut_manager::set_shortcut (_show_history_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2612 "main_window:show_history");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2613 shortcut_manager::set_shortcut (_show_workspace_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2614 "main_window:show_workspace");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2615 shortcut_manager::set_shortcut (_show_file_browser_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2616 "main_window:show_file_browser");
18717 f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2617 shortcut_manager::set_shortcut (_show_editor_action, "main_window:show_editor");
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2618 shortcut_manager::set_shortcut (_show_documentation_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2619 "main_window:show_doc");
18717 f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2620 shortcut_manager::set_shortcut (_command_window_action, "main_window:command");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2621 shortcut_manager::set_shortcut (_history_action, "main_window:history");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2622 shortcut_manager::set_shortcut (_workspace_action, "main_window:workspace");
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2623 shortcut_manager::set_shortcut (_file_browser_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2624 "main_window:file_browser");
18717 f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2625 shortcut_manager::set_shortcut (_editor_action, "main_window:editor");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2626 shortcut_manager::set_shortcut (_documentation_action, "main_window:doc");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2627 shortcut_manager::set_shortcut (_reset_windows_action, "main_window:reset");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2628
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2629 // help menu
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2630 shortcut_manager::set_shortcut (_ondisk_doc_action, "main_help:ondisk_doc");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2631 shortcut_manager::set_shortcut (_online_doc_action, "main_help:online_doc");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2632 shortcut_manager::set_shortcut (_report_bug_action, "main_help:report_bug");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2633 shortcut_manager::set_shortcut (_octave_packages_action, "main_help:packages");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2634 shortcut_manager::set_shortcut (_contribute_action, "main_help:contribute");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2635 shortcut_manager::set_shortcut (_developer_action, "main_help:developer");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2636 shortcut_manager::set_shortcut (_about_octave_action, "main_help:about");
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2637
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2638 // news menu
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2639 shortcut_manager::set_shortcut (_release_notes_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2640 "main_news:release_notes");
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2641 shortcut_manager::set_shortcut (_current_news_action,
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2642 "main_news:community_news");
18717 f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2643 }
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2644
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2645 void
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2646 main_window::set_global_shortcuts (bool set_shortcuts)
78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2647 {
18717 f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2648 // this slot is called when the terminal gets/loses focus
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2649
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2650 // return if the user don't want to use readline shortcuts
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2651 if (! _prevent_readline_conflicts)
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2652 return;
f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2653
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2654 if (set_shortcuts)
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2655 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2656 // terminal loses focus: set the global shortcuts
18717 f017240310fb disabling global shortcuts when terminal has focus as user preference Torsten <ttl@justmail.de> parents: 18711 diff changeset	2657 configure_shortcuts ();
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2658 }
78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2659 else
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2660 {
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19855 diff changeset	2661 // terminal gets focus: disable some shortcuts
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2662 QKeySequence no_key = QKeySequence ();
78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2663
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2664 // file menu
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2665 _open_action->setShortcut (no_key);
78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2666 _new_script_action->setShortcut (no_key);
17901 2c241092b47b use edit.m for creating a new function with the gui (bug #40502) Torsten <ttl@justmail.de> parents: 17899 diff changeset	2667 _new_function_action->setShortcut (no_key);
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2668 _new_function_action->setShortcut (no_key);
086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2669 _load_workspace_action->setShortcut (no_key);
086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2670 _save_workspace_action->setShortcut (no_key);
086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2671 _preferences_action->setShortcut (no_key);
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2672 _exit_action->setShortcut (no_key);
78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2673
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2674 // edit menu
086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2675 _select_all_action->setShortcut (no_key);
086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2676 _clear_clipboard_action->setShortcut (no_key);
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2677 _find_files_action->setShortcut (no_key);
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2678 _clear_command_history_action->setShortcut (no_key);
086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2679 _clear_command_window_action->setShortcut (no_key);
086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18575 diff changeset	2680 _clear_workspace_action->setShortcut (no_key);
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2681
18707 f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2682 // window menu
f31fde98c872 use shortcut manager for the window menu Torsten <ttl@justmail.de> parents: 18697 diff changeset	2683 _reset_windows_action->setShortcut (no_key);
18710 584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2684
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2685 // help menu
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2686 _ondisk_doc_action->setShortcut (no_key);
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2687 _online_doc_action->setShortcut (no_key);
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2688 _report_bug_action->setShortcut (no_key);
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2689 _octave_packages_action->setShortcut (no_key);
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2690 _contribute_action->setShortcut (no_key);
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2691 _developer_action->setShortcut (no_key);
584b20e9112c use shortcut manager for the main help menu Torsten <ttl@justmail.de> parents: 18708 diff changeset	2692 _about_octave_action->setShortcut (no_key);
18711 9ef65c422f53 use shortcut manager for the main news menu Torsten <ttl@justmail.de> parents: 18710 diff changeset	2693
9ef65c422f53 use shortcut manager for the main news menu Torsten <ttl@justmail.de> parents: 18710 diff changeset	2694 // news menu
9ef65c422f53 use shortcut manager for the main news menu Torsten <ttl@justmail.de> parents: 18710 diff changeset	2695 _release_notes_action->setShortcut (no_key);
9ef65c422f53 use shortcut manager for the main news menu Torsten <ttl@justmail.de> parents: 18710 diff changeset	2696 _current_news_action->setShortcut (no_key);
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2697 }
78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16956 diff changeset	2698 }
17029 359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	2699
20278 3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2700 QList<octave_dock_widget *>
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2701 main_window::dock_widget_list ()
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2702 {
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2703 QList<octave_dock_widget > list = QList<octave_dock_widget > ();
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2704 list.append (static_cast<octave_dock_widget *> (command_window));
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2705 list.append (static_cast<octave_dock_widget *> (history_window));
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2706 list.append (static_cast<octave_dock_widget *> (file_browser_window));
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2707 list.append (static_cast<octave_dock_widget *> (doc_browser_window));
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21670 diff changeset	2708 #if defined (HAVE_QSCINTILLA)
20278 3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2709 list.append (static_cast<octave_dock_widget *> (editor_window));
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2710 #endif
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2711 list.append (static_cast<octave_dock_widget *> (workspace_window));
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2712 return list;
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2713 }
3b25741a9927 Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 20253 diff changeset	2714
17029 359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	2715 void
19302 37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2716 main_window::set_screen_size (int ht, int wd)
37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2717 {
37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2718 octave_link::post_event (this, &main_window::set_screen_size_callback,
37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2719 int_pair (ht, wd));
37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2720 }
37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2721
37159a873c96 preserve text on Windows terminal resize (bug #41893; patch #8532) John W. Eaton <jwe@octave.org> parents: 19180 diff changeset	2722 void
17029 359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	2723 main_window::handle_show_doc (const QString& file)
359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	2724 {
359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	2725 doc_browser_window->setVisible (true);
359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	2726 emit show_doc_signal (file);
359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	2727 }
359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	2728
17117 47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2729 void
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2730 main_window::clipboard_has_changed (QClipboard::Mode cp_mode)
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2731 {
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2732 if (cp_mode == QClipboard::Clipboard)
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2733 {
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2734 if (_clipboard->text ().isEmpty ())
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2735 {
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2736 _paste_action->setEnabled (false);
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2737 _clear_clipboard_action->setEnabled (false);
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2738 }
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2739 else
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2740 {
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2741 _paste_action->setEnabled (true);
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2742 _clear_clipboard_action->setEnabled (true);
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2743 }
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2744 }
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2745 }
17029 359c5ca795cd Display doc info pages using documentation browser when in GUI mode (Bug #39451) John Donoghue <john.donoghue@ieee.org> parents: 17010 diff changeset	2746
17117 47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2747 void
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2748 main_window::clear_clipboard ()
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2749 {
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2750 _clipboard->clear (QClipboard::Clipboard);
47b504503a3f disable global paste action when clipboard is empty Torsten <ttl@justmail.de> parents: 17090 diff changeset	2751 }
23119 3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	2752
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	2753 void
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	2754 main_window::interrupt_interpreter (void)
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	2755 {
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	2756 m_interpreter->interrupt ();
3107d3717cc2 refactor and simplify interpreter startup in GUI John W. Eaton <jwe@octave.org> parents: 23092 diff changeset	2757 }

Mercurial > octave

annotate libgui/src/main-window.cc @ 23810:9c24aae7515f