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

annotate libgui/src/main-window.cc @ 15388:24b5348d38e7

merge event_accepted and event_reject into a single function * history-dockwidget.cc, history-dockwidget.h (history_dock_widget::handle_event): New function from merging history_dock_widget::event_accepted and history_dock_widget::event_reject into single fucntion with argument. * file-editor-tab.cc, file-editor-tab.h (file_editor_tab::handle_event): Likewise. * main-window.cc, main-window.h (main_window::handle_event): Likewise. * octave-event-observer.h (octave_event_observer::handle_event): New pure virtual function. (octave_event_observer::event_accepted, octave_event_observer::event_reject): Delete. * octave_link.cc, octave-link.h (octave_link::handle_event): Likewise. * workspace-model.cc, workspace-model.h (workspace_model::handle_event): Likewise. * octave-link.cc (octave_link::do_process_events): Call octave_event::handle_event with the return value from octave_event::perform instead of calling octave_event::accept and octave_event::reject. * octave-event.h (octave_event:handle_event): New function. (octave_event::accept, octave_event::reject): Delete.

author	John W. Eaton <jwe@octave.org>
date	Fri, 14 Sep 2012 11:14:27 -0400
parents	f9ee3befcd6b
children	7f423c6111c6

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
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	3 Copyright (C) 2011-2012 Jacob Dawid
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	4
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7 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	8 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	9 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	10 option) any later version.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	11
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12 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	13 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	14 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	15 for more details.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	16
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17 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	18 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	19 <http://www.gnu.org/licenses/>.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	20
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21 */
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	22
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	23 #ifdef HAVE_CONFIG_H
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	24 #include <config.h>
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	25 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	26
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	27 #include <QApplication>
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	28 #include <QLabel>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	29 #include <QMenuBar>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	30 #include <QMenu>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	31 #include <QAction>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	32 #include <QSettings>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	33 #include <QStyle>
7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	34 #include <QToolBar>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	35 #include <QDesktopServices>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	36 #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	37 #include <QMessageBox>
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	38 #include <QIcon>
7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	39
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	40 #include "main-window.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	41 #include "file-editor.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	42 #include "settings-dialog.h"
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	43
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	44 main_window::main_window (QWidget *p)
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	45 : QMainWindow (p), octave_event_observer ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	46 {
14599 97cb9286919c Cleaned up code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14588 diff changeset	47 // 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	48 construct ();
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	49 octave_link::launch_octave ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	50 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	51
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	52 main_window::~main_window ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	53 {
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	54 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	55
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	56 void
15388 24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	57 main_window::handle_event (octave_event *e, bool accept)
14721 ec76264adca9 Removed last bits of Qt from octave_link. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	58 {
15388 24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	59 if (accept)
14814 61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	60 {
15388 24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	61 if (dynamic_cast<octave_clear_history_event*> (e))
24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	62 {
24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	63 // After clearing the history, we need to reset the model.
24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	64 _history_dock_widget->reset_model ();
24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	65 }
14814 61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	66 }
15388 24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	67 else
24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	68 {
24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	69 // octave_event::perform failed to process event.
24b5348d38e7 merge event_accepted and event_reject into a single function John W. Eaton <jwe@octave.org> parents: 15387 diff changeset	70 }
14721 ec76264adca9 Removed last bits of Qt from octave_link. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	71 }
ec76264adca9 Removed last bits of Qt from octave_link. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	72
ec76264adca9 Removed last bits of Qt from octave_link. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	73 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	74 main_window::new_file ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	75 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	76 _file_editor->request_new_file ();
14875 3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	77 focus_editor ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	78 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	79
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	80 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	81 main_window::open_file ()
13558 248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	82 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	83 _file_editor->request_open_file ();
14875 3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	84 focus_editor ();
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	85 }
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	86
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	87 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	88 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	89 {
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	90 _file_editor->request_open_file (file_name);
3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	91 focus_editor ();
13558 248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	92 }
248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	93
248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	94 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	95 main_window::report_status_message (const QString& statusMessage)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	96 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	97 _status_bar->showMessage (statusMessage, 1000);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	98 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	99
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	100 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	101 main_window::handle_save_workspace_request ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	102 {
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	103 QString selectedFile =
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	104 QFileDialog::getSaveFileName (this, tr ("Save Workspace"),
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	105 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	106 if (!selectedFile.isEmpty ())
9c0959a1dc7b Not attempint to save workspace when no filename provided. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14814 diff changeset	107 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	108 octave_link::post_event (new octave_save_workspace_event
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	109 (*this, selectedFile.toStdString ()));
14824 9c0959a1dc7b Not attempint to save workspace when no filename provided. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14814 diff changeset	110 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	111 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	112
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	113 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	114 main_window::handle_load_workspace_request ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	115 {
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	116 QString selectedFile =
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	117 QFileDialog::getOpenFileName (this, tr ("Load Workspace"),
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	118 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	119 if (!selectedFile.isEmpty ())
9ea75ea686b5 Allowing nested dock widgets and fixed small bug in loading a workspace. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	120 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	121 octave_link::post_event (new octave_load_workspace_event
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	122 (*this, selectedFile.toStdString ()));
14682 9ea75ea686b5 Allowing nested dock widgets and fixed small bug in loading a workspace. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	123 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	124 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	125
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	126 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	127 main_window::handle_clear_workspace_request ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	128 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	129 octave_link::post_event (new octave_clear_workspace_event (*this));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	130 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	131
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	132 void
14814 61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	133 main_window::handle_clear_history_request()
61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	134 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	135 octave_link::post_event (new octave_clear_history_event (*this));
14814 61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	136 }
61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	137
61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	138 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	139 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	140 {
14996 c2afeeb35f4d Updated qterminal. Jacob Dawid <jacob.dawid@gmail.com> parents: 14890 diff changeset	141 _terminal->sendText (command);
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	142 _terminal->setFocus ();
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	143 }
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	144
c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	145 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	146 main_window::open_bug_tracker_page ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	147 {
15044 b7b1ffc88086 Update urls to Agora and bug tracker Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15041 diff changeset	148 QDesktopServices::openUrl (QUrl ("http://bugs.octave.org"));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	149 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	150
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	151 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	152 main_window::open_agora_page ()
13533 edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	153 {
15044 b7b1ffc88086 Update urls to Agora and bug tracker Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15041 diff changeset	154 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	155 }
edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	156
edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	157 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	158 main_window::open_octave_forge_page ()
13533 edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	159 {
13536 869c62c15e95 Few minor improvements, added advanced settings for file browser. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13534 diff changeset	160 QDesktopServices::openUrl (QUrl ("http://octave.sourceforge.net/"));
13533 edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	161 }
edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	162
edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	163 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	164 main_window::process_settings_dialog_request ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	165 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	166 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	167 int change_settings = settingsDialog->exec ();
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	168 if (change_settings == QDialog::Accepted)
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	169 {
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	170 settingsDialog->write_changed_settings ();
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	171 emit settings_changed ();
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15257 diff changeset	172 }
14586 8e9823066dad Fixed bug with not correctly syncing settings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14308 diff changeset	173 delete settingsDialog;
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	174 }
fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	175
fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	176 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	177 main_window::notice_settings ()
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14586 diff changeset	178 {
14695 55f88d2236b6 Added copy and paste context menu for the terminal. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14694 diff changeset	179 // Set terminal font:
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	180 QSettings *settings = resource_manager::get_settings ();
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	181
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	182 // FIXME -- what should happen if settings is 0?
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	183
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	184 QFont term_font = QFont();
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	185 term_font.setFamily(settings->value("terminal/fontName").toString());
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	186 term_font.setPointSize(settings->value("terminal/fontSize").toInt ());
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	187 _terminal->setTerminalFont (term_font);
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	188
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	189 QString cursorType = settings->value ("terminal/cursorType").toString ();
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	190 bool cursorBlinking = settings->value ("terminal/cursorBlinking").toBool ();
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	191 if (cursorType == "ibeam")
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	192 _terminal->setCursorType(QTerminalInterface::IBeamCursor, cursorBlinking);
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	193 else if (cursorType == "block")
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	194 _terminal->setCursorType(QTerminalInterface::BlockCursor, cursorBlinking);
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	195 else if (cursorType == "underline")
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	196 _terminal->setCursorType(QTerminalInterface::UnderlineCursor,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	197 cursorBlinking);
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14996 diff changeset	198
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	199 resource_manager::update_network_settings ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	200 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	201
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	202 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	203 main_window::prepare_for_quit ()
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	204 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	205 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	206 }
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	207
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	208 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	209 main_window::reset_windows ()
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	210 {
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	211 // TODO: Implement.
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	212 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	213
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	214 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	215 main_window::current_working_directory_has_changed (const QString& directory)
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	216 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	217 if (_current_directory_combo_box->count () > 31)
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	218 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	219 _current_directory_combo_box->removeItem (0);
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	220 }
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	221 _current_directory_combo_box->addItem (directory);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	222 int index = _current_directory_combo_box->findText (directory);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	223 _current_directory_combo_box->setCurrentIndex (index);
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	224
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	225 _files_dock_widget->set_current_directory (directory);
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	226 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	227
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	228 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	229 main_window::change_current_working_directory ()
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	230 {
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	231 QString selectedDirectory =
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	232 QFileDialog::getExistingDirectory(this, tr ("Set working direcotry"));
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	233
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	234 if (!selectedDirectory.isEmpty ())
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	235 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	236 octave_link::post_event (new octave_change_directory_event
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	237 (*this, selectedDirectory.toStdString ()));
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	238 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	239 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	240
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	241 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	242 main_window::set_current_working_directory (const QString& directory)
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	243 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	244 octave_link::post_event (new octave_change_directory_event
eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	245 (*this, directory.toStdString ()));
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	246 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	247
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	248 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	249 main_window::current_working_directory_up ()
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	250 {
14875 3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	251 set_current_working_directory ("..");
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	252 }
7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	253
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	254 void
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	255 main_window::focus_command_window ()
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	256 {
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	257 if (!_terminal_dock_widget->isVisible ())
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	258 {
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	259 _terminal_dock_widget->setVisible (true);
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	260 }
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	261
14813 2de56de8953a * main-window: Fixed bug with command window not coming up on Ctrl+0. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	262 _terminal_dock_widget->setFocus ();
2de56de8953a * main-window: Fixed bug with command window not coming up on Ctrl+0. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	263 _terminal_dock_widget->activateWindow ();
2de56de8953a * main-window: Fixed bug with command window not coming up on Ctrl+0. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	264 _terminal_dock_widget->raise ();
2de56de8953a * main-window: Fixed bug with command window not coming up on Ctrl+0. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	265
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	266 _terminal->setFocus ();
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	267 _terminal->activateWindow ();
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	268 _terminal->raise ();
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	269 }
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	270
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	271 void
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	272 main_window::focus_command_history ()
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	273 {
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	274 if (!_history_dock_widget->isVisible ())
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	275 {
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	276 _history_dock_widget->setVisible (true);
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	277 }
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	278
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	279 _history_dock_widget->setFocus ();
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	280 _history_dock_widget->activateWindow ();
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	281 _history_dock_widget->raise ();
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	282 }
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	283
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	284 void
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	285 main_window::focus_current_directory ()
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	286 {
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	287 if (!_files_dock_widget->isVisible ())
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	288 {
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	289 _files_dock_widget->setVisible (true);
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	290 }
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	291
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	292 _files_dock_widget->setFocus ();
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	293 _files_dock_widget->activateWindow ();
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	294 _files_dock_widget->raise ();
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	295 }
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	296
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	297 void
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	298 main_window::focus_workspace ()
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	299 {
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	300 if (!_workspace_view->isVisible ())
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	301 {
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	302 _workspace_view->setVisible (true);
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	303 }
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	304
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	305 _workspace_view->setFocus ();
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	306 _workspace_view->activateWindow ();
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	307 _workspace_view->raise ();
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	308 }
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	309
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	310 void
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	311 main_window::focus_editor ()
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	312 {
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	313 if (!_file_editor->isVisible ())
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	314 {
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	315 _file_editor->setVisible (true);
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	316 }
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	317
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	318 _file_editor->setFocus ();
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	319 _file_editor->activateWindow ();
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	320 _file_editor->raise ();
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	321 }
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	322
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	323 void
15055 48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	324 main_window::focus_documentation ()
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	325 {
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	326 if (!_documentation_dock_widget->isVisible ())
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	327 {
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	328 _documentation_dock_widget->setVisible (true);
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	329 }
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	330
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	331 _documentation_dock_widget->setFocus ();
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	332 _documentation_dock_widget->activateWindow ();
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	333 _documentation_dock_widget->raise ();
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	334 }
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	335
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	336 void
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	337 main_window::handle_entered_debug_mode ()
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	338 {
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	339 setWindowTitle ("Octave (Debugging)");
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	340 _debug_continue->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	341 _debug_step_into->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	342 _debug_step_over->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	343 _debug_step_out->setEnabled (true);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	344 _debug_quit->setEnabled (true);
14830 41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14824 diff changeset	345 _file_editor->handle_entered_debug_mode ();
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	346 }
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	347
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	348 void
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	349 main_window::handle_quit_debug_mode ()
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	350 {
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	351 setWindowTitle ("Octave");
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	352 _debug_continue->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	353 _debug_step_into->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	354 _debug_step_over->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	355 _debug_step_out->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	356 _debug_quit->setEnabled (false);
14830 41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14824 diff changeset	357 _file_editor->handle_quit_debug_mode ();
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	358 }
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	359
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	360 void
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	361 main_window::debug_continue ()
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	362 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	363 octave_link::post_event (new octave_debug_continue_event (*this));
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	364 }
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	365
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	366 void
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	367 main_window::debug_step_into ()
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	368 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	369 octave_link::post_event (new octave_debug_step_into_event (*this));
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	370 }
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	371
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	372 void
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	373 main_window::debug_step_over ()
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	374 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	375 octave_link::post_event (new octave_debug_step_over_event (*this));
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	376 }
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	377
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	378 void
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	379 main_window::debug_step_out ()
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	380 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	381 octave_link::post_event (new octave_debug_step_out_event (*this));
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	382 }
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	383
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	384 void
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	385 main_window::debug_quit ()
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	386 {
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	387 octave_link::post_event (new octave_debug_quit_event (*this));
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	388 }
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	389
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	390 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	391 main_window::show_about_octave ()
13548 5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	392 {
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	393 QString message =
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	394 "GNU Octave\n"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	395 "Copyright (C) 2009 John W. Eaton and others.\n"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	396 "This is free software; see the source code for copying conditions."
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	397 "There is ABSOLUTELY NO WARRANTY; not even for MERCHANTABILITY or"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	398 "FITNESS FOR A PARTICULAR PURPOSE. For details, type `warranty'.\n"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	399 "\n"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	400 "Additional information about Octave is available at http://www.octave.org.\n"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	401 "\n"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	402 "Please contribute if you find this software useful."
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	403 "For more information, visit http://www.octave.org/help-wanted.html\n"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	404 "\n"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	405 "Report bugs to <bug@octave.org> (but first, please read"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	406 "http://www.octave.org/bugs.html to learn how to write a helpful report).\n"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	407 "\n"
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	408 "For information about changes from previous versions, type `news'.\n";
13548 5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	409
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	410 QMessageBox::about (this, tr ("About Octave"), message);
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	411 }
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	412
5c2ea445e100 Added about boxes. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13546 diff changeset	413 void
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	414 main_window::closeEvent (QCloseEvent *e)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	415 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	416 e->ignore ();
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	417 octave_link::post_event (new octave_exit_event (*this));
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	418 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	419
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	420 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	421 main_window::read_settings ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	422 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	423 QSettings *settings = resource_manager::get_settings ();
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	424
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	425 // FIXME -- what should happen if settings is 0?
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	426
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	427 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	428 settings->beginGroup ("DockWidgets");
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	429 // restoring the geometry of all widgets
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	430 foreach (QObject *obj, children ())
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	431 {
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	432 QString name = obj->objectName ();
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	433 if (obj->isWidgetType () && ! name.isEmpty ())
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	434 {
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	435 QWidget widget = qobject_cast<QWidget > (obj);
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	436 QVariant val = settings->value (name);
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	437 widget->restoreGeometry (val.toByteArray ());
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	438 }
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	439 }
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	440 settings->endGroup();
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	441 restoreGeometry (settings->value ("MainWindow/geometry").toByteArray ());
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	442 emit settings_changed ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	443 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	444
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	445 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	446 main_window::write_settings ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	447 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	448 QSettings *settings = resource_manager::get_settings ();
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	449
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	450 // FIXME -- what should happen if settings is 0?
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15106 diff changeset	451
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	452 settings->setValue ("MainWindow/geometry", saveGeometry ());
a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	453 settings->setValue ("MainWindow/windowState", saveState ());
15348 450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	454 settings->beginGroup ("DockWidgets");
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	455 // 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	456 foreach (QObject *obj, children())
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	457 {
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	458 QString name = obj->objectName ();
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	459 if (obj->isWidgetType () && ! name.isEmpty ())
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	460 {
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	461 QWidget widget = qobject_cast<QWidget >(obj);
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	462 settings->setValue (name, widget->saveGeometry ());
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	463 }
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	464 }
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	465
450fedd44176 correctly restore the size of all dock-widgets when maximized Torsten <ttl@justmail.de> parents: 15300 diff changeset	466 settings->endGroup();
14694 ea11c9d8aa47 Calling qApp->quit () via QMetaObject::invoke caused a segfault, now exits cleanly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14693 diff changeset	467 settings->sync ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	468 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	469
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	470 void
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	471 main_window::construct ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	472 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	473 _closing = false; // flag for editor files when closed
15081 d02b229ce693 Cleaned up icon positions. Removed icon loading from resource manager. Jacob Dawid <jacob.dawid@gmail.com> parents: 15055 diff changeset	474 setWindowIcon (QIcon(":/actions/icons/logo.png"));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	475
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	476 // Setup dockable widgets and the status bar.
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	477 _workspace_view = new workspace_view (this);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	478 _workspace_view->setStatusTip (tr ("View the variables in the active workspace."));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	479 _history_dock_widget = new history_dock_widget (this);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	480 _history_dock_widget->setStatusTip (tr ("Browse and search the command history."));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	481 _files_dock_widget = new files_dock_widget (this);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	482 _files_dock_widget->setStatusTip (tr ("Browse your files."));
15055 48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	483 _documentation_dock_widget= new documentation_dock_widget (this);
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	484 _documentation_dock_widget->setStatusTip (tr ("See the documentation for help."));
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	485 _status_bar = new QStatusBar (this);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	486
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	487 _current_directory_combo_box = new QComboBox (this);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	488 _current_directory_combo_box->setFixedWidth (300);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	489 _current_directory_combo_box->setEditable (true);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	490 _current_directory_combo_box->setInsertPolicy (QComboBox::InsertAtTop);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	491 _current_directory_combo_box->setMaxVisibleItems (14);
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	492
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	493 _current_directory_tool_button = new QToolButton (this);
14727 f34984656658 Added crystal project icons. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14726 diff changeset	494 _current_directory_tool_button->setIcon (QIcon(":/actions/icons/search.png"));
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	495
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	496 _current_directory_up_tool_button = new QToolButton (this);
14727 f34984656658 Added crystal project icons. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14726 diff changeset	497 _current_directory_up_tool_button->setIcon (QIcon(":/actions/icons/up.png"));
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	498
13550 cd66481d55b0 Added close button to file editor, assorted subwindows after importance. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13549 diff changeset	499 // Octave Terminal subwindow.
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	500 _terminal = new QTerminal (this);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	501 _terminal->setObjectName ("OctaveTerminal");
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	502 _terminal->setFocusPolicy (Qt::StrongFocus);
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	503 _terminal_dock_widget = new terminal_dock_widget (_terminal, this);
15081 d02b229ce693 Cleaned up icon positions. Removed icon loading from resource manager. Jacob Dawid <jacob.dawid@gmail.com> parents: 15055 diff changeset	504 _terminal_dock_widget->setWindowIcon (QIcon(":/actions/icons/terminal.png"));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	505
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	506 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	507 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	508 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	509 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	510 dummyWidget->hide ();
79c9a6d06590 Wrote SymbolInformation struct and refactored code that updates the symbol table. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14695 diff changeset	511 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	512
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	513 _file_editor = new file_editor (_terminal, this);
13558 248b897d9f36 editor: custom lexer, syntax highlighting, auto completion ttl <ttl@justmail.de> parents: 13550 diff changeset	514
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	515 QMenu *file_menu = menuBar ()->addMenu (tr ("&File"));
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	516
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	517 QMenu *new_menu = file_menu->addMenu(tr ("New"));
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	518
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	519 QAction *new_script_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	520 = new_menu->addAction (QIcon(":/actions/icons/filenew.png"), tr ("Script"));
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	521 new_script_action->setShortcut (Qt::ControlModifier + Qt::Key_N);
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	522
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	523 QAction *new_function_action = new_menu->addAction (tr ("Function"));
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	524 new_function_action->setEnabled (false); // TODO: Make this work.
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	525 QAction *new_class_action = new_menu->addAction (tr ("Class"));
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	526 new_class_action->setEnabled (false); // TODO: Make this work.
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	527 QAction *new_enumeration_action = new_menu->addAction (tr ("Enumeration"));
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	528 new_enumeration_action->setEnabled (false); // TODO: Make this work.
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	529 QAction *new_figure_action = new_menu->addAction (tr ("Figure"));
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	530 new_figure_action->setEnabled (false); // TODO: Make this work.
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	531 QAction *new_variable_action = new_menu->addAction (tr ("Variable"));
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	532 new_variable_action->setEnabled (false); // TODO: Make this work.
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	533 QAction *new_model_action = new_menu->addAction (tr ("Model"));
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	534 new_model_action->setEnabled (false); // TODO: Make this work.
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	535 QAction *new_gui_action = new_menu->addAction (tr ("GUI"));
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	536 new_gui_action->setEnabled (false); // TODO: Make this work.
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	537
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	538 QAction *open_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	539 = file_menu->addAction (QIcon(":/actions/icons/fileopen.png"), tr ("Open..."));
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	540 open_action->setShortcut (Qt::ControlModifier + Qt::Key_O);
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	541
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	542 QAction *close_command_window_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	543 = file_menu->addAction (tr ("Close Command Window"));
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	544 close_command_window_action->setShortcut (Qt::ControlModifier + Qt::Key_W);
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	545 close_command_window_action->setEnabled (false); // TODO: Make this work.
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	546
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	547 file_menu->addSeparator ();
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	548 QAction *import_data_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	549 = file_menu->addAction (tr ("Import Data..."));
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	550 import_data_action->setEnabled (false); // TODO: Make this work.
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	551
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	552 QAction *save_workspace_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	553 = file_menu->addAction (tr ("Save Workspace..."));
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	554 save_workspace_action->setShortcut (Qt::ControlModifier + Qt::Key_S);
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	555 file_menu->addSeparator ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	556
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	557 QAction *preferences_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	558 = file_menu->addAction (QIcon(":/actions/icons/configure.png"),
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	559 tr ("Preferences..."));
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	560 file_menu->addSeparator ();
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	561 QAction *page_setup_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	562 = file_menu->addAction (tr ("Page Setup..."));
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	563 page_setup_action->setEnabled (false); // TODO: Make this work.
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	564 QAction *print_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	565 = file_menu->addAction (tr ("Print"));
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	566 print_action->setShortcut (Qt::ControlModifier + Qt::Key_P);
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	567 print_action->setEnabled (false); // TODO: Make this work.
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	568 QAction *print_selection_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	569 = file_menu->addAction (tr ("Print Selection..."));
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	570 print_selection_action->setEnabled (false); // TODO: Make this work.
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	571
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	572 file_menu->addSeparator ();
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	573 QAction *exit_action = file_menu->addAction (tr ("Exit"));
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	574 exit_action->setShortcut (Qt::ControlModifier + Qt::Key_Q);
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	575
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	576
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	577 QMenu *edit_menu = menuBar ()->addMenu (tr ("&Edit"));
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	578 QAction *undo_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	579 = edit_menu->addAction (QIcon(":/actions/icons/undo.png"), tr ("Undo"));
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	580 undo_action->setShortcut (QKeySequence::Undo);
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	581
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	582 QAction *redo_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	583 = edit_menu->addAction (QIcon(":/actions/icons/redo.png"), tr ("Redo"));
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	584 redo_action->setShortcut (QKeySequence::Redo);
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	585 edit_menu->addSeparator ();
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	586
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	587 QAction *cut_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	588 = edit_menu->addAction (QIcon(":/actions/icons/editcut.png"), tr ("Cut"));
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	589 cut_action->setShortcut (Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_X);
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	590
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	591 QAction *copy_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	592 = edit_menu->addAction (QIcon(":/actions/icons/editcopy.png"), tr ("Copy"));
14757 ace446cda345 Changed copy-paste shortcuts from Ctrl-C/V to Ctrl-Shift-C/V, so that the Ctrl-C signal won't be catched by the terminal anymore. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14754 diff changeset	593 copy_action->setShortcut (Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_C);
13532 fd87d6f7e185 Dock windows are now selectable form the menus. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13531 diff changeset	594
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	595 QAction *paste_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	596 = edit_menu->addAction (QIcon(":/actions/icons/editpaste.png"), tr ("Paste"));
14757 ace446cda345 Changed copy-paste shortcuts from Ctrl-C/V to Ctrl-Shift-C/V, so that the Ctrl-C signal won't be catched by the terminal anymore. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14754 diff changeset	597 paste_action->setShortcut (Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_V);
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	598
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	599 QAction *paste_to_workspace_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	600 = edit_menu->addAction (tr ("Paste To Workspace..."));
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	601 paste_to_workspace_action->setEnabled (false); // TODO: Make this work.
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	602 edit_menu->addSeparator ();
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	603
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	604 QAction *select_all_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	605 = edit_menu->addAction (tr ("Select All"));
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	606 select_all_action->setEnabled (false); // TODO: Make this work.
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	607 QAction *delete_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	608 = edit_menu->addAction (tr ("Delete"));
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	609 delete_action->setShortcut (Qt::Key_Delete);
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	610 delete_action->setEnabled (false); // TODO: Make this work.
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	611 edit_menu->addSeparator ();
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	612
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	613 QAction *find_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	614 = edit_menu->addAction (tr ("Find..."));
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	615 find_action->setEnabled (false); // TODO: Make this work.
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	616 QAction *find_files_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	617 = edit_menu->addAction (tr ("Find Files..."));
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	618 find_files_action->setShortcut (Qt::ControlModifier + Qt::ShiftModifier
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	619 + Qt::Key_F);
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	620 find_files_action->setEnabled (false); // TODO: Make this work.
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	621 edit_menu->addSeparator ();
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	622
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	623 QAction *clear_command_window_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	624 = edit_menu->addAction (tr ("Clear Command Window"));
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	625 clear_command_window_action->setEnabled (false); // TODO: Make this work.
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	626 QAction *clear_command_history
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	627 = edit_menu->addAction(tr ("Clear Command History"));
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	628 QAction * clear_workspace_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	629 = edit_menu->addAction (tr ("Clear Workspace"));
13532 fd87d6f7e185 Dock windows are now selectable form the menus. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13531 diff changeset	630
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	631 _debug_menu = menuBar ()->addMenu (tr ("De&bug"));
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	632
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15081 diff changeset	633 _debug_step_over = _debug_menu->addAction (QIcon (":/actions/icons/db_step.png"), tr ("Step"));
14831 cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	634 _debug_step_over->setEnabled (false);
cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	635 _file_editor->debug_menu ()->addAction (_debug_step_over);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15081 diff changeset	636 _file_editor->toolbar ()->addAction (_debug_step_over);
14831 cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	637 _debug_step_over->setShortcut (Qt::Key_F10);
cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	638
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15081 diff changeset	639 _debug_step_into = _debug_menu->addAction (QIcon (":/actions/icons/db_step_in.png"), tr ("Step in"));
14831 cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	640 _debug_step_into->setEnabled (false);
cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	641 _file_editor->debug_menu ()->addAction (_debug_step_into);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15081 diff changeset	642 _file_editor->toolbar ()->addAction (_debug_step_into);
14831 cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	643 _debug_step_into->setShortcut (Qt::Key_F11);
cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	644
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15081 diff changeset	645 _debug_step_out = _debug_menu->addAction (QIcon (":/actions/icons/db_step_out.png"), tr ("Step out"));
14831 cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	646 _debug_step_out->setEnabled (false);
cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	647 _file_editor->debug_menu ()->addAction (_debug_step_out);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15081 diff changeset	648 _file_editor->toolbar ()->addAction (_debug_step_out);
14831 cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	649 _debug_step_out->setShortcut (Qt::ShiftModifier + Qt::Key_F11);
cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	650
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15081 diff changeset	651 _debug_continue = _debug_menu->addAction (QIcon (":/actions/icons/db_cont.png"), tr ("Continue"));
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	652 _debug_continue->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	653 _file_editor->debug_menu ()->addAction (_debug_continue);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15081 diff changeset	654 _file_editor->toolbar ()->addAction (_debug_continue);
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	655 _debug_continue->setShortcut (Qt::Key_F5);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	656
14831 cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	657 _debug_menu->addSeparator ();
cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	658 _file_editor->debug_menu ()->addSeparator ();
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	659
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15081 diff changeset	660 _debug_quit = _debug_menu->addAction (QIcon (":/actions/icons/db_stop.png"), tr ("Exit Debug Mode"));
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	661 _debug_quit->setEnabled (false);
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	662 _file_editor->debug_menu ()->addAction (_debug_quit);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15081 diff changeset	663 _file_editor->toolbar ()->addAction (_debug_quit);
14831 cff522bf80c5 Fixed debugging shortcuts and debug menu item order. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14830 diff changeset	664 _debug_quit->setShortcut (Qt::ShiftModifier + Qt::Key_F5);
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	665
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	666 //QMenu *parallelMenu = menuBar ()->addMenu (tr ("&Parallel"));
7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	667
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	668 QMenu * desktop_menu = menuBar ()->addMenu (tr ("&Desktop"));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	669 QAction * load_workspace_action = desktop_menu->addAction (tr ("Load workspace"));
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	670
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	671
7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	672 // Window menu
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	673 QMenu * window_menu = menuBar ()->addMenu (tr ("&Window"));
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	674 QAction * show_command_window_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	675 = window_menu->addAction (tr ("Show Command Window"));
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	676 show_command_window_action->setCheckable (true);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	677 show_command_window_action->setShortcut (Qt::ControlModifier
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	678 + Qt::ShiftModifier + Qt::Key_0);
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	679
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	680 QAction * show_history_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	681 = window_menu->addAction (tr ("Show Command History"));
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	682 show_history_action->setCheckable (true);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	683 show_history_action->setShortcut (Qt::ControlModifier
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	684 + Qt::ShiftModifier + Qt::Key_1);
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	685 QAction * show_file_browser_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	686 = window_menu->addAction (tr ("Show Current Directory"));
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	687 show_file_browser_action->setCheckable (true);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	688 show_file_browser_action->setShortcut (Qt::ControlModifier
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	689 + Qt::ShiftModifier + Qt::Key_2);
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	690
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	691 QAction * show_workspace_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	692 = window_menu->addAction (tr ("Show Workspace"));
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	693 show_workspace_action->setCheckable (true);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	694 show_workspace_action->setShortcut (Qt::ControlModifier
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	695 + Qt::ShiftModifier + Qt::Key_3);
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	696
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	697 QAction * show_editor_action = window_menu->addAction (tr ("Show Editor"));
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	698 show_editor_action->setCheckable (true);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	699 show_editor_action->setShortcut (Qt::ControlModifier + Qt::ShiftModifier
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	700 + Qt::Key_4);
15055 48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	701
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	702 QAction * show_documentation_action = window_menu->addAction (tr ("Show Documentation"));
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	703 show_documentation_action->setCheckable (true);
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	704 show_documentation_action->setShortcut (Qt::ControlModifier + Qt::ShiftModifier
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	705 + Qt::Key_5);
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	706 window_menu->addSeparator ();
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	707
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	708 QAction * command_window_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	709 = window_menu->addAction (tr ("Command Window"));
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	710 command_window_action->setShortcut (Qt::ControlModifier + Qt::Key_0);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	711
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	712 QAction * history_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	713 = window_menu->addAction (tr ("Command History"));
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	714 history_action->setShortcut (Qt::ControlModifier + Qt::Key_1);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	715
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	716 QAction * file_browser_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	717 = window_menu->addAction (tr ("Current Directory"));
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	718 file_browser_action->setShortcut (Qt::ControlModifier + Qt::Key_2);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	719
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	720 QAction * workspace_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	721 = window_menu->addAction (tr ("Workspace"));
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	722 workspace_action->setShortcut (Qt::ControlModifier + Qt::Key_3);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	723
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	724 QAction * editor_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	725 = window_menu->addAction (tr ("Editor"));
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	726 editor_action->setShortcut (Qt::ControlModifier + Qt::Key_4);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	727
15055 48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	728 QAction * documentation_action
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	729 = window_menu->addAction (tr ("Documentation"));
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	730 documentation_action->setShortcut (Qt::ControlModifier + Qt::Key_5);
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	731
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	732 window_menu->addSeparator ();
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	733 QAction * reset_windows_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	734 = window_menu->addAction (tr ("Reset Windows"));
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	735 reset_windows_action->setEnabled (false); // TODO: Make this work.
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	736
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	737 // Help menu
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	738 QMenu * help_menu = menuBar ()->addMenu (tr ("&Help"));
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	739 QAction * report_bug_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	740 = help_menu->addAction (tr ("Report Bug"));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	741 QAction * agora_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	742 = help_menu->addAction (tr ("Visit Agora"));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	743 QAction * octave_forge_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	744 = help_menu->addAction (tr ("Visit Octave Forge"));
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	745 help_menu->addSeparator ();
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	746
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	747 QAction * about_octave_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	748 = help_menu->addAction (tr ("About Octave"));
14670 7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	749
7fbea449737d Restructured menus, added toolbar and current directory line edit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	750 // Toolbars
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	751 QToolBar *main_tool_bar = addToolBar ("Main");
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	752 main_tool_bar->addAction (new_script_action);
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	753 main_tool_bar->addAction (open_action);
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	754 main_tool_bar->addSeparator ();
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	755 main_tool_bar->addAction (cut_action);
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	756 main_tool_bar->addAction (copy_action);
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	757 main_tool_bar->addAction (paste_action);
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	758 main_tool_bar->addAction (undo_action);
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	759 main_tool_bar->addAction (redo_action);
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	760 main_tool_bar->addSeparator ();
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	761 main_tool_bar->addWidget (new QLabel (tr ("Current Directory:")));
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	762 main_tool_bar->addWidget (_current_directory_combo_box);
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	763 main_tool_bar->addWidget (_current_directory_tool_button);
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	764 main_tool_bar->addWidget (_current_directory_up_tool_button);
13533 edaf8e72070e Added urls for Agora and Octave Forge in Community Window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13532 diff changeset	765
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	766 connect (qApp, SIGNAL (aboutToQuit ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	767 this, SLOT (prepare_for_quit ()));
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	768 connect (preferences_action, SIGNAL (triggered ()),
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	769 this, SLOT (process_settings_dialog_request ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	770 connect (exit_action, SIGNAL (triggered ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	771 this, SLOT (close ()));
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	772 connect (new_script_action, SIGNAL (triggered ()),
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	773 this, SLOT (new_file ()));
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15044 diff changeset	774 connect (open_action, SIGNAL (triggered ()),
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	775 this, SLOT (open_file ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	776 connect (report_bug_action, SIGNAL (triggered ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	777 this, SLOT (open_bug_tracker_page ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	778 connect (agora_action, SIGNAL (triggered ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	779 this, SLOT (open_agora_page ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	780 connect (octave_forge_action, SIGNAL (triggered ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	781 this, SLOT (open_octave_forge_page ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	782 connect (about_octave_action, SIGNAL (triggered ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	783 this, SLOT (show_about_octave ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	784 connect (show_command_window_action, SIGNAL (toggled (bool)),
14716 572a707408b2 Patched qterminal for MacOS. Changed Qt3 compatibility slot to Qt4 slot. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14714 diff changeset	785 _terminal_dock_widget, SLOT (setVisible (bool)));
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	786 connect (_terminal_dock_widget, SIGNAL (active_changed (bool)),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	787 show_command_window_action, SLOT (setChecked (bool)));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	788 connect (show_workspace_action, SIGNAL (toggled (bool)),
14716 572a707408b2 Patched qterminal for MacOS. Changed Qt3 compatibility slot to Qt4 slot. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14714 diff changeset	789 _workspace_view, SLOT (setVisible (bool)));
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	790 connect (_workspace_view, SIGNAL (active_changed (bool)),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	791 show_workspace_action, SLOT (setChecked (bool)));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	792 connect (show_history_action, SIGNAL (toggled (bool)),
14716 572a707408b2 Patched qterminal for MacOS. Changed Qt3 compatibility slot to Qt4 slot. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14714 diff changeset	793 _history_dock_widget, SLOT (setVisible (bool)));
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	794 connect (_history_dock_widget, SIGNAL (active_changed (bool)),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	795 show_history_action, SLOT (setChecked (bool)));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	796 connect (show_file_browser_action, SIGNAL (toggled (bool)),
14716 572a707408b2 Patched qterminal for MacOS. Changed Qt3 compatibility slot to Qt4 slot. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14714 diff changeset	797 _files_dock_widget, SLOT (setVisible (bool)));
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	798 connect (_files_dock_widget, SIGNAL (active_changed (bool)),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	799 show_file_browser_action, SLOT (setChecked (bool)));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	800 connect (show_editor_action, SIGNAL (toggled (bool)),
14716 572a707408b2 Patched qterminal for MacOS. Changed Qt3 compatibility slot to Qt4 slot. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14714 diff changeset	801 _file_editor, SLOT (setVisible (bool)));
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	802 connect (_file_editor, SIGNAL (active_changed (bool)),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	803 show_editor_action, SLOT (setChecked (bool)));
15055 48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	804 connect (show_documentation_action, SIGNAL (toggled (bool)),
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	805 _documentation_dock_widget, SLOT (setVisible (bool)));
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	806 connect (_documentation_dock_widget, SIGNAL (active_changed (bool)),
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	807 show_documentation_action, SLOT (setChecked (bool)));
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	808
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	809 connect (command_window_action, SIGNAL (triggered ()),
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	810 this, SLOT (focus_command_window ()));
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	811 connect (workspace_action, SIGNAL (triggered ()),
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	812 this, SLOT (focus_workspace ()));
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	813 connect (history_action, SIGNAL (triggered ()),
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	814 this, SLOT (focus_command_history ()));
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	815 connect (file_browser_action, SIGNAL (triggered ()),
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	816 this, SLOT (focus_current_directory ()));
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	817 connect (editor_action, SIGNAL (triggered ()),
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	818 this, SLOT (focus_editor ()));
15055 48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	819 connect (documentation_action, SIGNAL (triggered ()),
48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	820 this, SLOT (focus_documentation ()));
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	821
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	822 connect (reset_windows_action, SIGNAL (triggered ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	823 this, SLOT (reset_windows ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	824 connect (this, SIGNAL (settings_changed ()),
15365 b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15348 diff changeset	825 _file_editor, SLOT (notice_settings ()));
b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15348 diff changeset	826 connect (this, SIGNAL (settings_changed ()),
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	827 _files_dock_widget, SLOT (notice_settings ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	828 connect (this, SIGNAL (settings_changed ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	829 this, SLOT (notice_settings ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	830 connect (_files_dock_widget, SIGNAL (open_file (QString)),
14875 3fd857c284fe Editor now gets focussed when opening a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14831 diff changeset	831 this, SLOT (open_file (QString)));
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	832 connect (_files_dock_widget, SIGNAL (displayed_directory_changed(QString)),
625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	833 this, SLOT (set_current_working_directory(QString)));
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	834 connect (_history_dock_widget, SIGNAL (information (QString)),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	835 this, SLOT (report_status_message (QString)));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	836 connect (_history_dock_widget, SIGNAL (command_double_clicked (QString)),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	837 this, SLOT (handle_command_double_clicked (QString)));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	838 connect (save_workspace_action, SIGNAL (triggered ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	839 this, SLOT (handle_save_workspace_request ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	840 connect (load_workspace_action, SIGNAL (triggered ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	841 this, SLOT (handle_load_workspace_request ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	842 connect (clear_workspace_action, SIGNAL (triggered ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	843 this, SLOT (handle_clear_workspace_request ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	844 connect (_current_directory_tool_button, SIGNAL (clicked ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	845 this, SLOT (change_current_working_directory ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	846 connect (_current_directory_up_tool_button, SIGNAL (clicked ()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	847 this, SLOT (current_working_directory_up()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	848 connect (copy_action, SIGNAL (triggered()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	849 _terminal, SLOT (copyClipboard ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	850 connect (paste_action, SIGNAL (triggered()),
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	851 _terminal, SLOT (pasteClipboard ()));
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	852 connect (_current_directory_combo_box, SIGNAL (activated (QString)),
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	853 this, SLOT (set_current_working_directory (QString)));
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	854 connect (_debug_continue, SIGNAL (triggered ()),
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	855 this, SLOT (debug_continue ()));
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	856 connect (_debug_step_into, SIGNAL (triggered ()),
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	857 this, SLOT (debug_step_into ()));
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	858 connect (_debug_step_over, SIGNAL (triggered ()),
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	859 this, SLOT (debug_step_over ()));
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	860 connect (_debug_step_out, SIGNAL (triggered ()),
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	861 this, SLOT (debug_step_out ()));
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14784 diff changeset	862 connect (_debug_quit, SIGNAL (triggered ()),
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	863 this, SLOT (debug_quit ()));
14700 7623bece76df Implemented logic for current directory bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14698 diff changeset	864
14814 61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	865 connect (clear_command_history, SIGNAL (triggered ()),
61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	866 this, SLOT (handle_clear_history_request ()));
61c80e9326a8 Clearing the command history works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14813 diff changeset	867
14601 772ce0204b3f Removed version number and "Octave GUI"-labelling. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14599 diff changeset	868 setWindowTitle ("Octave");
14682 9ea75ea686b5 Allowing nested dock widgets and fixed small bug in loading a workspace. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	869 setDockOptions(QMainWindow::AnimatedDocks \| QMainWindow::AllowNestedDocks \| QMainWindow::AllowTabbedDocks);
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	870 addDockWidget (Qt::LeftDockWidgetArea, _workspace_view);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	871 addDockWidget (Qt::LeftDockWidgetArea, _history_dock_widget);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	872 addDockWidget (Qt::RightDockWidgetArea, _files_dock_widget);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	873 addDockWidget (Qt::RightDockWidgetArea, _file_editor);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	874 addDockWidget (Qt::BottomDockWidgetArea, _terminal_dock_widget);
15055 48ae6a7c69c1 Integrated texinfo browser from QtOctave. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	875 addDockWidget (Qt::RightDockWidgetArea, _documentation_dock_widget);
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	876 setStatusBar (_status_bar);
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	877 read_settings ();
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	878
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	879 _octave_qt_event_listener = new octave_qt_event_listener ();
15371 eec0d1fcba4f use Octave singleton style for octave_link class John W. Eaton <jwe@octave.org> parents: 15368 diff changeset	880 octave_link::register_event_listener (_octave_qt_event_listener);
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	881
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	882 connect (_octave_qt_event_listener,
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	883 SIGNAL (current_directory_has_changed_signal (QString)),
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	884 this,
14803 625be3eb27c5 Current directories now synchronize on top, in the file browser and the cwd in octave. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	885 SLOT (current_working_directory_has_changed (QString)));
14726 e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	886
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	887 connect (_octave_qt_event_listener,
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	888 SIGNAL (entered_debug_mode_signal ()),
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	889 this,
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	890 SLOT(handle_entered_debug_mode ()));
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	891
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	892 connect (_octave_qt_event_listener,
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	893 SIGNAL (quit_debug_mode_signal ()),
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	894 this,
e94a54ee0f46 Added debug events, debug mode detection and fixed compiling error. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14721 diff changeset	895 SLOT (handle_quit_debug_mode ()));
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	896 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	897

Mercurial > hg > octave-lyh

annotate libgui/src/main-window.cc @ 15388:24b5348d38e7