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

annotate libgui/src/main-window.cc @ 16818:caf3d2a45da0

clean up some code for undocking and docking widgets * octave-dock-widget.cc(make_window,makewidget): remove boolean parameter, (change_floating): call make_widget and make_window without parameter * octave-dock-wodget.h(make_window,makewidget): remove boolean parameter * main-window.cc(set_window_layout): call make_widget and make_window without parameter

author	Torsten <ttl@justmail.de>
date	Sun, 23 Jun 2013 12:07:07 +0200
parents	81344ade678f
children	944ade6e7f66

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
16447 e3b33a7530bc improve encapsulation of history window object John W. Eaton <jwe@octave.org> parents: 16446 diff changeset	3 Copyright (C) 2013 John W. Eaton
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	4 Copyright (C) 2011-2012 Jacob Dawid
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	8 Octave is free software; you can redistribute it and/or modify it
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	9 under the terms of the GNU General Public License as published by the
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	11 option) any later version.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	16 for more details.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	18 You should have received a copy of the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	19 along with Octave; see the file COPYING. If not, see
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	20 <http://www.gnu.org/licenses/>.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	22 */
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	23
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	24 #ifdef HAVE_CONFIG_H
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	25 #include <config.h>
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>
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	30 #include <QLabel>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	31 #include <QMenuBar>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	32 #include <QMenu>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	33 #include <QAction>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	34 #include <QSettings>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	35 #include <QStyle>
7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	36 #include <QToolBar>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	37 #include <QDesktopServices>
16391 a695ee2dc17e * main-window.cc: Include <QDesktopWidget> John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	38 #include <QDesktopWidget>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	39 #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	40 #include <QMessageBox>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	41 #include <QIcon>
7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	42
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	43 #include <utility>
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	44
16290 d07aeecb2d22 build: Add more #ifdefs to build GUI when Qscintilla is not present. Rik <rik@octave.org> parents: 16176 diff changeset	45 #ifdef HAVE_QSCINTILLA
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	46 #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	47 #endif
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	48 #include "main-window.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	49 #include "settings-dialog.h"
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	50
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	51 #include "cmd-edit.h"
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	52
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	53 #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	54 #include "defaults.h"
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	55 #include "symtab.h"
15404 f52a62a6db3a eliminate copy and paste copyright info in GUI about info box John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	56 #include "version.h"
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	57
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	58 static file_editor_interface *
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	59 create_default_editor (QWidget *p)
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	60 {
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	61 #ifdef HAVE_QSCINTILLA
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	62 return new file_editor (p);
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	63 #else
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	64 return 0;
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	65 #endif
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	66 }
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	67
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	68 main_window::main_window (QWidget *p)
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	69 : QMainWindow (p),
d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	70 _workspace_model (new workspace_model ()),
d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	71 status_bar (new QStatusBar ()),
d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	72 command_window (new terminal_dock_widget (this)),
d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	73 history_window (new history_dock_widget (this)),
16453 2e3c652c89d1 improve encapsulation of documentation browser window object John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	74 file_browser_window (new files_dock_widget (this)),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	75 doc_browser_window (new documentation_dock_widget (this)),
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	76 editor_window (create_default_editor (this)),
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	77 workspace_window (new workspace_view (this)),
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	78 find_files_dlg (0),
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	79 _octave_main_thread (0),
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	80 _octave_qt_link (0)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	81 {
14599 97cb9286919c Cleaned up code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14588 diff changeset	82 // 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	83 construct ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	84 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	85
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	86 main_window::~main_window (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	87 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	88 // 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	89 // 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	90
16638 3c2e457eeb72 ask for saving modified editor files if octave is closed (bug #38689) Torsten <ttl@justmail.de> parents: 16635 diff changeset	91 delete editor_window; // first one for dialogs of modified editor-tabs
16484 fa842e78f491 Restore STDERR stream pipe before exit to capture error messages. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16479 diff changeset	92 delete command_window;
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	93 delete workspace_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	94 delete doc_browser_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	95 delete file_browser_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	96 delete history_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	97 delete status_bar;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	98 delete _workspace_model;
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	99 if (find_files_dlg)
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	100 {
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	101 delete find_files_dlg;
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	102 find_files_dlg = 0;
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	103 }
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	104 delete _octave_main_thread;
16421 40d1ddca4db5 improve use of octave_link John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	105 delete _octave_qt_link;
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	106 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	107
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	108 bool
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	109 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	110 {
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	111 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	112 }
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	113
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	114 void
16449 c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	115 main_window::focus_command_window (void)
c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	116 {
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	117 command_window->focus ();
16449 c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	118 }
c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	119
c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	120 void
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16451 diff changeset	121 main_window::new_file (const QString& commands)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	122 {
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	123 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	124 }
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	125
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	126 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	127 main_window::open_file (const QString& file_name)
14875 3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	128 {
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	129 emit open_file_signal (file_name);
13558 248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	130 }
248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	131
248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	132 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	133 main_window::report_status_message (const QString& statusMessage)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	134 {
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	135 status_bar->showMessage (statusMessage, 1000);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	136 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	137
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	138 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	139 main_window::handle_save_workspace_request (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	140 {
16532 67d4111d078d look for save/load files starting in current directory John W. Eaton <jwe@octave.org> parents: 16526 diff changeset	141 QString file =
67d4111d078d look for save/load files starting in current directory John W. Eaton <jwe@octave.org> parents: 16526 diff changeset	142 QFileDialog::getSaveFileName (this, tr ("Save Workspace As"), ".");
67d4111d078d look for save/load files starting in current directory John W. Eaton <jwe@octave.org> parents: 16526 diff changeset	143
67d4111d078d look for save/load files starting in current directory John W. Eaton <jwe@octave.org> parents: 16526 diff changeset	144 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	145 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	146 file.toStdString ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	147 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	148
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	149 void
16504 49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	150 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	151 {
16504 49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	152 QString file = file_arg;
49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	153
49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	154 if (file.isEmpty ())
16532 67d4111d078d look for save/load files starting in current directory John W. Eaton <jwe@octave.org> parents: 16526 diff changeset	155 file = QFileDialog::getOpenFileName (this, tr ("Load Workspace"), ".");
67d4111d078d look for save/load files starting in current directory John W. Eaton <jwe@octave.org> parents: 16526 diff changeset	156
16504 49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	157 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	158 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	159 file.toStdString ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	160 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	161
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	162 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	163 main_window::handle_clear_workspace_request (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	164 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	165 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	166 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	167
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	168 void
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	169 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	170 const QString& new_name)
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	171
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	172 {
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	173 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	174
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	175 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	176 names);
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	177 }
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	178
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	179 void
16539 8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	180 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	181 {
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	182 octave_link::post_event (this, &main_window::command_window_undo_callback);
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	183 }
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	184
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	185 void
16514 db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	186 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	187 {
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	188 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	189 }
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	190
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	191 void
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	192 main_window::handle_clear_history_request (void)
14814 61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	193 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	194 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	195 }
61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	196
61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	197 void
16570 d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	198 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	199 {
16570 d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	200 octave_link::post_event (this, &main_window::execute_command_callback,
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	201 command.toStdString ());
16449 c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	202
16570 d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	203 focus_command_window ();
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	204 }
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	205
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	206 void
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	207 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	208 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	209 octave_link::post_event (this, &main_window::run_file_callback, info);
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	210 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	211
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	212 void
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	213 main_window::handle_new_figure_request (void)
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	214 {
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	215 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	216 }
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	217
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	218 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	219 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	220 {
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	221 QDesktopServices::openUrl (QUrl ("http://gnu.org/software/octave/doc/interpreter"));
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	222 }
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	223
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	224 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	225 main_window::open_bug_tracker_page (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	226 {
15044 b7b1ffc88086 Update urls to Agora and bug tracker Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15041 diff changeset	227 QDesktopServices::openUrl (QUrl ("http://bugs.octave.org"));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	228 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	229
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	230 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	231 main_window::open_octave_forge_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	232 {
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	233 QDesktopServices::openUrl (QUrl ("http://octave.sourceforge.net/"));
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	234 }
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	235
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	236 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	237 main_window::open_agora_page (void)
13533 edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	238 {
15044 b7b1ffc88086 Update urls to Agora and bug tracker Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15041 diff changeset	239 QDesktopServices::openUrl (QUrl ("http://agora.octave.org/"));
13533 edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	240 }
edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	241
edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	242 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	243 main_window::process_settings_dialog_request (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	244 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	245 settings_dialog *settingsDialog = new settings_dialog (this);
15274 c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	246 int change_settings = settingsDialog->exec ();
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	247 if (change_settings == QDialog::Accepted)
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	248 {
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	249 settingsDialog->write_changed_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	250 QSettings *settings = resource_manager::get_settings ();
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16399 diff changeset	251 if (settings)
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	252 emit settings_changed (settings);
15274 c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	253 }
14586 8e9823066dad Fixed bug with not correctly syncing settings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14308 diff changeset	254 delete settingsDialog;
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	255 }
fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	256
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	257
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	258 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	259 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	260 {
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	261 // 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	262
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	263 // 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	264 QString icon_set
203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	265 = 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	266
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	267 static struct
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	268 {
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	269 QString name;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	270 QString path;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	271 }
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	272
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	273 widget_icon_data[] =
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	274 { // array of possible icon sets (name, path (complete for NONE))
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	275 // the first entry here is the default!
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	276 {"NONE", ":/actions/icons/logo.png"},
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	277 {"GRAPHIC", ":/actions/icons/graphic_logo_"},
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	278 {"LETTER", ":/actions/icons/letter_logo_"},
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	279 {"", ""} // end marker has empty name
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	280 };
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	281
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	282 int count = 0;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	283 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	284
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	285 while (!widget_icon_data[count].name.isEmpty ())
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	286 { // while not end of data
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	287 if (widget_icon_data[count].name == icon_set)
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	288 { // data of desired icon set found
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	289 icon_set_found = count;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	290 break;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	291 }
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	292 count++;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	293 }
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	294
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	295 QString icon;
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	296 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	297 {
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	298 QString name = widget->objectName ();
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	299 if (! name.isEmpty ())
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	300 { // if children has a name
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	301 icon = widget_icon_data[icon_set_found].path; // prefix or octave-logo
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	302 if (widget_icon_data[icon_set_found].name != "NONE")
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	303 icon = 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	304 widget->setWindowIcon (QIcon (icon));
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	305 }
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	306 }
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	307
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	308 int icon_size = settings->value ("toolbar_icon_size",24).toInt ();
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	309 _main_tool_bar->setIconSize (QSize (icon_size,icon_size));
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	310
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	311 resource_manager::update_network_settings ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	312 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	313
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	314
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	315 void
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	316 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	317 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	318 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	319 }
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	320
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	321 void
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	322 main_window::exit (int status)
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	323 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	324 qApp->exit (status);
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	325 }
7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	326
7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	327 void
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	328 main_window::reset_windows (void)
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	329 {
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	330 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	331
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	332 set_window_layout (settings);
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	333 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	334
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	335 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	336 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	337 {
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	338 // 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	339 // 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	340 // widget.
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	341
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	342 int index = _current_directory_combo_box->findText (dir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	343
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	344 if (index >= 0)
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	345 _current_directory_combo_box->removeItem (index);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	346
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	347 _current_directory_combo_box->insertItem (0, dir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	348 _current_directory_combo_box->setCurrentIndex (0);
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	349
16499 facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16497 diff changeset	350 file_browser_window->update_octave_directory (dir);
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	351 }
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	352
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	353 void
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	354 main_window::browse_for_directory (void)
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	355 {
16578 0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	356 QString dir
0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	357 = QFileDialog::getExistingDirectory (this, tr ("Set working directory"));
0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	358
0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	359 set_current_working_directory (dir);
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	360
16578 0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	361 // FIXME -- on Windows systems, the command window freezes after the
0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	362 // 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	363
0eca6c5657c9 force focus to command window after browsing for directory John W. Eaton <jwe@octave.org> parents: 16576 diff changeset	364 focus_command_window ();
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	365 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	366
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	367 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	368 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	369 {
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	370 // 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	371
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	372 QString xdir = dir.isEmpty () ? "." : dir;
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	373
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	374 QFileInfo fileInfo (xdir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	375
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	376 if (fileInfo.exists () && fileInfo.isDir ())
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	377 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	378 xdir.toStdString ());
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	379 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	380
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	381 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	382 main_window::change_directory_up (void)
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	383 {
16526 01541f7321f7 correctly track directory for cd .. John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	384 set_current_working_directory ("..");
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	385 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	386
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	387 // 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	388 // 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	389 // in the drop down list.
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	390
15626 1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	391 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	392 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	393 {
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	394 // 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	395 // 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	396 // directory.
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	397
16518 59dbdaeeea40 * main_window.cc(construct_tool_bar): code cleanup and tool tips for combo box Torsten <ttl@justmail.de> parents: 16514 diff changeset	398 QString dir = _current_directory_combo_box->currentText ();
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	399
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	400 int index = _current_directory_combo_box->findText (dir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	401
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	402 if (index < 0)
15626 1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	403 set_current_working_directory (dir);
1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	404 }
1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	405
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	406 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	407 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	408 {
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	409 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	410
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	411 _debug_continue->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	412 _debug_step_into->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	413 _debug_step_over->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	414 _debug_step_out->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	415 _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	416
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15848 diff changeset	417 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	418 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	419 #endif
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	420 }
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	421
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	422 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	423 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	424 {
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	425 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	426
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	427 _debug_continue->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	428 _debug_step_into->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	429 _debug_step_over->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	430 _debug_step_out->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	431 _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	432
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15848 diff changeset	433 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	434 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	435 #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	436 }
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	437
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	438 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	439 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	440 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	441 octave_link::post_event (this, &main_window::debug_continue_callback);
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	442 }
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	443
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	444 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	445 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	446 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	447 octave_link::post_event (this, &main_window::debug_step_into_callback);
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	448 }
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	449
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	450 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	451 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	452 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	453 octave_link::post_event (this, &main_window::debug_step_over_callback);
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	454 }
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	455
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	456 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	457 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	458 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	459 octave_link::post_event (this, &main_window::debug_step_out_callback);
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	460 }
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	461
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	462 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	463 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	464 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	465 octave_link::post_event (this, &main_window::debug_quit_callback);
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	466 }
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	467
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	468 void
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	469 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	470 int line)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	471 {
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	472 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	473
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	474 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	475
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	476 if (cmd_focus)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	477 focus_command_window ();
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	478 }
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	479
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	480 void
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	481 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	482 int line)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	483 {
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	484 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	485
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	486 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	487
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	488 if (cmd_focus)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	489 focus_command_window ();
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	490 }
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	491
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	492 void
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	493 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	494 const QString& file,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	495 int line)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	496 {
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	497 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	498
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	499 emit update_breakpoint_marker_signal (insert, file, line);
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	500
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	501 if (cmd_focus)
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	502 focus_command_window ();
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	503 }
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	504
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	505 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	506 main_window::show_about_octave (void)
13548 5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	507 {
15404 f52a62a6db3a eliminate copy and paste copyright info in GUI about info box John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	508 QString message = OCTAVE_STARTUP_MESSAGE;
13548 5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	509
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	510 QMessageBox::about (this, tr ("About Octave"), message);
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	511 }
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	512
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	513 void
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	514 main_window::closeEvent (QCloseEvent *e)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	515 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	516 e->ignore ();
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	517 octave_link::post_event (this, &main_window::exit_callback);
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	518 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	519
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	520 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	521 main_window::read_settings (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	522 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	523 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	524
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	525 if (!settings)
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	526 {
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	527 qDebug("Error: QSettings pointer from resource manager is NULL.");
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	528 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	529 }
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	530
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	531 set_window_layout (settings);
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	532
15465 ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	533 // restore the list of the last directories
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	534 QStringList curr_dirs = settings->value ("MainWindow/current_directory_list").toStringList ();
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	535 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	536 {
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	537 _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	538 }
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	539 emit settings_changed (settings);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	540 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	541
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	542 void
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	543 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	544 {
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	545 // 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	546 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	547 {
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	548 QString name = widget->objectName ();
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	549
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	550 if (! name.isEmpty ())
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	551 {
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	552 // If floating, make window from widget.
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	553 bool floating = settings->value
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	554 ("DockWidgets/" + name + "Floating", false).toBool ();
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	555 if (floating)
16818 caf3d2a45da0 clean up some code for undocking and docking widgets Torsten <ttl@justmail.de> parents: 16811 diff changeset	556 widget->make_window ();
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	557 else if (! widget->parent ()) // should not be floating but is
81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	558 widget->setParent (this); // reparent
81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	559
81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	560 // restore geometry
81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	561 QVariant val = settings->value (name);
81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	562 widget->restoreGeometry (val.toByteArray ());
81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	563
81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	564 // make widget visible if desired
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	565 bool visible = settings->value
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: 16699 diff changeset	566 ("DockWidgets/" + name + "Visible", true).toBool ();
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	567 widget->setVisible (visible);
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	568 }
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	569 }
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	570
16811 81344ade678f fix resetting the window layout when some widgets are floating Torsten <ttl@justmail.de> parents: 16798 diff changeset	571 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	572 restoreGeometry (settings->value ("MainWindow/geometry").toByteArray ());
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	573 }
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	574
e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	575 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	576 main_window::write_settings (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	577 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	578 QSettings *settings = resource_manager::get_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	579 if (!settings)
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	580 {
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	581 qDebug("Error: QSettings pointer from resource manager is NULL.");
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	582 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	583 }
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	584
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	585 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	586 settings->setValue ("MainWindow/windowState", saveState ());
15465 ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	587 // 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	588 QStringList curr_dirs;
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	589 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	590 {
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	591 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	592 }
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	593 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	594 settings->sync ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	595 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	596
15987 47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	597
47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	598 // 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	599 // 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	600 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	601 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	602 {
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	603 command_window->connect_visibility_changed ();
d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	604 history_window->connect_visibility_changed ();
16450 3207f1d62e74 improve encapsulation of file browser window object John W. Eaton <jwe@octave.org> parents: 16449 diff changeset	605 file_browser_window->connect_visibility_changed ();
16453 2e3c652c89d1 improve encapsulation of documentation browser window object John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	606 doc_browser_window->connect_visibility_changed ();
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	607 #ifdef HAVE_QSCINTILLA
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	608 editor_window->connect_visibility_changed ();
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	609 #endif
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	610 workspace_window->connect_visibility_changed ();
15987 47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	611 }
47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	612
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	613 void
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	614 main_window::copyClipboard (void)
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	615 {
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	616 emit copyClipboard_signal ();
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	617 }
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	618
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	619 void
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	620 main_window::pasteClipboard (void)
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	621 {
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	622 emit pasteClipboard_signal ();
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	623 }
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	624
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	625 // 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	626 // 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	627 // 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	628 // 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	629
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	630 void
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	631 main_window::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	632 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	633 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	634 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	635 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	636 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	637 this,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	638 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	639 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	640 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	641
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	642 // 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	643 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	644 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	645 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	646 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	647 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	648 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	649 this,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	650 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	651 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	652 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	653 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	654
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	655 // 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	656 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	657 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	658 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	659 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	660 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	661 this,
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	662 SLOT (handle_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	663 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	664 const QStringList&)));
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	665
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	666 connect (&uiwidget_creator,
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	667 SIGNAL (create_filedialog (const QStringList &,const QString&,
16581 fa4a035e0cf4 Add octave_link uiputfile implementation John Donoghue <john.donoghue@ieee.org> parents: 16580 diff changeset	668 const QString&, const QString&, const QString&)),
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	669 this,
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	670 SLOT (handle_create_filedialog (const QStringList &, const QString&,
adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	671 const QString&, const QString&,
16581 fa4a035e0cf4 Add octave_link uiputfile implementation John Donoghue <john.donoghue@ieee.org> parents: 16580 diff changeset	672 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	673 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	674
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	675 // 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	676 // text.
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	677
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	678 void
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	679 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	680 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	681 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	682 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	683 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	684 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	685 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	686 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	687 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	688 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	689 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	690 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	691
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	692 // 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	693 // 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	694
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	695 void
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	696 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	697 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	698 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	699 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	700 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	701 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	702 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	703 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	704 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	705 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	706 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	707 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	708
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	709 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	710 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	711 }
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	712
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	713 // 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	714 // 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	715 void
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	716 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	717 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	718 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	719 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	720 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	721 {
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	722 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	723 defaults);
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	724
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	725 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	726 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	727 }
15987 47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	728
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	729 void
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	730 main_window::handle_create_filedialog (const QStringList& filters,
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	731 const QString& title,
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	732 const QString& filename,
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	733 const QString& dirname,
16581 fa4a035e0cf4 Add octave_link uiputfile implementation John Donoghue <john.donoghue@ieee.org> parents: 16580 diff changeset	734 const QString& multimode)
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	735 {
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	736 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	737 dirname, multimode);
16580 adc150db1809 style fixes for uigetfile changes John W. Eaton <jwe@octave.org> parents: 16579 diff changeset	738
16579 7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	739 file_dialog->setAttribute (Qt::WA_DeleteOnClose);
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	740 file_dialog->show ();
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	741 }
7f8db1942dc0 Add Qt link uigetfile dialog implementation. John Donoghue <john.donoghue@ieee.org> parents: 16578 diff changeset	742
15987 47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	743 // Main subroutine of the constructor
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	744 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	745 main_window::construct (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	746 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	747 _closing = false; // flag for editor files when closed
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	748 setWindowIcon (QIcon (":/actions/icons/logo.png"));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	749
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	750 workspace_window->setModel (_workspace_model);
16572 17941fedd4ce Change workspace row height to font height. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16570 diff changeset	751 connect (_workspace_model, SIGNAL (model_changed (void)),
17941fedd4ce Change workspace row height to font height. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16570 diff changeset	752 workspace_window, SLOT (handle_model_changed (void)));
16445 3f8d3fc907af store workspace model in main_window, not in workspace view John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	753
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	754 // 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	755 // 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	756 // destroying this main_window.
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	757
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	758 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	759 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	760 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	761 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	762 dummyWidget->hide ();
79c9a6d06590 Wrote SymbolInformation struct and refactored code that updates the symbol table. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14695 diff changeset	763 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	764
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	765 construct_menu_bar ();
14812 9d9eb9bac65e Improved menu structure of file, edit and window menu. Removed ambiguous shortcuts, improved focus handling for operating the GUI with the keyboard. Added new shortcuts to focus subwindows directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	766
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	767 construct_tool_bar ();
14812 9d9eb9bac65e Improved menu structure of file, edit and window menu. Removed ambiguous shortcuts, improved focus handling for operating the GUI with the keyboard. Added new shortcuts to focus subwindows directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	768
16497 9ff3181e671c Reconnect aboutToQuit signal and prepare_to_exit (write_settings) slot. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16485 diff changeset	769 connect (qApp, SIGNAL (aboutToQuit ()),
9ff3181e671c Reconnect aboutToQuit signal and prepare_to_exit (write_settings) slot. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16485 diff changeset	770 this, SLOT (prepare_to_exit ()));
9ff3181e671c Reconnect aboutToQuit signal and prepare_to_exit (write_settings) slot. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16485 diff changeset	771
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	772 connect (this, SIGNAL (settings_changed (const QSettings *)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	773 this, SLOT (notice_settings (const QSettings *)));
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	774
16504 49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	775 connect (file_browser_window, SIGNAL (load_file_signal (const QString&)),
49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	776 this, SLOT (handle_load_workspace_request (const QString&)));
49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	777
16699 d4bcb38ad056 Added find files context menu to files-dock-widget John Donoghue <john.donoghue@ieee.org> parents: 16672 diff changeset	778 connect (file_browser_window, SIGNAL (find_files_signal (const QString&)),
d4bcb38ad056 Added find files context menu to files-dock-widget John Donoghue <john.donoghue@ieee.org> parents: 16672 diff changeset	779 this, SLOT (find_files (const QString&)));
d4bcb38ad056 Added find files context menu to files-dock-widget John Donoghue <john.donoghue@ieee.org> parents: 16672 diff changeset	780
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16504 diff changeset	781 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	782
14601 772ce0204b3f Removed version number and "Octave GUI"-labelling. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14599 diff changeset	783 setWindowTitle ("Octave");
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	784
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	785 setDockOptions (QMainWindow::AnimatedDocks
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	786 \| QMainWindow::AllowNestedDocks
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	787 \| QMainWindow::AllowTabbedDocks);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	788
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	789 addDockWidget (Qt::RightDockWidgetArea, command_window);
16453 2e3c652c89d1 improve encapsulation of documentation browser window object John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	790 addDockWidget (Qt::RightDockWidgetArea, doc_browser_window);
2e3c652c89d1 improve encapsulation of documentation browser window object John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	791 tabifyDockWidget (command_window, doc_browser_window);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	792
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	793 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	794 addDockWidget (Qt::RightDockWidgetArea, editor_window);
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	795 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	796 #endif
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	797
16450 3207f1d62e74 improve encapsulation of file browser window object John W. Eaton <jwe@octave.org> parents: 16449 diff changeset	798 addDockWidget (Qt::LeftDockWidgetArea, file_browser_window);
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	799 addDockWidget (Qt::LeftDockWidgetArea, workspace_window);
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	800 addDockWidget (Qt::LeftDockWidgetArea, history_window);
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	801
4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	802 int win_x = QApplication::desktop()->width();
4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	803 int win_y = QApplication::desktop()->height();
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	804
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	805 if (win_x > 960)
4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	806 win_x = 960;
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	807
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	808 if (win_y > 720)
4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	809 win_y = 720;
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	810
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	811 setGeometry (0, 0, win_x, win_y);
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	812
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	813 setStatusBar (status_bar);
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	814
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	815 construct_octave_qt_link ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	816
16672 fd43631f09c2 Fix Qt error messages w/o QScintilla-dev installed (Bug #38878) John Donoghue <john.donoghue@ieee.org> parents: 16649 diff changeset	817 #ifdef HAVE_QSCINTILLA
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	818 connect (this,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	819 SIGNAL (insert_debugger_pointer_signal (const QString&, int)),
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	820 editor_window,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	821 SLOT (handle_insert_debugger_pointer_request (const QString&, int)));
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	822
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	823 connect (this,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	824 SIGNAL (delete_debugger_pointer_signal (const QString&, int)),
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	825 editor_window,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	826 SLOT (handle_delete_debugger_pointer_request (const QString&, int)));
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	827
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	828 connect (this,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	829 SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)),
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	830 editor_window,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	831 SLOT (handle_update_breakpoint_marker_request (bool, const QString&, int)));
16672 fd43631f09c2 Fix Qt error messages w/o QScintilla-dev installed (Bug #38878) John Donoghue <john.donoghue@ieee.org> parents: 16649 diff changeset	832 #endif
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	833
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	834 QDir curr_dir;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	835 set_current_working_directory (curr_dir.absolutePath ());
16541 6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	836
6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	837 octave_link::post_event (this, &main_window::resize_command_window_callback);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	838 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	839
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	840 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	841 main_window::construct_octave_qt_link (void)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	842 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	843 _octave_main_thread = new octave_main_thread ();
16421 40d1ddca4db5 improve use of octave_link John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	844
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	845 _octave_qt_link = new octave_qt_link (_octave_main_thread);
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	846
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	847 connect (_octave_qt_link, SIGNAL (exit_signal (int)),
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	848 this, SLOT (exit (int)));
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	849
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	850 connect (_octave_qt_link,
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	851 SIGNAL (set_workspace_signal
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	852 (bool, const QString&, const QStringList&,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	853 const QStringList&, const QStringList&,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	854 const QStringList&)),
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	855 _workspace_model,
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	856 SLOT (set_workspace
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	857 (bool, const QString&, const QStringList&,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	858 const QStringList&, const QStringList&,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	859 const QStringList&)));
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	860
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	861 connect (_octave_qt_link, SIGNAL (clear_workspace_signal ()),
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	862 _workspace_model, SLOT (clear_workspace ()));
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	863
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	864 connect (_octave_qt_link, SIGNAL (change_directory_signal (QString)),
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	865 this, SLOT (change_directory (QString)));
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	866
16423 04c4dd7fd3ce use signal for octave_link::update_dbstop_marker John W. Eaton <jwe@octave.org> parents: 16421 diff changeset	867 connect (_octave_qt_link,
16570 d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	868 SIGNAL (execute_command_in_terminal_signal (QString)),
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	869 this, SLOT (execute_command_in_terminal (QString)));
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	870
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	871 connect (_octave_qt_link,
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	872 SIGNAL (set_history_signal (const QStringList&)),
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	873 history_window, SLOT (set_history (const QStringList&)));
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	874
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	875 connect (_octave_qt_link,
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	876 SIGNAL (append_history_signal (const QString&)),
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	877 history_window, SLOT (append_history (const QString&)));
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	878
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	879 connect (_octave_qt_link,
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	880 SIGNAL (clear_history_signal (void)),
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	881 history_window, SLOT (clear_history (void)));
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	882
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	883 connect (_octave_qt_link, SIGNAL (enter_debugger_signal ()),
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	884 this, SLOT (handle_enter_debugger ()));
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	885
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	886 connect (_octave_qt_link, SIGNAL (exit_debugger_signal ()),
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	887 this, SLOT (handle_exit_debugger ()));
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	888
16672 fd43631f09c2 Fix Qt error messages w/o QScintilla-dev installed (Bug #38878) John Donoghue <john.donoghue@ieee.org> parents: 16649 diff changeset	889 #ifdef HAVE_QSCINTILLA
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	890 connect (_octave_qt_link,
16424 ad052cdc89ad use signal for octave_link::edit_file John W. Eaton <jwe@octave.org> parents: 16423 diff changeset	891 SIGNAL (edit_file_signal (const QString&)),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	892 editor_window,
16424 ad052cdc89ad use signal for octave_link::edit_file John W. Eaton <jwe@octave.org> parents: 16423 diff changeset	893 SLOT (handle_edit_file_request (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	894 #endif
16424 ad052cdc89ad use signal for octave_link::edit_file John W. Eaton <jwe@octave.org> parents: 16423 diff changeset	895
16426 203976ae18d1 use signals for octave_link::enter_debugger_event and octave_link::exit_debugger_event John W. Eaton <jwe@octave.org> parents: 16425 diff changeset	896 connect (_octave_qt_link,
203976ae18d1 use signals for octave_link::enter_debugger_event and octave_link::exit_debugger_event John W. Eaton <jwe@octave.org> parents: 16425 diff changeset	897 SIGNAL (insert_debugger_pointer_signal (const QString&, int)),
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	898 this,
16426 203976ae18d1 use signals for octave_link::enter_debugger_event and octave_link::exit_debugger_event John W. Eaton <jwe@octave.org> parents: 16425 diff changeset	899 SLOT (handle_insert_debugger_pointer_request (const QString&, int)));
203976ae18d1 use signals for octave_link::enter_debugger_event and octave_link::exit_debugger_event John W. Eaton <jwe@octave.org> parents: 16425 diff changeset	900
203976ae18d1 use signals for octave_link::enter_debugger_event and octave_link::exit_debugger_event John W. Eaton <jwe@octave.org> parents: 16425 diff changeset	901 connect (_octave_qt_link,
203976ae18d1 use signals for octave_link::enter_debugger_event and octave_link::exit_debugger_event John W. Eaton <jwe@octave.org> parents: 16425 diff changeset	902 SIGNAL (delete_debugger_pointer_signal (const QString&, int)),
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	903 this,
16426 203976ae18d1 use signals for octave_link::enter_debugger_event and octave_link::exit_debugger_event John W. Eaton <jwe@octave.org> parents: 16425 diff changeset	904 SLOT (handle_delete_debugger_pointer_request (const QString&, int)));
203976ae18d1 use signals for octave_link::enter_debugger_event and octave_link::exit_debugger_event John W. Eaton <jwe@octave.org> parents: 16425 diff changeset	905
16576 2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	906 connect (_octave_qt_link,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	907 SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)),
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	908 this,
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	909 SLOT (handle_update_breakpoint_marker_request (bool, const QString&, int)));
2754c5fd6ae0 keep focus in the command window after dbstop, dbstep, etc. John W. Eaton <jwe@octave.org> parents: 16572 diff changeset	910
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	911 connect (_workspace_model,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	912 SIGNAL (rename_variable (const QString&, const QString&)),
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	913 this,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	914 SLOT (handle_rename_variable_request (const QString&,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	915 const QString&)));
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	916
16432 fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	917 _octave_qt_link->execute_interpreter ();
fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	918
16421 40d1ddca4db5 improve use of octave_link John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	919 octave_link::connect_link (_octave_qt_link);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	920 }
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	921
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	922 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	923 main_window::construct_menu_bar (void)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	924 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	925 QMenuBar *menu_bar = menuBar ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	926
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	927 construct_file_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	928
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	929 construct_edit_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	930
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	931 construct_debug_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	932
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	933 construct_window_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	934
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	935 construct_help_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	936 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	937
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	938 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	939 main_window::construct_file_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	940 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	941 QMenu *file_menu = p->addMenu (tr ("&File"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	942
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	943 construct_new_menu (file_menu);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	944
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	945 _open_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	946 = file_menu->addAction (QIcon (":/actions/icons/fileopen.png"),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	947 tr ("Open..."));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	948
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	949 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	950 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	951 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	952
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	953 file_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	954
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	955 QAction *load_workspace_action
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	956 = file_menu->addAction (tr ("Load workspace"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	957
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	958 QAction *save_workspace_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	959 = file_menu->addAction (tr ("Save Workspace As"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	960
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	961 file_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	962
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	963 QAction *preferences_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	964 = file_menu->addAction (QIcon (":/actions/icons/configure.png"),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	965 tr ("Preferences..."));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	966
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	967 file_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	968
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	969 QAction *exit_action = file_menu->addAction (tr ("Exit"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	970 exit_action->setShortcut (QKeySequence::Quit);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	971
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	972 connect (preferences_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	973 this, SLOT (process_settings_dialog_request ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	974
16672 fd43631f09c2 Fix Qt error messages w/o QScintilla-dev installed (Bug #38878) John Donoghue <john.donoghue@ieee.org> parents: 16649 diff changeset	975 #ifdef HAVE_QSCINTILLA
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	976 connect (_open_action, SIGNAL (triggered ()),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	977 editor_window, SLOT (request_open_file ()));
16672 fd43631f09c2 Fix Qt error messages w/o QScintilla-dev installed (Bug #38878) John Donoghue <john.donoghue@ieee.org> parents: 16649 diff changeset	978 #endif
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	979
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	980 connect (load_workspace_action, SIGNAL (triggered ()),
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	981 this, SLOT (handle_load_workspace_request ()));
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	982
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	983 connect (save_workspace_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	984 this, SLOT (handle_save_workspace_request ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	985
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	986 connect (exit_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	987 this, SLOT (close ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	988 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	989
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	990 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	991 main_window::construct_new_menu (QMenu *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	992 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	993 QMenu *new_menu = p->addMenu (tr ("New"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	994
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	995 _new_script_action
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	996 = new_menu->addAction (QIcon (":/actions/icons/filenew.png"),
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	997 tr ("Script"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	998
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	999 QAction *new_function_action = new_menu->addAction (tr ("Function"));
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1000 new_function_action->setEnabled (true);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1001
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1002 QAction *new_figure_action = new_menu->addAction (tr ("Figure"));
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1003 new_figure_action->setEnabled (true);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1004
16672 fd43631f09c2 Fix Qt error messages w/o QScintilla-dev installed (Bug #38878) John Donoghue <john.donoghue@ieee.org> parents: 16649 diff changeset	1005 #ifdef HAVE_QSCINTILLA
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1006 connect (_new_script_action, SIGNAL (triggered ()),
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1007 editor_window, SLOT (request_new_script ()));
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1008
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1009 connect (new_function_action, SIGNAL (triggered ()),
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1010 editor_window, SLOT (request_new_function ()));
16672 fd43631f09c2 Fix Qt error messages w/o QScintilla-dev installed (Bug #38878) John Donoghue <john.donoghue@ieee.org> parents: 16649 diff changeset	1011 #endif
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1012
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1013 connect (new_figure_action, SIGNAL (triggered ()),
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1014 this, SLOT (handle_new_figure_request ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1015 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1016
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1017 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1018 main_window::construct_edit_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1019 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1020 QMenu *edit_menu = p->addMenu (tr ("&Edit"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1021
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1022 QKeySequence ctrl_shift = Qt::ControlModifier + Qt::ShiftModifier;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1023
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1024 _undo_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1025 = edit_menu->addAction (QIcon (":/actions/icons/undo.png"), tr ("Undo"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1026 _undo_action->setShortcut (QKeySequence::Undo);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1027
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1028 edit_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1029
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1030 _copy_action
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1031 = edit_menu->addAction (QIcon (":/actions/icons/editcopy.png"),
16649 de1f8e4b6b9b more copy/paste tweaks John W. Eaton <jwe@octave.org> parents: 16648 diff changeset	1032 tr ("Copy"), this, SLOT (copyClipboard ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1033 _copy_action->setShortcut (ctrl_shift + Qt::Key_C);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1034
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1035 _paste_action
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16642 diff changeset	1036 = edit_menu->addAction (QIcon (":/actions/icons/editpaste.png"),
16649 de1f8e4b6b9b more copy/paste tweaks John W. Eaton <jwe@octave.org> parents: 16648 diff changeset	1037 tr ("Paste"), this, SLOT (pasteClipboard ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1038 _paste_action->setShortcut (ctrl_shift + Qt::Key_V);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1039
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1040 edit_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1041
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1042 QAction *find_files_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1043 = edit_menu->addAction (tr ("Find Files..."));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1044 find_files_action->setShortcut (ctrl_shift + Qt::Key_F);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1045
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1046 edit_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1047
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1048 QAction *clear_command_window_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1049 = edit_menu->addAction (tr ("Clear Command Window"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1050
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1051 QAction *clear_command_history
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1052 = edit_menu->addAction(tr ("Clear Command History"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1053
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1054 QAction *clear_workspace_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1055 = edit_menu->addAction (tr ("Clear Workspace"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1056
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1057 connect (find_files_action, SIGNAL (triggered()),
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1058 this, SLOT (find_files ()));
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1059
16514 db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	1060 connect (clear_command_window_action, SIGNAL (triggered ()),
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	1061 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	1062
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1063 connect (clear_command_history, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1064 this, SLOT (handle_clear_history_request ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1065
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1066 connect (clear_workspace_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1067 this, SLOT (handle_clear_workspace_request ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1068 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1069
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1070 QAction *
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1071 main_window::construct_debug_menu_item (const char *icon_file,
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1072 const QString& item,
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1073 const QKeySequence& key)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1074 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1075 QAction *action = _debug_menu->addAction (QIcon (icon_file), item);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1076
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1077 action->setEnabled (false);
16458 a3513fc13cdb fix cut and paste error in changeset 246d25c8761b John W. Eaton <jwe@octave.org> parents: 16457 diff changeset	1078 action->setShortcut (key);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1079
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1080 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	1081 editor_window->debug_menu ()->addAction (action);
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	1082 editor_window->toolbar ()->addAction (action);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1083 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1084
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1085 return action;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1086 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1087
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1088 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1089 main_window::construct_debug_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1090 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1091 _debug_menu = p->addMenu (tr ("De&bug"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1092
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1093 _debug_step_over = construct_debug_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1094 (":/actions/icons/db_step.png", tr ("Step"), Qt::Key_F10);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1095
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1096 _debug_step_into = construct_debug_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1097 (":/actions/icons/db_step_in.png", tr ("Step in"), Qt::Key_F11);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1098
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1099 _debug_step_out = construct_debug_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1100 (":/actions/icons/db_step_out.png", tr ("Step out"),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1101 Qt::ShiftModifier + Qt::Key_F11);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1102
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1103 _debug_continue = construct_debug_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1104 (":/actions/icons/db_cont.png", tr ("Continue"), Qt::Key_F5);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1105
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1106 _debug_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1107 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	1108 editor_window->debug_menu ()->addSeparator ();
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1109 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1110
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1111 _debug_quit = construct_debug_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1112 (":/actions/icons/db_stop.png", tr ("Exit Debug Mode"),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1113 Qt::ShiftModifier + Qt::Key_F5);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1114
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1115 connect (_debug_step_over, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1116 this, SLOT (debug_step_over ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1117
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1118 connect (_debug_step_into, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1119 this, SLOT (debug_step_into ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1120
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1121 connect (_debug_step_out, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1122 this, SLOT (debug_step_out ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1123
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1124 connect (_debug_continue, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1125 this, SLOT (debug_continue ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1126
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1127 connect (_debug_quit, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1128 this, SLOT (debug_quit ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1129 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1130
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1131 QAction *
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1132 main_window::construct_window_menu_item (QMenu *p, const QString& item,
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1133 bool checkable,
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1134 const QKeySequence& key)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1135 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1136 QAction *action = p->addAction (item);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1137
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1138 action->setCheckable (checkable);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1139 action->setShortcut (key);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1140 action->setShortcutContext (Qt::ApplicationShortcut);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1141
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1142 return action;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1143 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1144
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1145 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1146 main_window::construct_window_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1147 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1148 QMenu *window_menu = p->addMenu (tr ("&Window"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1149
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1150 QKeySequence ctrl = Qt::ControlModifier;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1151 QKeySequence ctrl_shift = Qt::ControlModifier + Qt::ShiftModifier;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1152
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1153 QAction *show_command_window_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1154 (window_menu, tr ("Show Command Window"), true, ctrl_shift + Qt::Key_0);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1155
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1156 QAction *show_history_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1157 (window_menu, tr ("Show Command History"), true, ctrl_shift + Qt::Key_1);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1158
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1159 QAction *show_file_browser_action = construct_window_menu_item
16499 facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16497 diff changeset	1160 (window_menu, tr ("Show File Browser"), true, ctrl_shift + Qt::Key_2);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1161
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1162 QAction *show_workspace_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1163 (window_menu, tr ("Show Workspace"), true, ctrl_shift + Qt::Key_3);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1164
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1165 QAction *show_editor_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1166 (window_menu, tr ("Show Editor"), true, ctrl_shift + Qt::Key_4);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1167
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1168 QAction *show_documentation_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1169 (window_menu, tr ("Show Documentation"), true, ctrl_shift + Qt::Key_5);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1170
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1171 window_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1172
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1173 QAction *command_window_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1174 (window_menu, tr ("Command Window"), false, ctrl + Qt::Key_0);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1175
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1176 QAction *history_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1177 (window_menu, tr ("Command History"), false, ctrl + Qt::Key_1);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1178
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1179 QAction *file_browser_action = construct_window_menu_item
16499 facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16497 diff changeset	1180 (window_menu, tr ("File Browser"), false, ctrl + Qt::Key_2);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1181
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1182 QAction *workspace_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1183 (window_menu, tr ("Workspace"), false, ctrl + Qt::Key_3);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1184
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1185 QAction *editor_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1186 (window_menu, tr ("Editor"), false, ctrl + Qt::Key_4);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1187
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1188 QAction *documentation_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1189 (window_menu, tr ("Documentation"), false, ctrl + Qt::Key_5);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1190
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1191 window_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1192
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1193 QAction *reset_windows_action
16593 e13051d7a472 allow GUI window layout to be restored John W. Eaton <jwe@octave.org> parents: 16581 diff changeset	1194 = window_menu->addAction (tr ("Reset Default Window Layout"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1195
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1196 connect (show_command_window_action, SIGNAL (toggled (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1197 command_window, SLOT (setVisible (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1198
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1199 connect (command_window, SIGNAL (active_changed (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1200 show_command_window_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1201
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1202 connect (show_workspace_action, SIGNAL (toggled (bool)),
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	1203 workspace_window, SLOT (setVisible (bool)));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1204
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	1205 connect (workspace_window, SIGNAL (active_changed (bool)),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1206 show_workspace_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1207
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1208 connect (show_history_action, SIGNAL (toggled (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1209 history_window, SLOT (setVisible (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1210
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1211 connect (history_window, SIGNAL (active_changed (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1212 show_history_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1213
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1214 connect (show_file_browser_action, SIGNAL (toggled (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1215 file_browser_window, SLOT (setVisible (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1216
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1217 connect (file_browser_window, SIGNAL (active_changed (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1218 show_file_browser_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1219
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1220 #ifdef HAVE_QSCINTILLA
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1221 connect (show_editor_action, SIGNAL (toggled (bool)),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	1222 editor_window, SLOT (setVisible (bool)));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1223
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	1224 connect (editor_window, SIGNAL (active_changed (bool)),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1225 show_editor_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1226 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1227
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1228 connect (show_documentation_action, SIGNAL (toggled (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1229 doc_browser_window, SLOT (setVisible (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1230
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1231 connect (doc_browser_window, SIGNAL (active_changed (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1232 show_documentation_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1233
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1234 connect (command_window_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1235 command_window, SLOT (focus ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1236
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1237 connect (workspace_action, SIGNAL (triggered ()),
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	1238 workspace_window, SLOT (focus ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1239
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1240 connect (history_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1241 history_window, SLOT (focus ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1242
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1243 connect (file_browser_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1244 file_browser_window, SLOT (focus ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1245
16672 fd43631f09c2 Fix Qt error messages w/o QScintilla-dev installed (Bug #38878) John Donoghue <john.donoghue@ieee.org> parents: 16649 diff changeset	1246 #ifdef HAVE_QSCINTILLA
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1247 connect (editor_action, SIGNAL (triggered ()),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	1248 editor_window, SLOT (focus ()));
16672 fd43631f09c2 Fix Qt error messages w/o QScintilla-dev installed (Bug #38878) John Donoghue <john.donoghue@ieee.org> parents: 16649 diff changeset	1249 #endif
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1250
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1251 connect (documentation_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1252 doc_browser_window, SLOT (focus ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1253
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1254 connect (reset_windows_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1255 this, SLOT (reset_windows ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1256 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1257
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1258 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1259 main_window::construct_help_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1260 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1261 QMenu *help_menu = p->addMenu (tr ("&Help"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1262
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1263 construct_documentation_menu (help_menu);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1264
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1265 help_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1266
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1267 QAction *report_bug_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1268 = help_menu->addAction (tr ("Report Bug"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1269
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1270 QAction *octave_forge_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1271 = help_menu->addAction (tr ("Visit Octave Forge"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1272
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1273 QAction *agora_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1274 = help_menu->addAction (tr ("Visit Agora"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1275
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1276 help_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1277
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1278 QAction *about_octave_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1279 = help_menu->addAction (tr ("About Octave"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1280
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1281 connect (report_bug_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1282 this, SLOT (open_bug_tracker_page ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1283
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1284 connect (octave_forge_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1285 this, SLOT (open_octave_forge_page ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1286
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1287 connect (agora_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1288 this, SLOT (open_agora_page ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1289
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1290 connect (about_octave_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1291 this, SLOT (show_about_octave ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1292 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1293
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1294 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1295 main_window::construct_documentation_menu (QMenu *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1296 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1297 QMenu *documentation_menu = p->addMenu (tr ("Documentation"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1298
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1299 QAction *ondisk_documentation_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1300 = documentation_menu->addAction (tr ("On Disk"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1301
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1302 QAction *online_documentation_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1303 = documentation_menu->addAction (tr ("Online"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1304
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1305 connect (ondisk_documentation_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1306 doc_browser_window, SLOT (focus ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1307
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1308 connect (online_documentation_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1309 this, SLOT (open_online_documentation_page ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1310 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1311
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1312 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1313 main_window::construct_tool_bar (void)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1314 {
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1315 _main_tool_bar = addToolBar ("Main");
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1316
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1317 _main_tool_bar->setObjectName ("MainToolBar");
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1318 _main_tool_bar->addAction (_new_script_action);
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1319 _main_tool_bar->addAction (_open_action);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1320
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1321 _main_tool_bar->addSeparator ();
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1322
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1323 _main_tool_bar->addAction (_copy_action);
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1324 _main_tool_bar->addAction (_paste_action);
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1325 _main_tool_bar->addAction (_undo_action);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1326
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1327 _main_tool_bar->addSeparator ();
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1328
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1329 _current_directory_combo_box = new QComboBox (this);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1330 _current_directory_combo_box->setFixedWidth (current_directory_width);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1331 _current_directory_combo_box->setEditable (true);
16518 59dbdaeeea40 * main_window.cc(construct_tool_bar): code cleanup and tool tips for combo box Torsten <ttl@justmail.de> parents: 16514 diff changeset	1332 _current_directory_combo_box->setInsertPolicy(QComboBox::NoInsert);
59dbdaeeea40 * main_window.cc(construct_tool_bar): code cleanup and tool tips for combo box Torsten <ttl@justmail.de> parents: 16514 diff changeset	1333 _current_directory_combo_box->setToolTip (tr ("Enter directory name"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1334 _current_directory_combo_box->setMaxVisibleItems (current_directory_max_visible);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1335 _current_directory_combo_box->setMaxCount (current_directory_max_count);
16518 59dbdaeeea40 * main_window.cc(construct_tool_bar): code cleanup and tool tips for combo box Torsten <ttl@justmail.de> parents: 16514 diff changeset	1336 QSizePolicy sizePol(QSizePolicy::Expanding, QSizePolicy::Preferred);
59dbdaeeea40 * main_window.cc(construct_tool_bar): code cleanup and tool tips for combo box Torsten <ttl@justmail.de> parents: 16514 diff changeset	1337 _current_directory_combo_box->setSizePolicy(sizePol);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1338
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1339 // 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	1340 // need to delete these upon destroying this main_window.
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1341 _main_tool_bar->addWidget (new QLabel (tr ("Current Directory: ")));
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1342 _main_tool_bar->addWidget (_current_directory_combo_box);
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1343 QAction *current_dir_up = _main_tool_bar->addAction (
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1344 QIcon (":/actions/icons/up.png"),
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1345 tr ("One directory up"));
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1346 QAction *current_dir_search = _main_tool_bar->addAction (
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1347 QIcon (":/actions/icons/search.png"),
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1348 tr ("Browse directories"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1349
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1350 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	1351 this, SLOT (set_current_working_directory (QString)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1352
16518 59dbdaeeea40 * main_window.cc(construct_tool_bar): code cleanup and tool tips for combo box Torsten <ttl@justmail.de> parents: 16514 diff changeset	1353 connect (_current_directory_combo_box->lineEdit(), SIGNAL (returnPressed ()),
59dbdaeeea40 * main_window.cc(construct_tool_bar): code cleanup and tool tips for combo box Torsten <ttl@justmail.de> parents: 16514 diff changeset	1354 this, SLOT (accept_directory_line_edit ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1355
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1356 connect (current_dir_search, SIGNAL (triggered ()),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1357 this, SLOT (browse_for_directory ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1358
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16519 diff changeset	1359 connect (current_dir_up, SIGNAL (triggered ()),
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1360 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	1361
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	1362 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	1363 this, SLOT (handle_undo_request ()));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1364 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1365
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1366 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1367 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	1368 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1369 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	1370 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1371
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1372 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1373 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	1374 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1375 Fload (ovl (file));
16504 49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	1376
49b059bf27c7 allow loading files from file browser John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	1377 octave_link::set_workspace (true, symbol_table::workspace_info ());
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1378 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1379
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1380 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1381 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	1382 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1383 Fclear ();
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1384 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1385
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1386 void
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1387 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	1388 {
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1389 /* bool status = */ symbol_table::rename (names.first, names.second);
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1390
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1391 // if (status)
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1392 octave_link::set_workspace (true, symbol_table::workspace_info ());
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1393
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1394 // else
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1395 // ; // we need an octave_link action that runs a GUI error option.
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1396 }
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1397
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1398 void
16539 8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	1399 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	1400 {
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	1401 command_editor::undo ();
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	1402 command_editor::redisplay ();
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	1403 }
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	1404
8ea8df0747e9 make undo button and menu item work for command window John W. Eaton <jwe@octave.org> parents: 16532 diff changeset	1405 void
16514 db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	1406 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	1407 {
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	1408 Fclc ();
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	1409 command_editor::interrupt (true);
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	1410 }
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	1411
db045633405c Added clear command window implementation to MainWindow Clear COmmand Window menu. John Donoghue <john.donoghue@ieee.org> parents: 16512 diff changeset	1412 void
16541 6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	1413 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	1414 {
6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	1415 command_editor::resize_terminal ();
6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	1416 }
6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	1417
6afb29359968 set size of command window terminal at GUI startup John W. Eaton <jwe@octave.org> parents: 16539 diff changeset	1418 void
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1419 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	1420 {
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	1421 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	1422 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1423
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1424 void
16570 d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1425 main_window::execute_command_callback (const std::string& command)
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1426 {
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1427 std::string pending_input = command_editor::get_current_line ();
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1428
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1429 command_editor::set_initial_input (pending_input);
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1430
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1431 command_editor::replace_line (command);
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1432 command_editor::redisplay ();
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1433
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1434 // We are executing inside the command editor event loop. Force
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1435 // the current line to be returned for processing.
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1436 command_editor::interrupt ();
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1437 }
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1438
d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1439 void
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1440 main_window::run_file_callback (const QFileInfo& info)
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1441 {
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1442 QString dir = info.absolutePath ();
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1443 QString function_name = info.fileName ();
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1444 function_name.chop (info.suffix ().length () + 1);
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1445 if (octave_qt_link::file_in_path (info.absoluteFilePath ().toStdString (),
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1446 dir.toStdString ()))
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1447 execute_command_callback (function_name.toStdString ());
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1448 }
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1449
25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1450 void
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1451 main_window::new_figure_callback (void)
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1452 {
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1453 Fbuiltin (ovl ("figure"));
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1454 Fdrawnow ();
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1455 }
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1456
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16565 diff changeset	1457 void
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1458 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	1459 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1460 Fcd (ovl (directory));
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1461 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1462
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1463 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1464 main_window::debug_continue_callback (void)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1465 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1466 Fdbcont ();
16397 649d0b75ec06 allow continue and quit debug buttons to work John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	1467
649d0b75ec06 allow continue and quit debug buttons to work John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	1468 command_editor::interrupt (true);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1469 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1470
16382 389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1471 // The next three callbacks are invoked by GUI buttons. Those buttons
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1472 // should only be active when we are doing debugging, which means that
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1473 // Octave is waiting for input in get_debug_input. Calling
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1474 // command_editor::interrupt will force readline to return even if it
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1475 // has not read any input, and then get_debug_input will return,
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1476 // allowing the evaluator to continue and execute the next statement.
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1477
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1478 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1479 main_window::debug_step_into_callback (void)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1480 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1481 Fdbstep (ovl ("in"));
16382 389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1482
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1483 command_editor::interrupt (true);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1484 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1485
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1486 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1487 main_window::debug_step_over_callback (void)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1488 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1489 Fdbstep ();
16382 389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1490
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1491 command_editor::interrupt (true);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1492 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1493
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1494 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1495 main_window::debug_step_out_callback (void)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1496 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1497 Fdbstep (ovl ("out"));
16382 389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1498
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1499 command_editor::interrupt (true);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1500 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1501
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1502 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1503 main_window::debug_quit_callback (void)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1504 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1505 Fdbquit ();
16397 649d0b75ec06 allow continue and quit debug buttons to work John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	1506
649d0b75ec06 allow continue and quit debug buttons to work John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	1507 command_editor::interrupt (true);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1508 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1509
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1510 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1511 main_window::exit_callback (void)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1512 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1513 Fquit ();
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1514 }
16519 3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1515
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1516 void
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1517 main_window::find_files(const QString &start_dir)
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1518 {
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1519
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1520 if (! find_files_dlg)
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1521 {
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1522 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	1523
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1524 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	1525 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	1526
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1527 connect (find_files_dlg, SIGNAL (dir_selected(const QString &)),
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1528 file_browser_window, SLOT(set_current_directory(const QString&)));
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1529
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1530 connect (find_files_dlg, SIGNAL (file_selected(const QString &)),
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1531 this, SLOT(open_file(const QString &)));
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1532
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1533 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	1534 }
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1535
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1536 if (! find_files_dlg->isVisible ())
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1537 {
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1538 find_files_dlg->show ();
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1539 }
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1540
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1541 find_files_dlg->set_search_dir(start_dir);
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1542
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1543 find_files_dlg->activateWindow ();
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1544
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1545 }
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1546
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1547 void
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16547 diff changeset	1548 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	1549 {
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1550
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1551 }
3e8fd0c479b4 Add find files implemtation to main window menu John Donoghue <john.donoghue@ieee.org> parents: 16518 diff changeset	1552
16635 25e418d23a4b fix running files from file browser's context menu Torsten <ttl@justmail.de> parents: 16593 diff changeset	1553

Mercurial > octave-nkf

annotate libgui/src/main-window.cc @ 16818:caf3d2a45da0