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

annotate libgui/src/main-window.cc @ 16502:45ae1038ee89

allow renaming of variables in workspace viewer * main-window.h, main-window.cc (main_window::handle_rename_variable_request): New function. (main_window::construct_octave_qt_link): Connect _workspace_model::rename_variable to main_window::handle_rename_variable_request. (main_window::rename_variable_callback): New function. * octave-qt-link.h, octave-qt-link.cc (octave_qt_link::do_set_workspace, octave_qt_link::set_workspace_signal): New argument, top_level. Change all uses. * octave-link.h, octave-link.cc (octave_link::post_event): Provide two-argument version. (octave_link::set_workspace, octave_link::do_set_workspace): New argument, top_level. Change all uses. * workspace-model.h, workspace-model.cc (workspace_model::flags): Conditionally add Qt::ItemIsEditable to flags. (workspace_model::data): Also return value for column 0 if it is editable. (workspace_model::setData): Handle setting new values. (workspace_model::_top_level): New data member. (workspace_model::set_workspace): New argument, top_level. (workspace_model::rename_variable): New signal. * workspace-view.h, workspace-view.cc (variable_name_editor): New class. (workspace_view::var_name_editor): New data member. (workspace_view::workspace_view): Initialize it. Set var_name_editor as delegate for column 0. (workspace_view::~workspace_view): Delete var_name_editor. (workspace_view::item_double_clicked): Delete. * symtab.h (symbol_table::rename, symbol_table::do_rename, symbol_table::symbol_record::rename): New functions.

author	John W. Eaton <jwe@octave.org>
date	Fri, 12 Apr 2013 14:50:56 -0400
parents	facf00ce97d3
children	49b059bf27c7

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
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	28 #include <QApplication>
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	29 #include <QLabel>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	30 #include <QMenuBar>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	31 #include <QMenu>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	32 #include <QAction>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	33 #include <QSettings>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	34 #include <QStyle>
7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	35 #include <QToolBar>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	36 #include <QDesktopServices>
16391 a695ee2dc17e * main-window.cc: Include <QDesktopWidget> John W. Eaton <jwe@octave.org> parents: 16386 diff changeset	37 #include <QDesktopWidget>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	38 #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	39 #include <QMessageBox>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	40 #include <QIcon>
7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	41
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	42 #include <utility>
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	43
16290 d07aeecb2d22 build: Add more #ifdefs to build GUI when Qscintilla is not present. Rik <rik@octave.org> parents: 16176 diff changeset	44 #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	45 #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	46 #endif
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	47 #include "main-window.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	48 #include "settings-dialog.h"
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	49
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	50 #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	51
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	52 #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	53 #include "defaults.h"
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	54 #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	55 #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	56
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	57 static file_editor_interface *
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	58 create_default_editor (QWidget *p)
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	59 {
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	60 #ifdef HAVE_QSCINTILLA
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	61 return new file_editor (p);
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	62 #else
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	63 return 0;
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	64 #endif
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	65 }
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	66
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	67 main_window::main_window (QWidget *p)
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	68 : QMainWindow (p),
d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	69 _workspace_model (new workspace_model ()),
d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	70 status_bar (new QStatusBar ()),
d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	71 command_window (new terminal_dock_widget (this)),
d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	72 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	73 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	74 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	75 editor_window (create_default_editor (this)),
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	76 workspace_window (new workspace_view (this)),
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	77 _octave_main_thread (0),
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	78 _octave_qt_link (0)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	79 {
14599 97cb9286919c Cleaned up code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14588 diff changeset	80 // 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	81 construct ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	82 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	83
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	84 main_window::~main_window (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	85 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	86 // 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	87 // 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	88
fa842e78f491 Restore STDERR stream pipe before exit to capture error messages. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16479 diff changeset	89 delete command_window;
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	90 delete workspace_window;
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	91 delete editor_window;
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	92 delete doc_browser_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	93 delete file_browser_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	94 delete history_window;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	95 delete status_bar;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	96 delete _workspace_model;
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	97 delete _octave_main_thread;
16421 40d1ddca4db5 improve use of octave_link John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	98 delete _octave_qt_link;
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	99 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	100
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	101 void
16449 c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	102 main_window::focus_command_window (void)
c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	103 {
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	104 command_window->focus ();
16449 c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	105 }
c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	106
c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	107 void
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16451 diff changeset	108 main_window::new_file (const QString& commands)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	109 {
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	110 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	111 }
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	112
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	113 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	114 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	115 {
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	116 emit open_file_signal (file_name);
13558 248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	117 }
248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	118
248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	119 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	120 main_window::report_status_message (const QString& statusMessage)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	121 {
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	122 status_bar->showMessage (statusMessage, 1000);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	123 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	124
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	125 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	126 main_window::handle_save_workspace_request (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	127 {
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	128 QString selectedFile =
16176 74ba79f79fcc gui: improve shortcuts for the editor (bug #38383) and for widget navigation Torsten <ttl@justmail.de> parents: 15993 diff changeset	129 QFileDialog::getSaveFileName (this, tr ("Save Workspace As"),
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	130 resource_manager::get_home_path ());
14824 9c0959a1dc7b Not attempint to save workspace when no filename provided. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14814 diff changeset	131 if (!selectedFile.isEmpty ())
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	132 octave_link::post_event (this, &main_window::save_workspace_callback,
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	133 selectedFile.toStdString ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	134 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	135
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	136 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	137 main_window::handle_load_workspace_request (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	138 {
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	139 QString selectedFile =
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	140 QFileDialog::getOpenFileName (this, tr ("Load Workspace"),
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	141 resource_manager::get_home_path ());
14682 9ea75ea686b5 Allowing nested dock widgets and fixed small bug in loading a workspace. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	142 if (!selectedFile.isEmpty ())
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	143 octave_link::post_event (this, &main_window::load_workspace_callback,
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	144 selectedFile.toStdString ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	145 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	146
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	147 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	148 main_window::handle_clear_workspace_request (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	149 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	150 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	151 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	152
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	153 void
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	154 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	155 const QString& new_name)
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	156
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	157 {
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	158 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	159
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	160 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	161 names);
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	162 }
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	163
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	164 void
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	165 main_window::handle_clear_history_request (void)
14814 61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	166 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	167 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	168 }
61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	169
61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	170 void
16446 4b3a4bf8569b improve encapsulation of command window object John W. Eaton <jwe@octave.org> parents: 16445 diff changeset	171 main_window::handle_command_double_clicked (const QString& command)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	172 {
16446 4b3a4bf8569b improve encapsulation of command window object John W. Eaton <jwe@octave.org> parents: 16445 diff changeset	173 emit relay_command_signal (command);
16449 c129a8b73d25 avoid unneeded signals for window focus John W. Eaton <jwe@octave.org> parents: 16448 diff changeset	174
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	175 command_window->focus ();
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	176 }
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	177
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	178 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	179 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	180 {
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	181 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	182 }
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	183
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	184 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	185 main_window::open_bug_tracker_page (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	186 {
15044 b7b1ffc88086 Update urls to Agora and bug tracker Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15041 diff changeset	187 QDesktopServices::openUrl (QUrl ("http://bugs.octave.org"));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	188 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	189
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	190 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	191 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	192 {
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	193 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	194 }
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	195
afc4e08f2143 Add access to documentation and to online html page via Help menu Daniel J Sebald <daniel.sebald@ieee.org> parents: 15987 diff changeset	196 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	197 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	198 {
15044 b7b1ffc88086 Update urls to Agora and bug tracker Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15041 diff changeset	199 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	200 }
edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	201
edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	202 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	203 main_window::process_settings_dialog_request (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	204 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	205 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	206 int change_settings = settingsDialog->exec ();
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	207 if (change_settings == QDialog::Accepted)
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	208 {
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	209 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	210 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	211 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	212 emit settings_changed (settings);
15274 c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	213 }
14586 8e9823066dad Fixed bug with not correctly syncing settings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14308 diff changeset	214 delete settingsDialog;
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	215 }
fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	216
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	217
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	218 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	219 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	220 {
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	221 // 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	222
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	223 // 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	224 QString icon_set
203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	225 = 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	226
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	227 static struct
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	228 {
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	229 QString name;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	230 QString path;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	231 }
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	232
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	233 widget_icon_data[] =
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	234 { // 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	235 // 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	236 {"NONE", ":/actions/icons/logo.png"},
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	237 {"GRAPHIC", ":/actions/icons/graphic_logo_"},
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	238 {"LETTER", ":/actions/icons/letter_logo_"},
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	239 {"", ""} // end marker has empty name
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	240 };
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	241
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	242 int count = 0;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	243 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	244
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	245 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	246 { // while not end of data
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	247 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	248 { // data of desired icon set found
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	249 icon_set_found = count;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	250 break;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	251 }
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	252 count++;
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	253 }
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	254
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	255 QString icon;
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	256 foreach (QObject *obj, children ())
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	257 {
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	258 QString name = obj->objectName ();
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	259 if (obj->inherits ("QDockWidget") && ! name.isEmpty ())
16460 4d4e7c6f839d use consistent names for dock-widget files John W. Eaton <jwe@octave.org> parents: 16459 diff changeset	260 { // if children is a dock widget with a name
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	261 QDockWidget widget = qobject_cast<QDockWidget > (obj);
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	262 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	263 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	264 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	265 widget->setWindowIcon (QIcon (icon));
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	266 }
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	267 }
b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15758 diff changeset	268
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	269 resource_manager::update_network_settings ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	270 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	271
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15900 diff changeset	272
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	273 void
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	274 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	275 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	276 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	277 }
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	278
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	279 void
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	280 main_window::exit (int status)
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	281 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	282 qApp->exit (status);
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	283 }
7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	284
7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	285 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	286 main_window::reset_windows ()
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	287 {
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	288 // TODO: Implement.
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	289 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	290
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	291 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	292 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	293 {
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	294 // 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	295 // 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	296 // widget.
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	297
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	298 int index = _current_directory_combo_box->findText (dir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	299
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	300 if (index >= 0)
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	301 _current_directory_combo_box->removeItem (index);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	302
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	303 _current_directory_combo_box->insertItem (0, dir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	304 _current_directory_combo_box->setCurrentIndex (0);
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	305
16499 facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16497 diff changeset	306 file_browser_window->update_octave_directory (dir);
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	307 }
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	308
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	309 void
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	310 main_window::browse_for_directory (void)
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	311 {
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	312 QString dir =
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	313 QFileDialog::getExistingDirectory (this, tr ("Set working directory"));
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	314
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	315 if (! dir.isEmpty ())
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	316 octave_link::post_event (this,
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	317 &main_window::change_directory_callback,
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	318 dir.toStdString ());
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	319 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	320
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	321 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	322 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	323 {
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	324 // 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	325
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	326 QString xdir = dir.isEmpty () ? "." : dir;
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	327
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	328 QFileInfo fileInfo (xdir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	329
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	330 if (fileInfo.exists () && fileInfo.isDir ())
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	331 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	332 xdir.toStdString ());
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_up (void)
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 QDir dir ("..");
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	339
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	340 set_current_working_directory (dir.absolutePath ());
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	341 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	342
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	343 // 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	344 // 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	345 // in the drop down list.
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	346
15626 1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	347 void
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	348 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	349 {
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	350 // 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	351 // 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	352 // directory.
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	353
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	354 QString dir = _current_directory_line_edit->text ();
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	355
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	356 int index = _current_directory_combo_box->findText (dir);
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	357
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	358 if (index < 0)
15626 1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	359 set_current_working_directory (dir);
1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	360 }
1cc10ce368ea enable entering a new directory in the current directory combobox Torsten <ttl@justmail.de> parents: 15607 diff changeset	361
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	362 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	363 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	364 {
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	365 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	366
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	367 _debug_continue->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	368 _debug_step_into->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	369 _debug_step_over->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	370 _debug_step_out->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	371 _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	372
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15848 diff changeset	373 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	374 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	375 #endif
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	376 }
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	377
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	378 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	379 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	380 {
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	381 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	382
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	383 _debug_continue->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	384 _debug_step_into->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	385 _debug_step_over->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	386 _debug_step_out->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	387 _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	388
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15848 diff changeset	389 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	390 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	391 #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	392 }
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	393
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	394 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	395 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	396 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	397 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	398 }
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	399
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	400 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	401 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	402 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	403 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	404 }
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	405
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	406 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	407 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	408 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	409 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	410 }
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	411
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	412 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	413 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	414 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	415 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	416 }
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	417
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	418 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	419 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	420 {
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	421 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	422 }
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	423
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	424 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	425 main_window::show_about_octave (void)
13548 5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	426 {
15404 f52a62a6db3a eliminate copy and paste copyright info in GUI about info box John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	427 QString message = OCTAVE_STARTUP_MESSAGE;
13548 5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	428
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	429 QMessageBox::about (this, tr ("About Octave"), message);
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	430 }
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	431
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	432 void
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	433 main_window::closeEvent (QCloseEvent *e)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	434 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	435 e->ignore ();
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	436 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	437 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	438
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	439 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	440 main_window::read_settings (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	441 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	442 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	443 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	444 {
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	445 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	446 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	447 }
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	448
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	449 restoreState (settings->value ("MainWindow/windowState").toByteArray ());
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	450 settings->beginGroup ("DockWidgets");
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	451 // restoring the geometry of all dock-widgets
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	452 foreach (QObject *obj, children ())
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	453 {
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	454 QString name = obj->objectName ();
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	455 if (obj->inherits ("QDockWidget") && ! name.isEmpty ())
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	456 {
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	457 QDockWidget widget = qobject_cast<QDockWidget > (obj);
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	458 QVariant val = settings->value (name);
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	459 widget->restoreGeometry (val.toByteArray ());
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	460 bool floating = settings->value (name+"Floating", false).toBool ();
203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	461 bool visible = settings->value (name+"Visible", true).toBool ();
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	462 if (floating)
bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	463 widget->setWindowFlags (Qt::Window); // if floating, make window from widget
bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	464 widget->setVisible (visible); // make widget visible if desired (setWindowFlags hides widget)
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	465 }
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	466 }
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	467 settings->endGroup();
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	468 restoreGeometry (settings->value ("MainWindow/geometry").toByteArray ());
15465 ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	469 // 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	470 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	471 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	472 {
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	473 _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	474 }
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	475 emit settings_changed (settings);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	476 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	477
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	478 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	479 main_window::write_settings (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	480 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	481 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	482 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	483 {
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	484 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	485 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	486 }
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	487
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	488 settings->setValue ("MainWindow/geometry", saveGeometry ());
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	489 settings->beginGroup ("DockWidgets");
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	490 // saving the geometry of all widgets
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	491 foreach (QObject *obj, children())
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	492 {
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	493 QString name = obj->objectName ();
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	494 if (obj->inherits ("QDockWidget") && ! name.isEmpty ())
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	495 {
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	496 QDockWidget widget = qobject_cast<QDockWidget > (obj);
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	497 settings->setValue (name, widget->saveGeometry ());
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	498 bool floating = widget->isFloating ();
bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	499 bool visible = widget->isVisible ();
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	500 settings->setValue (name+"Floating", floating); // store floating state
203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	501 settings->setValue (name+"Visible", visible); // store visibility
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	502 if (floating)
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	503 widget->setWindowFlags (Qt::Widget); // if floating, recover the widget state such that the widget's
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	504 } // state is correctly saved by the saveSate () below
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	505 }
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	506 settings->endGroup();
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15465 diff changeset	507 settings->setValue ("MainWindow/windowState", saveState ());
15465 ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	508 // 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	509 QStringList curr_dirs;
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	510 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	511 {
ded4ce76ee7a save and restore the list of recently visited directories Torsten <ttl@justmail.de> parents: 15426 diff changeset	512 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	513 }
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	514 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	515 settings->sync ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	516 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	517
15987 47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	518
47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	519 // 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	520 // 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	521 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	522 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	523 {
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	524 command_window->connect_visibility_changed ();
d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	525 history_window->connect_visibility_changed ();
16450 3207f1d62e74 improve encapsulation of file browser window object John W. Eaton <jwe@octave.org> parents: 16449 diff changeset	526 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	527 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	528 #ifdef HAVE_QSCINTILLA
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	529 editor_window->connect_visibility_changed ();
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	530 #endif
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	531 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	532 }
47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	533
47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	534
47a4c92924a7 gui: prevent error messages at start-up (regression from changeset 6c0fce0632a4) Torsten <ttl@justmail.de> parents: 15983 diff changeset	535 // Main subroutine of the constructor
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	536 void
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	537 main_window::construct (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	538 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	539 _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	540 setWindowIcon (QIcon (":/actions/icons/logo.png"));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	541
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	542 workspace_window->setModel (_workspace_model);
16445 3f8d3fc907af store workspace model in main_window, not in workspace view John W. Eaton <jwe@octave.org> parents: 16443 diff changeset	543
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	544 // 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	545 // 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	546 // destroying this main_window.
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	547
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	548 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	549 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	550 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	551 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	552 dummyWidget->hide ();
79c9a6d06590 Wrote SymbolInformation struct and refactored code that updates the symbol table. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14695 diff changeset	553 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	554
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	555 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	556
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	557 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	558
16497 9ff3181e671c Reconnect aboutToQuit signal and prepare_to_exit (write_settings) slot. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16485 diff changeset	559 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	560 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	561
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	562 connect (this, SIGNAL (settings_changed (const QSettings *)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	563 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	564
14601 772ce0204b3f Removed version number and "Octave GUI"-labelling. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14599 diff changeset	565 setWindowTitle ("Octave");
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	566
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	567 setDockOptions (QMainWindow::AnimatedDocks
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	568 \| QMainWindow::AllowNestedDocks
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	569 \| QMainWindow::AllowTabbedDocks);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	570
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	571 addDockWidget (Qt::RightDockWidgetArea, command_window);
16453 2e3c652c89d1 improve encapsulation of documentation browser window object John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	572 addDockWidget (Qt::RightDockWidgetArea, doc_browser_window);
2e3c652c89d1 improve encapsulation of documentation browser window object John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	573 tabifyDockWidget (command_window, doc_browser_window);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	574
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	575 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	576 addDockWidget (Qt::RightDockWidgetArea, editor_window);
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	577 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	578 #endif
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	579
16450 3207f1d62e74 improve encapsulation of file browser window object John W. Eaton <jwe@octave.org> parents: 16449 diff changeset	580 addDockWidget (Qt::LeftDockWidgetArea, file_browser_window);
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	581 addDockWidget (Qt::LeftDockWidgetArea, workspace_window);
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	582 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	583
4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	584 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	585 int win_y = QApplication::desktop()->height();
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	586
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	587 if (win_x > 960)
4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	588 win_x = 960;
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	589
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	590 if (win_y > 720)
4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 16377 diff changeset	591 win_y = 720;
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	592
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	593 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	594
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	595 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	596
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	597 construct_octave_qt_link ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	598
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	599 QDir curr_dir;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	600 set_current_working_directory (curr_dir.absolutePath ());
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	601 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	602
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	603 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	604 main_window::construct_octave_qt_link (void)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	605 {
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	606 _octave_main_thread = new octave_main_thread ();
16421 40d1ddca4db5 improve use of octave_link John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	607
16485 8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	608 _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	609
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	610 connect (_octave_qt_link, SIGNAL (exit_signal (int)),
8b783661e03f improve exit sequence for GUI John W. Eaton <jwe@octave.org> parents: 16484 diff changeset	611 this, SLOT (exit (int)));
16479 7a71ea0b7ae9 eliminate event listener class John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	612
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	613 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	614 SIGNAL (set_workspace_signal
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	615 (bool, const QString&, const QStringList&,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	616 const QStringList&, const QStringList&,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	617 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	618 _workspace_model,
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	619 SLOT (set_workspace
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	620 (bool, const QString&, const QStringList&,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	621 const QStringList&, const QStringList&,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	622 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	623
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16460 diff changeset	624 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	625 _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	626
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	627 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	628 this, SLOT (change_directory (QString)));
919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	629
16423 04c4dd7fd3ce use signal for octave_link::update_dbstop_marker John W. Eaton <jwe@octave.org> parents: 16421 diff changeset	630 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	631 SIGNAL (set_history_signal (const QStringList&)),
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	632 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	633
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	634 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	635 SIGNAL (append_history_signal (const QString&)),
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	636 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	637
5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	638 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	639 SIGNAL (clear_history_signal (void)),
16451 d4c3736e1e28 dynamically allocate Qt widgets John W. Eaton <jwe@octave.org> parents: 16450 diff changeset	640 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	641
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	642 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	643 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	644
a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16437 diff changeset	645 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	646 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	647
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	648 connect (_octave_qt_link,
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	649 SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	650 editor_window,
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16438 diff changeset	651 SLOT (handle_update_breakpoint_marker_request (bool, const QString&, int)));
16423 04c4dd7fd3ce use signal for octave_link::update_dbstop_marker John W. Eaton <jwe@octave.org> parents: 16421 diff changeset	652
16424 ad052cdc89ad use signal for octave_link::edit_file John W. Eaton <jwe@octave.org> parents: 16423 diff changeset	653 connect (_octave_qt_link,
ad052cdc89ad use signal for octave_link::edit_file John W. Eaton <jwe@octave.org> parents: 16423 diff changeset	654 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	655 editor_window,
16424 ad052cdc89ad use signal for octave_link::edit_file John W. Eaton <jwe@octave.org> parents: 16423 diff changeset	656 SLOT (handle_edit_file_request (const QString&)));
ad052cdc89ad use signal for octave_link::edit_file John W. Eaton <jwe@octave.org> parents: 16423 diff changeset	657
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	658 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	659 SIGNAL (insert_debugger_pointer_signal (const QString&, int)),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	660 editor_window,
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	661 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	662
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	663 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	664 SIGNAL (delete_debugger_pointer_signal (const QString&, int)),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	665 editor_window,
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	666 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	667
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	668 connect (_workspace_model,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	669 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	670 this,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	671 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	672 const QString&)));
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	673
16432 fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	674 _octave_qt_link->execute_interpreter ();
fe4cd846c3e7 separate octave interpreter thread creation from execution John W. Eaton <jwe@octave.org> parents: 16431 diff changeset	675
16421 40d1ddca4db5 improve use of octave_link John W. Eaton <jwe@octave.org> parents: 16415 diff changeset	676 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	677 }
16437 919796a440c6 use signal for changing directory John W. Eaton <jwe@octave.org> parents: 16432 diff changeset	678
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	679 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	680 main_window::construct_menu_bar (void)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	681 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	682 QMenuBar *menu_bar = menuBar ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	683
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	684 construct_file_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	685
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	686 construct_edit_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	687
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	688 construct_debug_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	689
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	690 construct_desktop_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	691
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	692 construct_window_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	693
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	694 construct_help_menu (menu_bar);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	695 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	696
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	697 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	698 main_window::construct_file_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	699 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	700 QMenu *file_menu = p->addMenu (tr ("&File"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	701
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	702 construct_new_menu (file_menu);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	703
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	704 _open_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	705 = 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	706 tr ("Open..."));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	707 _open_action->setShortcut (QKeySequence::Open);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	708 _open_action->setShortcutContext (Qt::ApplicationShortcut);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	709
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	710 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	711 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	712 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	713
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	714 QAction *close_command_window_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	715 = file_menu->addAction (tr ("Close Command Window"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	716 close_command_window_action->setShortcut (QKeySequence::Close);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	717 close_command_window_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	718
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	719 file_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	720
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	721 QAction *import_data_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	722 = file_menu->addAction (tr ("Import Data"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	723 import_data_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	724
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	725 QAction *save_workspace_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	726 = file_menu->addAction (tr ("Save Workspace As"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	727
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	728 file_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	729
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	730 QAction *preferences_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	731 = 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	732 tr ("Preferences..."));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	733
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	734 file_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	735
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	736 QAction *page_setup_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	737 = file_menu->addAction (tr ("Page Setup..."));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	738 page_setup_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	739
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	740 QAction *print_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	741 = file_menu->addAction (tr ("Print"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	742 print_action->setShortcut (QKeySequence::Print);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	743 print_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	744
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	745 QAction *print_selection_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	746 = file_menu->addAction (tr ("Print Selection..."));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	747 print_selection_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	748
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	749 file_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	750
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	751 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	752 exit_action->setShortcut (QKeySequence::Quit);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	753
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	754 connect (preferences_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	755 this, SLOT (process_settings_dialog_request ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	756
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	757 connect (_open_action, SIGNAL (triggered ()),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	758 editor_window, SLOT (request_open_file ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	759
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	760 connect (save_workspace_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	761 this, SLOT (handle_save_workspace_request ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	762
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	763 connect (exit_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	764 this, SLOT (close ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	765 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	766
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	767 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	768 main_window::construct_new_menu (QMenu *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	769 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	770 QMenu *new_menu = p->addMenu (tr ("New"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	771
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	772 _new_script_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	773 = new_menu->addAction (QIcon (":/actions/icons/filenew.png"), tr ("Script"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	774 _new_script_action->setShortcut (QKeySequence::New);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	775 _new_script_action->setShortcutContext (Qt::ApplicationShortcut);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	776
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	777 QAction *new_function_action = new_menu->addAction (tr ("Function"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	778 new_function_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	779
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	780 QAction *new_class_action = new_menu->addAction (tr ("Class"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	781 new_class_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	782
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	783 QAction *new_enumeration_action = new_menu->addAction (tr ("Enumeration"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	784 new_enumeration_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	785
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	786 QAction *new_figure_action = new_menu->addAction (tr ("Figure"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	787 new_figure_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	788
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	789 QAction *new_variable_action = new_menu->addAction (tr ("Variable"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	790 new_variable_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	791
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	792 QAction *new_model_action = new_menu->addAction (tr ("Model"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	793 new_model_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	794
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	795 QAction *new_gui_action = new_menu->addAction (tr ("GUI"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	796 new_gui_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	797
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	798 connect (_new_script_action, SIGNAL (triggered ()),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	799 editor_window, SLOT (request_new_file ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	800 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	801
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	802 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	803 main_window::construct_edit_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	804 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	805 QMenu *edit_menu = p->addMenu (tr ("&Edit"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	806
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	807 QKeySequence ctrl_shift = Qt::ControlModifier + Qt::ShiftModifier;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	808
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	809 _undo_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	810 = 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	811 _undo_action->setShortcut (QKeySequence::Undo);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	812
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	813 _redo_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	814 = edit_menu->addAction (QIcon (":/actions/icons/redo.png"), tr ("Redo"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	815 _redo_action->setShortcut (QKeySequence::Redo);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	816
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	817 edit_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	818
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	819 _cut_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	820 = edit_menu->addAction (QIcon (":/actions/icons/editcut.png"), tr ("Cut"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	821 _cut_action->setShortcut (ctrl_shift + Qt::Key_X);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	822
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	823 _copy_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	824 = edit_menu->addAction (QIcon (":/actions/icons/editcopy.png"), tr ("Copy"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	825 _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	826
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	827 _paste_action
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	828 = edit_menu->addAction (QIcon (":/actions/icons/editpaste.png"), tr ("Paste"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	829 _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	830
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	831 QAction *paste_to_workspace_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	832 = edit_menu->addAction (tr ("Paste To Workspace..."));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	833 paste_to_workspace_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	834
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	835 edit_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	836
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	837 QAction *select_all_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	838 = edit_menu->addAction (tr ("Select All"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	839 select_all_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	840
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	841 QAction *delete_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	842 = edit_menu->addAction (tr ("Delete"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	843 delete_action->setShortcut (Qt::Key_Delete);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	844 delete_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	845
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	846 edit_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	847
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	848 QAction *find_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	849 = edit_menu->addAction (tr ("Find..."));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	850 find_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	851
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	852 QAction *find_files_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	853 = edit_menu->addAction (tr ("Find Files..."));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	854 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	855 find_files_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	856
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	857 edit_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	858
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	859 QAction *clear_command_window_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	860 = edit_menu->addAction (tr ("Clear Command Window"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	861 clear_command_window_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	862
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	863 QAction *clear_command_history
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	864 = edit_menu->addAction(tr ("Clear Command History"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	865
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	866 QAction *clear_workspace_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	867 = edit_menu->addAction (tr ("Clear Workspace"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	868
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	869 connect (_copy_action, SIGNAL (triggered()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	870 command_window, SLOT (copyClipboard ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	871
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	872 connect (_paste_action, SIGNAL (triggered()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	873 command_window, SLOT (pasteClipboard ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	874
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	875 connect (clear_command_history, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	876 this, SLOT (handle_clear_history_request ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	877
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	878 connect (clear_workspace_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	879 this, SLOT (handle_clear_workspace_request ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	880 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	881
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	882 QAction *
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	883 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	884 const QString& item,
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	885 const QKeySequence& key)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	886 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	887 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	888
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	889 action->setEnabled (false);
16458 a3513fc13cdb fix cut and paste error in changeset 246d25c8761b John W. Eaton <jwe@octave.org> parents: 16457 diff changeset	890 action->setShortcut (key);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	891
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	892 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	893 editor_window->debug_menu ()->addAction (action);
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	894 editor_window->toolbar ()->addAction (action);
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	895 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	896
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	897 return action;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	898 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	899
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	900 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	901 main_window::construct_debug_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	902 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	903 _debug_menu = p->addMenu (tr ("De&bug"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	904
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	905 _debug_step_over = construct_debug_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	906 (":/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	907
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	908 _debug_step_into = construct_debug_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	909 (":/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	910
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	911 _debug_step_out = construct_debug_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	912 (":/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	913 Qt::ShiftModifier + Qt::Key_F11);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	914
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	915 _debug_continue = construct_debug_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	916 (":/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	917
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	918 _debug_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	919 #ifdef HAVE_QSCINTILLA
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	920 editor_window->debug_menu ()->addSeparator ();
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	921 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	922
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	923 _debug_quit = construct_debug_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	924 (":/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	925 Qt::ShiftModifier + Qt::Key_F5);
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 connect (_debug_step_over, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	928 this, SLOT (debug_step_over ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	929
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	930 connect (_debug_step_into, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	931 this, SLOT (debug_step_into ()));
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 connect (_debug_step_out, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	934 this, SLOT (debug_step_out ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	935
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	936 connect (_debug_continue, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	937 this, SLOT (debug_continue ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	938
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	939 connect (_debug_quit, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	940 this, SLOT (debug_quit ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	941 }
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 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	944 main_window::construct_desktop_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	945 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	946 QMenu *desktop_menu = p->addMenu (tr ("&Desktop"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	947
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	948 QAction *load_workspace_action = desktop_menu->addAction (tr ("Load workspace"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	949
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	950 connect (load_workspace_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	951 this, SLOT (handle_load_workspace_request ()));
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
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	954 QAction *
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	955 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	956 bool checkable,
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	957 const QKeySequence& key)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	958 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	959 QAction *action = p->addAction (item);
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 action->setCheckable (checkable);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	962 action->setShortcut (key);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	963 action->setShortcutContext (Qt::ApplicationShortcut);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	964
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	965 return action;
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
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	968 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	969 main_window::construct_window_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	970 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	971 QMenu *window_menu = p->addMenu (tr ("&Window"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	972
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	973 QKeySequence ctrl = Qt::ControlModifier;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	974 QKeySequence ctrl_shift = Qt::ControlModifier + Qt::ShiftModifier;
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	975
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	976 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	977 (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	978
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	979 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	980 (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	981
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	982 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	983 (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	984
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	985 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	986 (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	987
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	988 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	989 (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	990
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	991 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	992 (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	993
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	994 window_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	995
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	996 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	997 (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	998
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	999 QAction *history_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1000 (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	1001
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1002 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	1003 (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	1004
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1005 QAction *workspace_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1006 (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	1007
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1008 QAction *editor_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1009 (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	1010
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1011 QAction *documentation_action = construct_window_menu_item
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1012 (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	1013
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1014 window_menu->addSeparator ();
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 QAction *reset_windows_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1017 = window_menu->addAction (tr ("Reset Windows"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1018
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1019 reset_windows_action->setEnabled (false); // TODO: Make this work.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1020
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1021 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	1022 command_window, SLOT (setVisible (bool)));
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 connect (command_window, SIGNAL (active_changed (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1025 show_command_window_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1026
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1027 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	1028 workspace_window, SLOT (setVisible (bool)));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1029
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	1030 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	1031 show_workspace_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1032
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1033 connect (show_history_action, SIGNAL (toggled (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1034 history_window, SLOT (setVisible (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1035
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1036 connect (history_window, SIGNAL (active_changed (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1037 show_history_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1038
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1039 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	1040 file_browser_window, SLOT (setVisible (bool)));
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 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	1043 show_file_browser_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1044
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1045 #ifdef HAVE_QSCINTILLA
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1046 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	1047 editor_window, SLOT (setVisible (bool)));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1048
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	1049 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	1050 show_editor_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1051 #endif
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1052
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1053 connect (show_documentation_action, SIGNAL (toggled (bool)),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1054 doc_browser_window, SLOT (setVisible (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1055
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1056 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	1057 show_documentation_action, SLOT (setChecked (bool)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1058
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1059 connect (command_window_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1060 command_window, SLOT (focus ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1061
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1062 connect (workspace_action, SIGNAL (triggered ()),
16459 cbc39a3d0c42 improve encapsulation of workspace window object John W. Eaton <jwe@octave.org> parents: 16458 diff changeset	1063 workspace_window, SLOT (focus ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1064
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1065 connect (history_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1066 history_window, SLOT (focus ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1067
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1068 connect (file_browser_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1069 file_browser_window, SLOT (focus ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1070
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1071 connect (editor_action, SIGNAL (triggered ()),
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16456 diff changeset	1072 editor_window, SLOT (focus ()));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1073
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1074 connect (documentation_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1075 doc_browser_window, SLOT (focus ()));
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 connect (reset_windows_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1078 this, SLOT (reset_windows ()));
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
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1081 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1082 main_window::construct_help_menu (QMenuBar *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1083 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1084 QMenu *help_menu = p->addMenu (tr ("&Help"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1085
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1086 construct_documentation_menu (help_menu);
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 help_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1089
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1090 QAction *report_bug_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1091 = help_menu->addAction (tr ("Report 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 QAction *octave_forge_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1094 = help_menu->addAction (tr ("Visit Octave Forge"));
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 QAction *agora_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1097 = help_menu->addAction (tr ("Visit Agora"));
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 help_menu->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1100
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1101 QAction *about_octave_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1102 = help_menu->addAction (tr ("About Octave"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1103
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1104 connect (report_bug_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1105 this, SLOT (open_bug_tracker_page ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1106
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1107 connect (octave_forge_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1108 this, SLOT (open_octave_forge_page ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1109
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1110 connect (agora_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1111 this, SLOT (open_agora_page ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1112
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1113 connect (about_octave_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1114 this, SLOT (show_about_octave ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1115 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1116
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1117 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1118 main_window::construct_documentation_menu (QMenu *p)
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1119 {
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1120 QMenu *documentation_menu = p->addMenu (tr ("Documentation"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1121
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1122 QAction *ondisk_documentation_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1123 = documentation_menu->addAction (tr ("On Disk"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1124
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1125 QAction *online_documentation_action
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1126 = documentation_menu->addAction (tr ("Online"));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1127
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1128 connect (ondisk_documentation_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1129 doc_browser_window, SLOT (focus ()));
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 connect (online_documentation_action, SIGNAL (triggered ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1132 this, SLOT (open_online_documentation_page ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1133 }
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1134
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1135 void
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1136 main_window::construct_tool_bar (void)
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 QToolBar *main_tool_bar = addToolBar ("Main");
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1139
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1140 main_tool_bar->setObjectName ("MainToolBar");
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1141 main_tool_bar->addAction (_new_script_action);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1142 main_tool_bar->addAction (_open_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 main_tool_bar->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1145
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1146 main_tool_bar->addAction (_cut_action);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1147 main_tool_bar->addAction (_copy_action);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1148 main_tool_bar->addAction (_paste_action);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1149 main_tool_bar->addAction (_undo_action);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1150 main_tool_bar->addAction (_redo_action);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1151
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1152 main_tool_bar->addSeparator ();
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1153
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1154 _current_directory_line_edit = new QLineEdit (this);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1155 _current_directory_combo_box = new QComboBox (this);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1156 _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	1157 _current_directory_combo_box->setEditable (true);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1158 // setLineEdit takes ownership -> no need to delete line_edit in ~main_window
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1159 _current_directory_combo_box->setLineEdit (_current_directory_line_edit);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1160 _current_directory_combo_box->setInsertPolicy (QComboBox::InsertAtTop);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1161 _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	1162 _current_directory_combo_box->setMaxCount (current_directory_max_count);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1163
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1164 QToolButton *current_directory_tool_button = new QToolButton (this);
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1165 current_directory_tool_button->setIcon (QIcon (":/actions/icons/search.png"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1166
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1167 QToolButton *current_directory_up_tool_button = new QToolButton (this);
16456 203efbbcea63 * main-window.h, main-window.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	1168 current_directory_up_tool_button->setIcon (QIcon (":/actions/icons/up.png"));
16454 246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1169
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1170 // 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	1171 // need to delete these upon destroying this main_window.
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1172 main_tool_bar->addWidget (new QLabel (tr ("Current Directory:")));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1173 main_tool_bar->addWidget (_current_directory_combo_box);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1174 main_tool_bar->addWidget (current_directory_tool_button);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1175 main_tool_bar->addWidget (current_directory_up_tool_button);
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1176
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1177 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	1178 this, SLOT (set_current_working_directory (QString)));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1179
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1180 connect (_current_directory_line_edit, SIGNAL (returnPressed ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1181 this, SLOT (accept_directory_line_edit ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1182
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1183 connect (current_directory_tool_button, SIGNAL (clicked ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1184 this, SLOT (browse_for_directory ()));
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1185
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1186 connect (current_directory_up_tool_button, SIGNAL (clicked ()),
246d25c8761b split main_window::construct for clarity John W. Eaton <jwe@octave.org> parents: 16453 diff changeset	1187 this, SLOT (change_directory_up ()));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1188 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1189
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1190 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1191 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	1192 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1193 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	1194 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1195
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1196 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1197 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	1198 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1199 Fload (ovl (file));
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1200 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1201
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1202 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1203 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	1204 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1205 Fclear ();
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1206 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1207
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1208 void
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1209 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	1210 {
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1211 /* 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	1212
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1213 // if (status)
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1214 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	1215
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1216 // else
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1217 // ; // 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	1218 }
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1219
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16499 diff changeset	1220 void
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1221 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	1222 {
16431 5982d469f79b use signal for setting, appending to, and clearing history widget John W. Eaton <jwe@octave.org> parents: 16426 diff changeset	1223 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	1224 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1225
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1226 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1227 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	1228 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1229 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	1230 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1231
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1232 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1233 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	1234 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1235 Fdbcont ();
16397 649d0b75ec06 allow continue and quit debug buttons to work John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	1236
649d0b75ec06 allow continue and quit debug buttons to work John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	1237 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	1238 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1239
16382 389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1240 // 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	1241 // 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	1242 // 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	1243 // 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	1244 // 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	1245 // 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	1246
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1247 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1248 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	1249 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1250 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	1251
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1252 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	1253 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1254
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1255 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1256 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	1257 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1258 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	1259
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1260 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	1261 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1262
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1263 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1264 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	1265 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1266 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	1267
389b09a914e2 allow gui to force readline to return from its idle/read loop John W. Eaton <jwe@octave.org> parents: 16380 diff changeset	1268 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	1269 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1270
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1271 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1272 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	1273 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1274 Fdbquit ();
16397 649d0b75ec06 allow continue and quit debug buttons to work John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	1275
649d0b75ec06 allow continue and quit debug buttons to work John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	1276 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	1277 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1278
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1279 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1280 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	1281 {
15420 1249a615c91b call built-in functions directly in GUI callbacks John W. Eaton <jwe@octave.org> parents: 15404 diff changeset	1282 Fquit ();
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	1283 }

Mercurial > octave

annotate libgui/src/main-window.cc @ 16502:45ae1038ee89