octave-nkf: libgui/src/m-editor/file-editor.cc annotate

annotate libgui/src/m-editor/file-editor.cc @ 16570:d5ae5aa80d42

preserve pending command line input when running commands from GUI actions * QTerminal.h, QTerminal.cc (QTerminal::relay_command): Delete. * file-editor-tab.cc (file_editor_tab::run_file_callback): New argument, bp_info. Save pending command line input and execute command. (file_editor_tab::run_file): Use octave_link to execute file. * main-window.h, main-window.cc (main_window::execute_command_in_terminal): Rename from main_window::handle_command_double_clicked. Post event through octave_link to execute command. (main_window::construct_octave_qt_link): Connect _octave_qt_link::execute_command_in_terminal_signal to main_window::execute_command_in_terminal. (main_window::execute_command_callback): New function. (main_window::relay_command_signal): Delete signal. Remove all uses. * octave-qt-link.h, octave-qt-link.cc (octave_qt_link::do_execute_command_in_terminal): New function. (octave_qt_link::execute_command_in_terminal_signal): New signal. * terminal-dock-widget.h, terminal-dock-widget.cc (terminal_dock_widget::relay_command_signal): Delete signal. Remove all uses. * octave-link.h (octave_link::execute_command_in_terminal, octave_link::do_execute_command_in_terminal): New functions. * cmd-edit.h, cmd-edit.cc (command_editor::pre_input_hook_set): New variable. (gnu_readline::previous_pre_input_hook, command_editor::intial_input): New member variables. (command_editor::restore_pre_input_hook, command_editor::do_get_current_line, command_editor::do_replace_line, command_editor::set_pre_input_hook, gnu_readline::do_get_current_line, gnu_readline::do_replace_line, gnu_readline::set_pre_input_hook, command_editor::set_initial_input, gnu_readline::restore_pre_input_hook, default_command_editor::do_get_current_line, default_command_editor::do_replace_line, command_editor::insert_initial_input, command_editor::pre_input_handler, command_editor::get_current_line, command_editor::replace_line, command_editor::add_pre_input_hook, command_editor::do_insert_initial_input, command_editor::set_pre_input_hook, command_editor::restore_pre_input_hook): New functions. (command_editor::readline): Handle initial input. (command_editor::interrupt): Give argument a default value. * oct-rl-edit.h, oct-rl-edit.c (octave_rl_copy_line, octave_rl_replace_line, octave_rl_set_pre_input_hook, octave_rl_get_pre_input_hook): New functions. (rl_pre_input_hook_fcn_ptr): New typedef.

author	John W. Eaton <jwe@octave.org>
date	Thu, 25 Apr 2013 17:57:55 -0400
parents	662a712b8fd5
children	999400bebe5e

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: 15204 diff changeset	23 #ifdef HAVE_CONFIG_H
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	24 #include <config.h>
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	25 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15204 diff changeset	26
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	27 #ifdef HAVE_QSCINTILLA
7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	28
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	29 #include "file-editor.h"
15356 842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15321 diff changeset	30 #include "resource-manager.h"
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	31 #include <QVBoxLayout>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	32 #include <QApplication>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	33 #include <QFile>
13584 e76a22bfe406 editor: added bookmark feature ttl <ttl@justmail.de> parents: 13566 diff changeset	34 #include <QFont>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	35 #include <QFileDialog>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	36 #include <QMessageBox>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	37 #include <QStyle>
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	38 #include <QTextStream>
16407 4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	39 #include <QProcess>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	40
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	41 #include "octave-link.h"
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	42 #include "utils.h"
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	43
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	44 file_editor::file_editor (QWidget *p)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	45 : file_editor_interface (p)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	46 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	47 // Set current editing directory before construct because loaded
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	48 // files will change ced accordingly.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	49 ced = QDir::currentPath ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	50
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	51 construct ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	52
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	53 setVisible (false);
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
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	56 file_editor::~file_editor (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	57 {
15356 842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15321 diff changeset	58 QSettings *settings = resource_manager::get_settings ();
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	59
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	60 editor_tab_map.clear ();
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	61
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	62 if (settings->value ("editor/restoreSession", true).toBool ())
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	63 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	64 // Have all file editor tabs signal what their file names are.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	65 emit fetab_file_name_query (0);
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	66 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	67 QStringList fetFileNames;
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	68 for (editor_tab_map_const_iterator p = editor_tab_map.begin ();
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	69 p != editor_tab_map.end (); p++)
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	70 fetFileNames.append (p->first);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	71
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	72 settings->setValue ("editor/savedSessionTabs", fetFileNames);
15356 842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15321 diff changeset	73 settings->sync ();
15993 41471c02d51c gui: show menu with recently used editor files also in file menu of main window Torsten <ttl@justmail.de> parents: 15984 diff changeset	74
41471c02d51c gui: show menu with recently used editor files also in file menu of main window Torsten <ttl@justmail.de> parents: 15984 diff changeset	75 if (_mru_file_menu)
41471c02d51c gui: show menu with recently used editor files also in file menu of main window Torsten <ttl@justmail.de> parents: 15984 diff changeset	76 delete _mru_file_menu;
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	77 }
8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	78
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	79 void
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	80 file_editor::focus (void)
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	81 {
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	82 set_focus ();
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	83 }
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	84
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	85 void
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	86 file_editor::handle_visibility (bool visible)
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	87 {
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	88 if (visible && ! isFloating ())
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	89 focus ();
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	90 }
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	91
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	92 void
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	93 file_editor::connect_visibility_changed (void)
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	94 {
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	95 connect (this, SIGNAL (visibilityChanged (bool)),
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	96 this, SLOT (handle_visibility (bool)));
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	97 }
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	98
15980 6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	99 // set focus to editor and its current tab
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	100 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	101 file_editor::set_focus (void)
15980 6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	102 {
15993 41471c02d51c gui: show menu with recently used editor files also in file menu of main window Torsten <ttl@justmail.de> parents: 15984 diff changeset	103 if (!isVisible ())
41471c02d51c gui: show menu with recently used editor files also in file menu of main window Torsten <ttl@justmail.de> parents: 15984 diff changeset	104 setVisible (true);
15980 6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	105 setFocus ();
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	106 activateWindow ();
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	107 raise ();
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	108 QWidget *fileEditorTab = _tab_widget->currentWidget ();
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	109 if (fileEditorTab)
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	110 emit fetab_set_focus (fileEditorTab);
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	111 }
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	112
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	113 QMenu *
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	114 file_editor::debug_menu (void)
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	115 {
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	116 return _debug_menu;
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	117 }
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	118
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	119 QToolBar *
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	120 file_editor::toolbar (void)
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	121 {
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	122 return _tool_bar;
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	123 }
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	124
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	125 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	126 file_editor::handle_enter_debug_mode (void)
14830 41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	127 {
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	128 _run_action->setEnabled (false);
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	129 }
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	130
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	131 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	132 file_editor::handle_exit_debug_mode (void)
14830 41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	133 {
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	134 _run_action->setEnabled (true);
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	135 }
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	136
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	137 void
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16443 diff changeset	138 file_editor::request_new_file (const QString& commands)
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	139 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	140 // New file isn't a file_editor_tab function since the file
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	141 // editor tab has yet to be created and there is no object to
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	142 // pass a signal to. Hence, functionality is here.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	143
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	144 file_editor_tab *fileEditorTab = new file_editor_tab (ced);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	145 if (fileEditorTab)
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	146 {
15982 131d40cd805b gui: cleanup some string constants for translations Torsten <ttl@justmail.de> parents: 15980 diff changeset	147 add_file_editor_tab (fileEditorTab, ""); // new tab with empty title
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16443 diff changeset	148 fileEditorTab->new_file (commands); // title is updated here
15993 41471c02d51c gui: show menu with recently used editor files also in file menu of main window Torsten <ttl@justmail.de> parents: 15984 diff changeset	149 set_focus (); // focus editor and new tab
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	150 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	151 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	152
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	153 void
16566 662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	154 file_editor::request_new_script (const QString& commands)
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	155 {
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	156 request_new_file (commands);
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	157 }
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	158
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	159 void
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	160 file_editor::request_new_function (const QString& commands)
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	161 {
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	162 QString text = commands;
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	163
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	164 if (text.isEmpty ())
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	165 text = "## Copyright (C)\n"
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	166 "\n"
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	167 "## -- texinfo --\n"
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	168 "## @deftypefn {Function File} {[outputs] =} unamed_function (inputs)\n"
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	169 "## @end deftypefn\n"
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	170 "\n"
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	171 "function [outputs] = unnamed_function (inputs)\n"
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	172 "\n"
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	173 "endfunction\n";
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	174
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	175 request_new_file (text);
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	176 }
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	177
662a712b8fd5 partial menu bar cleanup John W. Eaton <jwe@octave.org> parents: 16560 diff changeset	178 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	179 file_editor::request_open_file (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	180 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	181 // Open file isn't a file_editor_tab function since the file
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	182 // editor tab has yet to be created and there is no object to
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	183 // pass a signal to. Hence, functionality is here.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	184
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	185 // Create a NonModal message.
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	186 QFileDialog *fileDialog = new QFileDialog (this);
16560 ebec000cbfc5 gui: fix editor file name filters to allow all files Mike Miller <mtmiller@ieee.org> parents: 16558 diff changeset	187 fileDialog->setNameFilter (tr ("Octave Files (.m);;All Files ()"));
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	188 fileDialog->setAcceptMode (QFileDialog::AcceptOpen);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	189 fileDialog->setViewMode (QFileDialog::Detail);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	190 fileDialog->setDirectory (ced);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	191
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	192 connect (fileDialog, SIGNAL (fileSelected (const QString&)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	193 this, SLOT (request_open_file (const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	194
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	195 fileDialog->setWindowModality (Qt::NonModal);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	196 fileDialog->setAttribute (Qt::WA_DeleteOnClose);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	197 fileDialog->show ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	198 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	199
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	200 // Check whether this file is already open in the editor.
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	201 QWidget *
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	202 file_editor::find_tab_widget (const QString& file) const
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	203 {
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	204 QWidget *retval = 0;
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	205
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	206 for (editor_tab_map_const_iterator p = editor_tab_map.begin ();
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	207 p != editor_tab_map.end (); p++)
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	208 {
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	209 QString tab_file = p->first;
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	210
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	211 if (same_file (file.toStdString (), tab_file.toStdString ()))
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	212 {
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	213 retval = p->second;
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	214 break;
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	215 }
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	216 }
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	217
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	218 return retval;
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	219 }
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	220
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	221 void
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	222 file_editor::request_open_file (const QString& openFileName, int line,
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	223 bool debug_pointer,
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	224 bool breakpoint_marker, bool insert)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	225 {
16407 4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	226 // Check if the user wants to use a custom file editor.
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	227 QSettings *settings = resource_manager::get_settings ();
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	228 if (settings->value ("useCustomFileEditor").toBool ())
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	229 {
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	230 QString editor = settings->value ("customFileEditor").toString ();
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	231 editor.replace ("%f", openFileName);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	232 editor.replace ("%l", QString::number (line));
16407 4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	233 QProcess::startDetached (editor);
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	234 if (line < 0)
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	235 handle_mru_add_file (QDir::cleanPath (openFileName));
16407 4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	236 return;
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	237 }
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	238
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	239 if (openFileName.isEmpty ())
14690 ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	240 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	241 // ?? Not sure this will happen. This routine isn't even called
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	242 // if the user hasn't selected a file.
14690 ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	243 }
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	244 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	245 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	246 // Have all file editor tabs signal what their file names are.
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	247 editor_tab_map.clear ();
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	248 emit fetab_file_name_query (0);
14690 ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	249
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	250 // Check whether this file is already open in the editor.
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	251 QWidget *tab = find_tab_widget (openFileName);
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	252
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	253 if (tab)
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	254 {
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	255 _tab_widget->setCurrentWidget (tab);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	256
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	257 if (line > 0)
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	258 {
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	259 emit fetab_goto_line (tab, line);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	260
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	261 if (debug_pointer)
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16546 diff changeset	262 emit fetab_insert_debugger_pointer (tab, line);
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	263
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	264 if (breakpoint_marker)
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16546 diff changeset	265 emit fetab_do_breakpoint_marker (insert, tab, line);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	266 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	267
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	268 emit fetab_set_focus (tab);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	269 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	270 else
15356 842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15321 diff changeset	271 {
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	272 file_editor_tab *fileEditorTab = new file_editor_tab ();
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	273 if (fileEditorTab)
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	274 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	275 QString result = fileEditorTab->load_file (openFileName);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	276 if (result == "")
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	277 {
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	278 // Supply empty title then have the file_editor_tab update
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	279 // with full or short name.
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	280 add_file_editor_tab (fileEditorTab, "");
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	281 fileEditorTab->update_window_title (false);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	282 // file already loaded, add file to mru list here
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	283 handle_mru_add_file (QDir::cleanPath (openFileName));
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	284
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	285 if (line > 0)
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	286 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	287 emit fetab_goto_line (fileEditorTab, line);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	288
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	289 if (debug_pointer)
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16546 diff changeset	290 emit fetab_insert_debugger_pointer (fileEditorTab,
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16546 diff changeset	291 line);
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	292 if (breakpoint_marker)
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16546 diff changeset	293 emit fetab_do_breakpoint_marker (insert, fileEditorTab,
3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16546 diff changeset	294 line);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	295 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	296 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	297 else
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	298 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	299 delete fileEditorTab;
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	300 // Create a NonModal message about error.
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	301 QMessageBox *msgBox
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	302 = new QMessageBox (QMessageBox::Critical,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	303 tr ("Octave Editor"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	304 tr ("Could not open file %1 for read:\n%2.").
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	305 arg (openFileName).arg (result),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	306 QMessageBox::Ok, 0);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	307
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	308 msgBox->setWindowModality (Qt::NonModal);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	309 msgBox->setAttribute (Qt::WA_DeleteOnClose);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	310 msgBox->show ();
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	311 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	312 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	313
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	314 // really show editor and the current editor tab
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	315 set_focus ();
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	316 }
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	317 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	318 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	319
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	320 // open a file from the mru list
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	321 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	322 file_editor::request_mru_open_file (void)
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	323 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	324 QAction action = qobject_cast<QAction > (sender ());
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	325 if (action)
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	326 {
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	327 request_open_file (action->data ().toString ());
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	328 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	329 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	330
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	331
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	332 void
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	333 file_editor::check_conflict_save (const QString& saveFileName, bool remove_on_success)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	334 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	335 // Have all file editor tabs signal what their file names are.
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	336 editor_tab_map.clear ();
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	337 emit fetab_file_name_query (0);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	338
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	339 // Check whether this file is already open in the editor.
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	340 QWidget *tab = find_tab_widget (saveFileName);
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	341
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	342 if (tab)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	343 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	344 // Note: to overwrite the contents of some other file editor tab
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	345 // with the same name requires identifying which file editor tab
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	346 // that is (not too difficult) then close that tab. Of course,
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	347 // that could trigger another dialog box if the file editor tab
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	348 // with the same name has modifications in it. This could become
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	349 // somewhat confusing to the user. For now, opt to do nothing.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	350
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	351 // Create a NonModal message about error.
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	352 QMessageBox *msgBox
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	353 = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	354 tr ("File not saved! A file with the selected name\n%1\n"
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	355 "is already open in the editor").
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	356 arg (saveFileName),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	357 QMessageBox::Ok, 0);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	358
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	359 msgBox->setWindowModality (Qt::NonModal);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	360 msgBox->setAttribute (Qt::WA_DeleteOnClose);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	361 msgBox->show ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	362
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	363 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	364 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	365
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	366 QObject *saveFileObject = sender ();
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	367 QWidget *saveFileWidget = 0;
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	368
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	369 for (int i = 0; i < _tab_widget->count (); i++)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	370 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	371 if (_tab_widget->widget (i) == saveFileObject)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	372 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	373 saveFileWidget = _tab_widget->widget (i);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	374 break;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	375 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	376 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	377 if (!saveFileWidget)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	378 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	379 // Create a NonModal message about error.
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	380 QMessageBox *msgBox
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	381 = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	382 tr ("The associated file editor tab has disappeared. It was likely closed by some means."),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	383 QMessageBox::Ok, 0);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	384
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	385 msgBox->setWindowModality (Qt::NonModal);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	386 msgBox->setAttribute (Qt::WA_DeleteOnClose);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	387 msgBox->show ();
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	388
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	389 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	390 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	391
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	392 // Can save without conflict, have the file editor tab do so.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	393 emit fetab_save_file (saveFileWidget, saveFileName, remove_on_success);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	394 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	395
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	396 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	397 file_editor::handle_insert_debugger_pointer_request (const QString& file,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	398 int line)
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	399 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	400 request_open_file (file, line, true);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	401 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	402
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	403 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	404 file_editor::handle_delete_debugger_pointer_request (const QString& file,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	405 int line)
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	406 {
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	407 if (! file.isEmpty ())
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	408 {
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	409 // Have all file editor tabs signal what their file names are.
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	410 editor_tab_map.clear ();
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	411 emit fetab_file_name_query (0);
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	412
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	413 // Check whether this file is already open in the editor.
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	414 QWidget *tab = find_tab_widget (file);
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	415
c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	416 if (tab)
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	417 {
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	418 _tab_widget->setCurrentWidget (tab);
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	419
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	420 if (line > 0)
16547 3cd80afc3509 improve debugging with the GUI John W. Eaton <jwe@octave.org> parents: 16546 diff changeset	421 emit fetab_delete_debugger_pointer (tab, line);
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	422
16546 c1e90c7cfd30 try harder to find editor tab widgets for files with multiple names John W. Eaton <jwe@octave.org> parents: 16525 diff changeset	423 emit fetab_set_focus (tab);
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	424 }
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	425 }
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	426 }
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	427
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	428 void
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	429 file_editor::handle_update_breakpoint_marker_request (bool insert,
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	430 const QString& file,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	431 int line)
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	432 {
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	433 request_open_file (file, line, false, true, insert);
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	434 }
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	435
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	436 void
16399 f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	437 file_editor::handle_edit_file_request (const QString& file)
f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	438 {
f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	439 request_open_file (file);
f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	440 }
f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	441
f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	442 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	443 file_editor::request_undo (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	444 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	445 emit fetab_undo (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	446 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	447
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	448 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	449 file_editor::request_redo (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	450 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	451 emit fetab_redo (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	452 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	453
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	454 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	455 file_editor::request_copy (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	456 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	457 emit fetab_copy (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	458 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	459
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	460 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	461 file_editor::request_cut (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	462 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	463 emit fetab_cut (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	464 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	465
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	466 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	467 file_editor::request_paste (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	468 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	469 emit fetab_paste (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	470 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	471
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	472 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	473 file_editor::request_save_file (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	474 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	475 emit fetab_save_file (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	476 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	477
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	478 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	479 file_editor::request_save_file_as (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	480 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	481 emit fetab_save_file_as (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	482 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	483
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	484 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	485 file_editor::request_print_file (void)
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	486 {
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	487 emit fetab_print_file (_tab_widget->currentWidget ());
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	488 }
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	489
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	490
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	491 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	492 file_editor::request_run_file (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	493 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	494 emit fetab_run_file (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	495 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	496
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	497 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	498 file_editor::request_toggle_bookmark (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	499 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	500 emit fetab_toggle_bookmark (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	501 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	502
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	503 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	504 file_editor::request_next_bookmark (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	505 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	506 emit fetab_next_bookmark (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	507 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	508
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	509 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	510 file_editor::request_previous_bookmark (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	511 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	512 emit fetab_previous_bookmark (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	513 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	514
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	515 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	516 file_editor::request_remove_bookmark (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	517 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	518 emit fetab_remove_bookmark (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	519 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	520
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	521 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	522 file_editor::request_toggle_breakpoint (void)
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	523 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	524 emit fetab_toggle_breakpoint (_tab_widget->currentWidget ());
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	525 }
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	526
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	527 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	528 file_editor::request_next_breakpoint (void)
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	529 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	530 emit fetab_next_breakpoint (_tab_widget->currentWidget ());
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	531 }
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	532
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	533 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	534 file_editor::request_previous_breakpoint (void)
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	535 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	536 emit fetab_previous_breakpoint (_tab_widget->currentWidget ());
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	537 }
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	538
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	539 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	540 file_editor::request_remove_breakpoint (void)
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	541 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	542 emit fetab_remove_all_breakpoints (_tab_widget->currentWidget ());
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	543 }
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	544
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	545 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	546 file_editor::request_comment_selected_text (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	547 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	548 emit fetab_comment_selected_text (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	549 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	550
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	551 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	552 file_editor::request_uncomment_selected_text (void)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	553 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	554 emit fetab_uncomment_selected_text (_tab_widget->currentWidget ());
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	555 }
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	556
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	557 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	558 file_editor::request_find (void)
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	559 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	560 emit fetab_find (_tab_widget->currentWidget ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	561 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	562
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	563 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	564 file_editor::request_goto_line (void)
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	565 {
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	566 emit fetab_goto_line (_tab_widget->currentWidget ());
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	567 }
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	568
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	569
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	570 void
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	571 file_editor::handle_mru_add_file (const QString& file_name)
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	572 {
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	573 _mru_files.removeAll (file_name);
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	574 _mru_files.prepend (file_name);
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	575 mru_menu_update ();
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	576 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	577
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	578 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	579 file_editor::mru_menu_update (void)
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	580 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	581 int num_files = qMin (_mru_files.size (), int (MaxMRUFiles));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	582
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	583 // configure and show active actions of mru-menu
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	584 for (int i = 0; i < num_files; ++i)
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	585 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	586 QString text = tr ("&%1 %2").
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	587 arg ((i+1) % int (MaxMRUFiles)).arg (_mru_files.at (i));
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	588 _mru_file_actions[i]->setText (text);
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	589 _mru_file_actions[i]->setData (_mru_files.at (i));
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	590 _mru_file_actions[i]->setVisible (true);
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	591 }
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	592
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	593 // hide unused mru-menu entries
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	594 for (int j = num_files; j < MaxMRUFiles; ++j)
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	595 _mru_file_actions[j]->setVisible (false);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	596
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	597 // delete entries in string-list beyond MaxMRUFiles
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	598 while (_mru_files.size () > MaxMRUFiles)
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	599 _mru_files.removeLast ();
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	600
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	601 // save actual mru-list in settings
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	602 QSettings *settings = resource_manager::get_settings ();
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	603
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	604 // FIXME -- what should happen if settings is 0?
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	605 settings->setValue ("editor/mru_file_list", _mru_files);
16175 6f83158c714c gui: make sure settings are really written into the settings file Torsten <ttl@justmail.de> parents: 16057 diff changeset	606 settings->sync ();
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	607 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	608
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	609 void
16307 f299079ed03a avoid shadowed variable warning from GCC John W. Eaton <jwe@octave.org> parents: 16176 diff changeset	610 file_editor::handle_file_name_changed (const QString& fname,
f299079ed03a avoid shadowed variable warning from GCC John W. Eaton <jwe@octave.org> parents: 16176 diff changeset	611 const QString& tip)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	612 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	613 QObject *fileEditorTab = sender ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	614 if (fileEditorTab)
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	615 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	616 for (int i = 0; i < _tab_widget->count (); i++)
14602 c8453a013000 Cleaned up code. Fixed bug that causes the GUI to freeze when launching another editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14599 diff changeset	617 {
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	618 if (_tab_widget->widget (i) == fileEditorTab)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	619 {
16307 f299079ed03a avoid shadowed variable warning from GCC John W. Eaton <jwe@octave.org> parents: 16176 diff changeset	620 _tab_widget->setTabText (i, fname);
f299079ed03a avoid shadowed variable warning from GCC John W. Eaton <jwe@octave.org> parents: 16176 diff changeset	621 _tab_widget->setTabToolTip (i, tip);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	622 }
14602 c8453a013000 Cleaned up code. Fixed bug that causes the GUI to freeze when launching another editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14599 diff changeset	623 }
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	624 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	625 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	626
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	627 void
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	628 file_editor::handle_tab_close_request (int index)
13529 8e87f3ba3beb gui-editor: enabled 'Save File As' ttl <ttl@justmail.de> parents: 13524 diff changeset	629 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	630 // Signal to the tabs a request to close whomever matches the identifying
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	631 // tag (i.e., unique widget pointer). The reason for this indirection is
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	632 // that it will enable a file editor widget to toss up a non-static
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	633 // dialog box and later signal that it wants to be removed.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	634 QWidget *tabID = _tab_widget->widget (index);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	635 emit fetab_close_request (tabID);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	636 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	637
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	638 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	639 file_editor::handle_tab_remove_request (void)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	640 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	641 QObject *fileEditorTab = sender ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	642 if (fileEditorTab)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	643 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	644 for (int i = 0; i < _tab_widget->count (); i++)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	645 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	646 if (_tab_widget->widget (i) == fileEditorTab)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	647 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	648 _tab_widget->removeTab (i);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	649 delete fileEditorTab;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	650 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	651 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	652 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	653 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	654
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	655 void
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	656 file_editor::handle_add_filename_to_list (const QString& fileName, QWidget *ID)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	657 {
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	658 // Should we allow multiple tabs for a single file?
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	659
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	660 editor_tab_map[fileName] = ID;
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	661 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	662
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	663 void
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	664 file_editor::active_tab_changed (int index)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	665 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	666 emit fetab_change_request (_tab_widget->widget (index));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	667 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	668
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	669 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	670 file_editor::handle_editor_state_changed (bool copy_available,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	671 const QString& file_name)
14690 ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	672 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	673 // In case there is some scenario where traffic could be coming from
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	674 // all the file editor tabs, just process info from the current active tab.
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	675 if (sender () == _tab_widget->currentWidget ())
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	676 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	677 _copy_action->setEnabled (copy_available);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	678 _cut_action->setEnabled (copy_available);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	679
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	680 if (!file_name.isEmpty ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	681 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	682 ced = QDir::cleanPath (file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	683 int lastslash = ced.lastIndexOf ('/');
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	684
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	685 // Test against > 0 because if somehow the directory is "/" the
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	686 // slash should be retained. Otherwise, last slash is removed.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	687 if (lastslash > 0 && lastslash != ced.count ())
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	688 ced = ced.left (lastslash);
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	689 }
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	690
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	691 setFocusProxy (_tab_widget->currentWidget ());
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	692 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	693 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	694
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	695 void
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16407 diff changeset	696 file_editor::notice_settings (const QSettings *settings)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	697 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	698 int icon_size = settings->value ("toolbar_icon_size", 24).toInt ();
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	699 _tool_bar->setIconSize (QSize (icon_size, icon_size));
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	700 // Relay signal to file editor tabs.
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16407 diff changeset	701 emit fetab_settings_changed (settings);
14690 ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	702 }
ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	703
ca733a66be7a Fixed bug with not opening the editor when clicking a file from the file browser. Implemented watching the file on disk. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14681 diff changeset	704 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	705 file_editor::construct (void)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	706 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	707 QWidget *editor_widget = new QWidget (this);
15894 9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15873 diff changeset	708
9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15873 diff changeset	709 // FIXME -- what was the intended purpose of this unused variable?
9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15873 diff changeset	710 // QStyle *editor_style = QApplication::style ();
13566 d22b9973120f Renamed language files to match convention. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13562 diff changeset	711
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	712 _menu_bar = new QMenuBar (editor_widget);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	713 _tool_bar = new QToolBar (editor_widget);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	714 _tab_widget = new QTabWidget (editor_widget);
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	715 _tab_widget->setTabsClosable (true);
13562 a89aa9e05e19 editor: menu bar, run editor file in octave ttl <ttl@justmail.de> parents: 13558 diff changeset	716
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	717 QAction *new_action = new QAction (QIcon (":/actions/icons/filenew.png"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	718 tr ("&New File"), _tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	719
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	720 QAction *open_action = new QAction (QIcon (":/actions/icons/fileopen.png"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	721 tr ("&Open File"), _tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	722
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	723 QAction *save_action = new QAction (QIcon (":/actions/icons/filesave.png"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	724 tr ("&Save File"), _tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	725
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	726 QAction *save_as_action
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	727 = new QAction (QIcon (":/actions/icons/filesaveas.png"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	728 tr ("Save File &As"), _tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	729
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	730 QAction *print_action
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	731 = new QAction ( QIcon (":/actions/icons/fileprint.png"),
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	732 tr ("Print"), _tool_bar);
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	733
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	734 QAction *undo_action = new QAction (QIcon (":/actions/icons/undo.png"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	735 tr ("&Undo"), _tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	736
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	737 QAction *redo_action = new QAction (QIcon (":/actions/icons/redo.png"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	738 tr ("&Redo"), _tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	739
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	740 _copy_action = new QAction (QIcon (":/actions/icons/editcopy.png"),
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	741 tr ("&Copy"), _tool_bar);
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	742
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	743 _cut_action = new QAction (QIcon (":/actions/icons/editcut.png"),
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	744 tr ("Cu&t"), _tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	745
14727 f34984656658 Added crystal project icons. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14718 diff changeset	746 QAction *paste_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	747 = new QAction (QIcon (":/actions/icons/editpaste.png"),
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	748 tr ("Paste"), _tool_bar);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	749
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	750 QAction *next_bookmark_action
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	751 = new QAction (tr ("&Next Bookmark"), _tool_bar);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	752
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	753 QAction *previous_bookmark_action
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	754 = new QAction (tr ("Pre&vious Bookmark"), _tool_bar);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	755
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	756 QAction *toggle_bookmark_action
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	757 = new QAction (tr ("Toggle &Bookmark"), _tool_bar);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	758
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	759 QAction *remove_bookmark_action
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	760 = new QAction (tr ("&Remove All Bookmarks"), _tool_bar);
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	761
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	762 QAction *next_breakpoint_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	763 = new QAction (QIcon (":/actions/icons/bp_next.png"),
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	764 tr ("&Next breakpoint"), _tool_bar);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	765 QAction *previous_breakpoint_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	766 = new QAction (QIcon (":/actions/icons/bp_prev.png"),
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	767 tr ("Pre&vious breakpoint"), _tool_bar);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	768 QAction *toggle_breakpoint_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	769 = new QAction (QIcon (":/actions/icons/bp_toggle.png"),
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	770 tr ("Toggle &breakpoint"), _tool_bar);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	771 QAction *remove_all_breakpoints_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	772 = new QAction (QIcon (":/actions/icons/bp_rm_all.png"),
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	773 tr ("&Remove All breakpoints"), _tool_bar);
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	774
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	775 QAction *comment_selection_action
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	776 = new QAction (tr ("&Comment Selected Text"), _tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	777
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	778 QAction *uncomment_selection_action
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	779 = new QAction (tr ("&Uncomment Selected Text"), _tool_bar);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	780
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	781 QAction *find_action = new QAction (QIcon (":/actions/icons/search.png"),
15105 f4ea22ef2beb Incorporated patch that adds replace from Torsten and modified it. Jacob Dawid <jacob.dawid@gmail.com> parents: 15080 diff changeset	782 tr ("&Find and Replace"), _tool_bar);
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	783
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	784 _run_action = new QAction (QIcon (":/actions/icons/artsbuilderexecute.png"),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	785 tr ("Save File And Run"), _tool_bar);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	786
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	787 QAction *goto_line_action = new QAction (tr ("Go&to Line"), _tool_bar);
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	788
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	789 // the mru-list and an empty array of actions
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	790 QSettings *settings = resource_manager::get_settings ();
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	791 // FIXME -- what should happen if settings is 0?
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	792 _mru_files = settings->value ("editor/mru_file_list").toStringList ();
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	793 for (int i = 0; i < MaxMRUFiles; ++i)
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	794 {
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	795 _mru_file_actions[i] = new QAction (this);
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	796 _mru_file_actions[i]->setVisible (false);
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	797 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	798
13584 e76a22bfe406 editor: added bookmark feature ttl <ttl@justmail.de> parents: 13566 diff changeset	799 // some actions are disabled from the beginning
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	800 _copy_action->setEnabled (false);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	801 _cut_action->setEnabled (false);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	802 _run_action->setShortcut (Qt::ControlModifier+ Qt::Key_R);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	803 _run_action->setShortcutContext (Qt::WindowShortcut);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	804 save_action->setShortcut (QKeySequence::Save);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	805 save_action->setShortcutContext (Qt::WindowShortcut);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	806 save_as_action->setShortcut (QKeySequence::SaveAs);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	807 save_as_action->setShortcutContext (Qt::WindowShortcut);
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	808
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	809 print_action->setShortcut (QKeySequence::Print);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	810 print_action->setShortcutContext (Qt::WindowShortcut);
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	811
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	812 next_bookmark_action->setShortcut (Qt::Key_F2);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	813 next_bookmark_action->setShortcutContext (Qt::WindowShortcut);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	814 previous_bookmark_action->setShortcut (Qt::SHIFT + Qt::Key_F2);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	815 previous_bookmark_action->setShortcutContext (Qt::WindowShortcut);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	816 toggle_bookmark_action->setShortcut (Qt::Key_F7);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	817 toggle_bookmark_action->setShortcutContext (Qt::WindowShortcut);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	818 comment_selection_action->setShortcut (Qt::ControlModifier + Qt::Key_7);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	819 comment_selection_action->setShortcutContext (Qt::WindowShortcut);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	820 uncomment_selection_action->setShortcut (Qt::ControlModifier + Qt::Key_8);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	821 uncomment_selection_action->setShortcutContext (Qt::WindowShortcut);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	822 find_action->setShortcut (QKeySequence::Find);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	823 find_action->setShortcutContext (Qt::WindowShortcut);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	824 goto_line_action->setShortcut (Qt::ControlModifier+ Qt::Key_G);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	825 goto_line_action->setShortcutContext (Qt::WindowShortcut);
13556 0d18b0e168ae editor: shortcuts for toolbar actions, window icon ttl <ttl@justmail.de> parents: 13555 diff changeset	826
13562 a89aa9e05e19 editor: menu bar, run editor file in octave ttl <ttl@justmail.de> parents: 13558 diff changeset	827 // toolbar
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	828 _tool_bar->addAction (new_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	829 _tool_bar->addAction (open_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	830 _tool_bar->addAction (save_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	831 _tool_bar->addAction (save_as_action);
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	832 _tool_bar->addSeparator ();
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	833 _tool_bar->addAction (print_action);
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	834 _tool_bar->addSeparator ();
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	835 _tool_bar->addAction (undo_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	836 _tool_bar->addAction (redo_action);
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	837 _tool_bar->addAction (_copy_action);
b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	838 _tool_bar->addAction (_cut_action);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	839 _tool_bar->addAction (paste_action);
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	840 _tool_bar->addSeparator ();
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	841 _tool_bar->addAction (find_action);
14830 41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	842 _tool_bar->addAction (_run_action);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	843 _tool_bar->addSeparator ();
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	844 _tool_bar->addAction (toggle_breakpoint_action);
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	845 _tool_bar->addAction (next_breakpoint_action);
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	846 _tool_bar->addAction (previous_breakpoint_action);
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	847 _tool_bar->addAction (remove_all_breakpoints_action);
13562 a89aa9e05e19 editor: menu bar, run editor file in octave ttl <ttl@justmail.de> parents: 13558 diff changeset	848
14669 7605e7136b50 Discarded initFileEditor, instead put that in the constructor. Speedup for updating the symbol table by lowering complexity from n² to n. Fixed problem with hangup on quit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14602 diff changeset	849 // menu bar
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	850 QMenu *fileMenu = new QMenu (tr ("&File"), _menu_bar);
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	851 fileMenu->addAction (new_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	852 fileMenu->addAction (open_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	853 fileMenu->addAction (save_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	854 fileMenu->addAction (save_as_action);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	855 fileMenu->addSeparator ();
15993 41471c02d51c gui: show menu with recently used editor files also in file menu of main window Torsten <ttl@justmail.de> parents: 15984 diff changeset	856 _mru_file_menu = new QMenu (tr ("&Recent Editor Files"), fileMenu);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	857
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	858 for (int i = 0; i < MaxMRUFiles; ++i)
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	859 _mru_file_menu->addAction (_mru_file_actions[i]);
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	860
15993 41471c02d51c gui: show menu with recently used editor files also in file menu of main window Torsten <ttl@justmail.de> parents: 15984 diff changeset	861 fileMenu->addMenu (_mru_file_menu);
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	862 _menu_bar->addMenu (fileMenu);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	863
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	864 fileMenu->addSeparator ();
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	865 fileMenu->addAction (print_action);
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	866
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	867 QMenu *editMenu = new QMenu (tr ("&Edit"), _menu_bar);
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	868 editMenu->addAction (undo_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	869 editMenu->addAction (redo_action);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	870 editMenu->addSeparator ();
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	871 editMenu->addAction (_copy_action);
b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	872 editMenu->addAction (_cut_action);
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	873 editMenu->addAction (paste_action);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	874 editMenu->addSeparator ();
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	875 editMenu->addAction (find_action);
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	876 editMenu->addSeparator ();
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	877 editMenu->addAction (comment_selection_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	878 editMenu->addAction (uncomment_selection_action);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	879 editMenu->addSeparator ();
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	880 editMenu->addAction (toggle_bookmark_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	881 editMenu->addAction (next_bookmark_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	882 editMenu->addAction (previous_bookmark_action);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	883 editMenu->addAction (remove_bookmark_action);
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	884 editMenu->addSeparator ();
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	885 editMenu->addAction (goto_line_action);
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	886 _menu_bar->addMenu (editMenu);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	887
14778 f43916137064 Added debug menu to file editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	888 _debug_menu = new QMenu (tr ("&Debug"), _menu_bar);
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	889 _debug_menu->addAction (toggle_breakpoint_action);
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	890 _debug_menu->addAction (next_breakpoint_action);
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	891 _debug_menu->addAction (previous_breakpoint_action);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	892 _debug_menu->addAction (remove_all_breakpoints_action);
14825 eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	893 _debug_menu->addSeparator ();
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14812 diff changeset	894 // The other debug actions will be added by the main window.
14778 f43916137064 Added debug menu to file editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	895 _menu_bar->addMenu (_debug_menu);
f43916137064 Added debug menu to file editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	896
14830 41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	897 QMenu *_run_menu = new QMenu (tr ("&Run"), _menu_bar);
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	898 _run_menu->addAction (_run_action);
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	899 _menu_bar->addMenu (_run_menu);
13566 d22b9973120f Renamed language files to match convention. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13562 diff changeset	900
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	901 QVBoxLayout *vbox_layout = new QVBoxLayout ();
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	902 vbox_layout->addWidget (_menu_bar);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	903 vbox_layout->addWidget (_tool_bar);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	904 vbox_layout->addWidget (_tab_widget);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	905 vbox_layout->setMargin (0);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	906 editor_widget->setLayout (vbox_layout);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	907 setWidget (editor_widget);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	908
16455 38ed6bdd1f7f move signal/slot connections from main window to sub window where possible John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	909 connect (parent (), SIGNAL (settings_changed (const QSettings *)),
38ed6bdd1f7f move signal/slot connections from main window to sub window where possible John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	910 this, SLOT (notice_settings (const QSettings *)));
38ed6bdd1f7f move signal/slot connections from main window to sub window where possible John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	911
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	912 connect (parent (), SIGNAL (new_file_signal (const QString&)),
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	913 this, SLOT (request_new_file (const QString&)));
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	914
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	915 connect (parent (), SIGNAL (open_file_signal (const QString&)),
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	916 this, SLOT (request_open_file (const QString&)));
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	917
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	918 connect (new_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	919 this, SLOT (request_new_file ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	920
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	921 connect (open_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	922 this, SLOT (request_open_file ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	923
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	924 connect (undo_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	925 this, SLOT (request_undo ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	926
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	927 connect (redo_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	928 this, SLOT (request_redo ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	929
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	930 connect (_copy_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	931 this, SLOT (request_copy ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	932
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	933 connect (_cut_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	934 this, SLOT (request_cut ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	935
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	936 connect (paste_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	937 this, SLOT (request_paste ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	938
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	939 connect (save_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	940 this, SLOT (request_save_file ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	941
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	942 connect (save_as_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	943 this, SLOT (request_save_file_as ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	944
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	945 connect (print_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	946 this, SLOT (request_print_file ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	947
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	948 connect (_run_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	949 this, SLOT (request_run_file ()));
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	950
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	951 connect (toggle_bookmark_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	952 this, SLOT (request_toggle_bookmark ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	953
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	954 connect (next_bookmark_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	955 this, SLOT (request_next_bookmark ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	956
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	957 connect (previous_bookmark_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	958 this, SLOT (request_previous_bookmark ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	959
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	960 connect (remove_bookmark_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	961 this, SLOT (request_remove_bookmark ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	962
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	963 connect (toggle_breakpoint_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	964 this, SLOT (request_toggle_breakpoint ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	965
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	966 connect (next_breakpoint_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	967 this, SLOT (request_next_breakpoint ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	968
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	969 connect (previous_breakpoint_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	970 this, SLOT (request_previous_breakpoint ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	971
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	972 connect (remove_all_breakpoints_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	973 this, SLOT (request_remove_breakpoint ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	974
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	975 connect (comment_selection_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	976 this, SLOT (request_comment_selected_text ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	977
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	978 connect (uncomment_selection_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	979 this, SLOT (request_uncomment_selected_text ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	980
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	981 connect (find_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	982 this, SLOT (request_find ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	983
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	984 connect (goto_line_action, SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	985 this, SLOT (request_goto_line ()));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	986
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	987 // The actions of the mru file menu
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	988 for (int i = 0; i < MaxMRUFiles; ++i)
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	989 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	990 connect (_mru_file_actions[i], SIGNAL (triggered ()),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	991 this, SLOT (request_mru_open_file ()));
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	992 }
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	993
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	994 mru_menu_update ();
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	995
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	996 connect (_tab_widget, SIGNAL (tabCloseRequested (int)),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	997 this, SLOT (handle_tab_close_request (int)));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	998
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	999 connect (_tab_widget, SIGNAL (currentChanged (int)),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1000 this, SLOT (active_tab_changed (int)));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	1001
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	1002 resize (500, 400);
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1003 setWindowIcon (QIcon (":/actions/icons/logo.png"));
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15425 diff changeset	1004 setWindowTitle ("Editor");
15356 842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15321 diff changeset	1005
842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15321 diff changeset	1006 //restore previous session
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1007 if (settings->value ("editor/restoreSession", true).toBool ())
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	1008 {
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1009 QStringList sessionFileNames
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1010 = settings->value ("editor/savedSessionTabs", QStringList ()).toStringList ();
15356 842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15321 diff changeset	1011
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1012 for (int n = 0; n < sessionFileNames.count (); ++n)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1013 request_open_file (sessionFileNames.at (n));
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	1014 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1015 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	1016
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	1017 void
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1018 file_editor::add_file_editor_tab (file_editor_tab *f, const QString& fn)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	1019 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1020 _tab_widget->addTab (f, fn);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1021
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1022 // Signals from the file editor_tab
15984 1eb3c67139f6 Add full-length-name tool tip to editor file tab when name is not full length. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15982 diff changeset	1023 connect (f, SIGNAL (file_name_changed (const QString&, const QString&)),
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1024 this, SLOT (handle_file_name_changed (const QString&,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1025 const QString&)));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1026
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1027 connect (f, SIGNAL (editor_state_changed (bool, const QString&)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1028 this, SLOT (handle_editor_state_changed (bool, const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1029
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1030 connect (f, SIGNAL (tab_remove_request ()),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1031 this, SLOT (handle_tab_remove_request ()));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1032
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1033 connect (f, SIGNAL (add_filename_to_list (const QString&, QWidget*)),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1034 this, SLOT (handle_add_filename_to_list (const QString&, QWidget*)));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1035
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1036 connect (f, SIGNAL (editor_check_conflict_save (const QString&, bool)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1037 this, SLOT (check_conflict_save (const QString&, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1038
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	1039 connect (f, SIGNAL (mru_add_file (const QString&)),
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	1040 this, SLOT (handle_mru_add_file (const QString&)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1041
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1042 connect (f, SIGNAL (process_octave_code (const QString&)),
16570 d5ae5aa80d42 preserve pending command line input when running commands from GUI actions John W. Eaton <jwe@octave.org> parents: 16566 diff changeset	1043 parent (), SLOT (execute_command_in_terminal (const QString&)));
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1044
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1045 // Signals from the file_editor non-trivial operations
16413 28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16407 diff changeset	1046 connect (this, SIGNAL (fetab_settings_changed (const QSettings *)),
28136851099a remove _terminal pointer from main_window, it is contained by other Qt object Daniel J Sebald <daniel.sebald@ieee.org> parents: 16407 diff changeset	1047 f, SLOT (notice_settings (const QSettings *)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1048
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1049 connect (this, SIGNAL (fetab_close_request (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1050 f, SLOT (conditional_close (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1051
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1052 connect (this, SIGNAL (fetab_change_request (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1053 f, SLOT (change_editor_state (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1054
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1055 connect (this, SIGNAL (fetab_file_name_query (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1056 f, SLOT (file_name_query (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1057
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1058 connect (this, SIGNAL (fetab_save_file (const QWidget*, const QString&,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1059 bool)),
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1060 f, SLOT (save_file (const QWidget*, const QString&, bool)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1061
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1062 // Signals from the file_editor trivial operations
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1063 connect (this, SIGNAL (fetab_undo (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1064 f, SLOT (undo (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1065
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1066 connect (this, SIGNAL (fetab_redo (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1067 f, SLOT (redo (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1068
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1069 connect (this, SIGNAL (fetab_copy (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1070 f, SLOT (copy (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1071
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1072 connect (this, SIGNAL (fetab_cut (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1073 f, SLOT (cut (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1074
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1075 connect (this, SIGNAL (fetab_paste (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1076 f, SLOT (paste (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1077
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1078 connect (this, SIGNAL (fetab_save_file (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1079 f, SLOT (save_file (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1080
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1081 connect (this, SIGNAL (fetab_save_file_as (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1082 f, SLOT (save_file_as (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1083
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	1084 connect (this, SIGNAL (fetab_print_file (const QWidget*)),
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	1085 f, SLOT (print_file (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1086
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1087 connect (this, SIGNAL (fetab_run_file (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1088 f, SLOT (run_file (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1089
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1090 connect (this, SIGNAL (fetab_toggle_bookmark (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1091 f, SLOT (toggle_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1092
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1093 connect (this, SIGNAL (fetab_next_bookmark (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1094 f, SLOT (next_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1095
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1096 connect (this, SIGNAL (fetab_previous_bookmark (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1097 f, SLOT (previous_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1098
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1099 connect (this, SIGNAL (fetab_remove_bookmark (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1100 f, SLOT (remove_bookmark (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1101
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1102 connect (this, SIGNAL (fetab_toggle_breakpoint (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1103 f, SLOT (toggle_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1104
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1105 connect (this, SIGNAL (fetab_next_breakpoint (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1106 f, SLOT (next_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1107
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1108 connect (this, SIGNAL (fetab_previous_breakpoint (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1109 f, SLOT (previous_breakpoint (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1110
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1111 connect (this, SIGNAL (fetab_remove_all_breakpoints (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1112 f, SLOT (remove_all_breakpoints (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1113
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1114 connect (this, SIGNAL (fetab_comment_selected_text (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1115 f, SLOT (comment_selected_text (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1116
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1117 connect (this, SIGNAL (fetab_uncomment_selected_text (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1118 f, SLOT (uncomment_selected_text (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1119
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1120 connect (this, SIGNAL (fetab_find (const QWidget*)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1121 f, SLOT (find (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1122
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1123 connect (this, SIGNAL (fetab_goto_line (const QWidget*, int)),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1124 f, SLOT (goto_line (const QWidget*, int)));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1125
15980 6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	1126 connect (this, SIGNAL (fetab_set_focus (const QWidget*)),
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	1127 f, SLOT (set_focus (const QWidget*)));
16558 5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1128
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1129 connect (this, SIGNAL (fetab_insert_debugger_pointer (const QWidget*, int)),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1130 f, SLOT (insert_debugger_pointer (const QWidget*, int)));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1131
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1132 connect (this, SIGNAL (fetab_delete_debugger_pointer (const QWidget*, int)),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1133 f, SLOT (delete_debugger_pointer (const QWidget*, int)));
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1134
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1135 connect (this, SIGNAL (fetab_do_breakpoint_marker (bool, const QWidget*,
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1136 int)),
5fc1ce2947bd style fixes John W. Eaton <jwe@octave.org> parents: 16547 diff changeset	1137 f, SLOT (do_breakpoint_marker (bool, const QWidget*, int)));
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15552 diff changeset	1138
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	1139 _tab_widget->setCurrentWidget (f);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	1140 }
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	1141
7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	1142 #endif

Mercurial > hg > octave-nkf

annotate libgui/src/m-editor/file-editor.cc @ 16570:d5ae5aa80d42