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

annotate libgui/src/m-editor/file-editor.cc @ 16525:e192525236ad

configurable size of toolbar icons * settings-dialog.ui: new spin box for icon sizes * settings-dialog.cc: new setting toolbar_icon_size * file-editor.cc(notice_settings): read toolbar icon size from settings * files-dock-widget.cc/h: make toolbar a class variable (notice-settings): read toolbar icon size from settings and reduce by 4 pixels * main-window.cc/h: make toolbar a class variable (notice-settings): read toolbar icon size from settings

author	Torsten <ttl@justmail.de>
date	Tue, 16 Apr 2013 21:34:39 +0200
parents	b348c5835ce4
children	c1e90c7cfd30

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"
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	42
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 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	44 : file_editor_interface (p)
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	45 {
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	46 // 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	47 // 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	48 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	49
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	50 construct ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	51
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	52 setVisible (false);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	53 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	54
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	55 file_editor::~file_editor ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	56 {
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	57 QSettings *settings = resource_manager::get_settings ();
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	58 editor_tab_map.clear ();
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	59 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	60 {
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	61 // 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	62 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	63 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	64 QStringList fetFileNames;
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	65 for (std::map<QString, QWidget *>::const_iterator p = editor_tab_map.begin ();
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	66 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	67 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	68
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	69 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	70 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	71
41471c02d51c gui: show menu with recently used editor files also in file menu of main window Torsten <ttl@justmail.de> parents: 15984 diff changeset	72 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	73 delete _mru_file_menu;
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	74 }
8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	75
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	76 void
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	77 file_editor::focus (void)
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	78 {
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	79 set_focus ();
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	80 }
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 void
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	83 file_editor::handle_visibility (bool visible)
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 if (visible && ! isFloating ())
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	86 focus ();
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
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	89 void
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	90 file_editor::connect_visibility_changed (void)
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 connect (this, SIGNAL (visibilityChanged (bool)),
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	93 this, SLOT (handle_visibility (bool)));
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
15980 6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	96 // 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	97 void
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	98 file_editor::set_focus ()
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	99 {
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	100 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	101 setVisible (true);
15980 6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	102 setFocus ();
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	103 activateWindow ();
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	104 raise ();
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	105 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	106 if (fileEditorTab)
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	107 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	108 }
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	109
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	110 QMenu *
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	111 file_editor::debug_menu ()
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	112 {
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	113 return _debug_menu;
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	114 }
e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	115
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	116 QToolBar *
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	117 file_editor::toolbar ()
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	118 {
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	119 return _tool_bar;
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	120 }
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	121
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	122 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	123 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	124 {
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	125 _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	126 }
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 void
16438 a971d8bdaadc use signals instead of event queue for entering/leaving debug mode John W. Eaton <jwe@octave.org> parents: 16413 diff changeset	129 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	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 _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	132 }
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 void
16452 744ff2fe11ce add create script context menu to history window John Donoghue <john.donoghue@ieee.org> parents: 16443 diff changeset	135 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	136 {
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	137 // 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	138 // 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	139 // 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	140
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 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	142 if (fileEditorTab)
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	143 {
15982 131d40cd805b gui: cleanup some string constants for translations Torsten <ttl@justmail.de> parents: 15980 diff changeset	144 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	145 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	146 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	147 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	148 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	149
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	150 void
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	151 file_editor::request_open_file ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	152 {
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	153 // 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	154 // 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	155 // 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	156
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	157 // Create a NonModal message.
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	158 QFileDialog* fileDialog = new QFileDialog (this);
15982 131d40cd805b gui: cleanup some string constants for translations Torsten <ttl@justmail.de> parents: 15980 diff changeset	159 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	160 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	161 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	162 fileDialog->setDirectory (ced);
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	163 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	164 this, SLOT (request_open_file (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	165 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	166 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	167 fileDialog->show ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	168 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	169
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	170 void
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	171 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	172 bool debug_pointer,
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	173 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	174 {
16407 4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	175 // 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	176 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	177 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	178 {
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	179 QString editor = settings->value ("customFileEditor").toString ();
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	180 editor.replace ("%f",openFileName);
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	181 editor.replace ("%l",QString::number (line));
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	182 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	183 if (line < 0)
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	184 handle_mru_add_file(QDir::cleanPath (openFileName));
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	185 return;
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	186 }
4d438dffbfac gui: call external editor when opening a file and custom editor is selected Torsten <ttl@justmail.de> parents: 16399 diff changeset	187
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 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	189 {
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	190 // ?? 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	191 // 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	192 }
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	193 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	194 {
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 // 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	196 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	197 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	198
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	199 // Check whether this file is already open in the editor.
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	200 std::map<QString, QWidget *>::const_iterator p = editor_tab_map.find (openFileName);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	201 if (p != editor_tab_map.end ())
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	202 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	203 _tab_widget->setCurrentWidget (p->second);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	204
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	205 if (line > 0)
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	206 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	207 emit fetab_goto_line (p->second, line);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	208
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	209 if (debug_pointer)
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	210 emit fetab_insert_debugger_pointer (p->second, line-1);
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	211
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	212 if (breakpoint_marker)
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	213 emit fetab_do_breakpoint_marker (insert, p->second, line-1);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	214 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	215
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	216 emit fetab_set_focus (p->second);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	217 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	218 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	219 {
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	220 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	221 if (fileEditorTab)
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	222 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	223 QString result = fileEditorTab->load_file(openFileName);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	224 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	225 {
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	226 // 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	227 // 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	228 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	229 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	230 // file already loaded, add file to mru list here
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	231 handle_mru_add_file(QDir::cleanPath (openFileName));
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	232
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	233 if (line > 0)
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	234 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	235 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	236
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	237 if (debug_pointer)
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	238 emit fetab_insert_debugger_pointer (fileEditorTab, line-1);
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	239 if (breakpoint_marker)
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	240 emit fetab_do_breakpoint_marker
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	241 (insert, fileEditorTab, line-1);
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	242 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	243 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	244 else
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	245 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	246 delete fileEditorTab;
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	247 // Create a NonModal message about error.
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	248 QMessageBox* msgBox = new QMessageBox (
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	249 QMessageBox::Critical, tr ("Octave Editor"),
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	250 tr ("Could not open file %1 for read:\n%2.").
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	251 arg (openFileName).arg (result),
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	252 QMessageBox::Ok, 0);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	253 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	254 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	255 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	256 }
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	257 }
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	258
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	259 // 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	260 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	261 }
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	262 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	263 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	264
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	265 // 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	266 void
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	267 file_editor::request_mru_open_file ()
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	268 {
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	269 QAction action = qobject_cast<QAction >(sender ());
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	270 if (action)
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	271 {
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	272 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	273 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	274 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	275
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	276
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	277 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	278 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	279 {
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	280 // 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	281 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	282 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	283
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	284 std::map<QString, QWidget *>::const_iterator p = editor_tab_map.find (saveFileName);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	285 if (p != editor_tab_map.end ())
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	286 {
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	287 // 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	288 // 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	289 // 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	290 // 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	291 // 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	292 // 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	293
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	294 // Create a NonModal message about error.
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	295 QMessageBox* msgBox = new QMessageBox (
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	296 QMessageBox::Critical, tr ("Octave Editor"),
15901 927b121ad63f gui: new error message when saving a file as one already opened in the editor Torsten <ttl@justmail.de> parents: 15894 diff changeset	297 tr ("File not saved! A file with the selected name\n%1\n"
927b121ad63f gui: new error message when saving a file as one already opened in the editor Torsten <ttl@justmail.de> parents: 15894 diff changeset	298 "is already open in the editor").
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	299 arg (saveFileName),
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	300 QMessageBox::Ok, 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	301 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	302 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	303 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	304
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	305 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	306 }
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	307
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	308 QObject* saveFileObject = sender ();
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	309 QWidget* saveFileWidget = 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	310 for(int i = 0; i < _tab_widget->count (); 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	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 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	313 {
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	314 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	315 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	316 }
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	317 }
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	318 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	319 {
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	320 // Create a NonModal message about error.
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	321 QMessageBox* msgBox = new QMessageBox (
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	322 QMessageBox::Critical, tr ("Octave Editor"),
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	323 tr ("The associated file editor tab has disappeared. It was likely closed by some means."),
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	324 QMessageBox::Ok, 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	325 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	326 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	327 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	328 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	329 }
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	330
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	331 // 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	332 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	333 }
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 void
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	336 file_editor::handle_insert_debugger_pointer_request (const QString& file, int line)
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	337 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	338 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	339 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	340
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	341 void
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	342 file_editor::handle_delete_debugger_pointer_request (const QString& file, int line)
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	343 {
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	344 if (! file.isEmpty ())
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	345 {
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	346 // 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	347 editor_tab_map.clear ();
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	348 emit fetab_file_name_query (0);
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	349
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	350 // Check whether this file is already open in the editor.
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	351 std::map<QString, QWidget *>::const_iterator p = editor_tab_map.find (file);
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	352 if (p != editor_tab_map.end ())
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	353 {
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	354 _tab_widget->setCurrentWidget (p->second);
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	355
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	356 if (line > 0)
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	357 emit fetab_delete_debugger_pointer (p->second, line-1);
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	358
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	359 emit fetab_set_focus (p->second);
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	360 }
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	361 }
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	362 }
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	363
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	364 void
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	365 file_editor::handle_update_breakpoint_marker_request (bool insert,
16386 4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	366 const QString& file, int line)
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	367 {
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	368 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	369 }
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	370
4902484f9181 callbacks to set markers in editor using command line dbstop function John W. Eaton <jwe@octave.org> parents: 16383 diff changeset	371 void
16399 f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	372 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	373 {
f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	374 request_open_file (file);
f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	375 }
f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	376
f9a737fd8829 allow command-line edit function to use GUI editor John W. Eaton <jwe@octave.org> parents: 16395 diff changeset	377 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	378 file_editor::request_undo ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	379 {
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	380 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	381 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	382
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	383 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	384 file_editor::request_redo ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	385 {
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	386 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	387 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	388
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	389 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	390 file_editor::request_copy ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	391 {
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	392 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	393 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	394
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	395 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	396 file_editor::request_cut ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	397 {
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	398 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	399 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	400
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	401 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	402 file_editor::request_paste ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	403 {
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	404 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	405 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	406
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	407 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	408 file_editor::request_save_file ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	409 {
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	410 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	411 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	412
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	413 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	414 file_editor::request_save_file_as ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	415 {
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	416 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	417 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	418
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	419 void
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	420 file_editor::request_print_file ()
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	421 {
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	422 emit fetab_print_file (_tab_widget->currentWidget ());
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	423 }
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	424
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	425
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	426 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	427 file_editor::request_run_file ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	428 {
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	429 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	430 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	431
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	432 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	433 file_editor::request_toggle_bookmark ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	434 {
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	435 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	436 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	437
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	438 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	439 file_editor::request_next_bookmark ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	440 {
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	441 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	442 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	443
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	444 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	445 file_editor::request_previous_bookmark ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	446 {
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	447 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	448 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	449
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	450 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	451 file_editor::request_remove_bookmark ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	452 {
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	453 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	454 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	455
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	456 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	457 file_editor::request_toggle_breakpoint ()
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	458 {
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	459 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	460 }
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	461
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	462 void
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	463 file_editor::request_next_breakpoint ()
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	464 {
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	465 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	466 }
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	467
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	468 void
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	469 file_editor::request_previous_breakpoint ()
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	470 {
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	471 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	472 }
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	473
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	474 void
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	475 file_editor::request_remove_breakpoint ()
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	476 {
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	477 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	478 }
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	479
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	480 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	481 file_editor::request_comment_selected_text ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	482 {
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	483 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	484 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	485
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	486 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	487 file_editor::request_uncomment_selected_text ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	488 {
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	489 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	490 }
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	491
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	492 void
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	493 file_editor::request_find ()
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	494 {
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	495 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	496 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	497
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	498 void
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	499 file_editor::request_goto_line ()
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	500 {
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	501 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	502 }
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	503
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	504
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	505 void
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	506 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	507 {
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	508 _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	509 _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	510 mru_menu_update ();
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	511 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	512
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	513 void
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	514 file_editor::mru_menu_update ()
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	515 {
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	516 int num_files = qMin (_mru_files.size(), int (MaxMRUFiles));
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	517 // 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	518 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	519 {
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	520 QString text = tr("&%1 %2").
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	521 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	522 _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	523 _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	524 _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	525 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	526 // 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	527 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	528 _mru_file_actions[j]->setVisible (false);
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	529 // 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	530 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	531 _mru_files.removeLast ();
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	532 // 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	533 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	534 // 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	535 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	536 settings->sync ();
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	537 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	538
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	539 void
16307 f299079ed03a avoid shadowed variable warning from GCC John W. Eaton <jwe@octave.org> parents: 16176 diff changeset	540 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	541 const QString& tip)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	542 {
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	543 QObject *fileEditorTab = sender();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	544 if (fileEditorTab)
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	545 {
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	546 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	547 {
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	548 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	549 {
16307 f299079ed03a avoid shadowed variable warning from GCC John W. Eaton <jwe@octave.org> parents: 16176 diff changeset	550 _tab_widget->setTabText (i, fname);
f299079ed03a avoid shadowed variable warning from GCC John W. Eaton <jwe@octave.org> parents: 16176 diff changeset	551 _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	552 }
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	553 }
13524 8c143d6d0330 gui-editor: improved behaviour when closing a modified file ttl (Torsten) <ttl@justmail.de> parents: 13506 diff changeset	554 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	555 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	556
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	557 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	558 file_editor::handle_tab_close_request (int index)
13529 8e87f3ba3beb gui-editor: enabled 'Save File As' ttl <ttl@justmail.de> parents: 13524 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 // 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	561 // 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	562 // 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	563 // 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	564 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	565 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	566 }
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	567
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	568 void
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	569 file_editor::handle_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	570 {
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	571 QObject *fileEditorTab = sender();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	572 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	573 {
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	574 for(int i = 0; i < _tab_widget->count (); 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	575 {
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	576 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	577 {
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	578 _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	579 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	580 }
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	581 }
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	582 }
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	583 }
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	584
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	585 void
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	586 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	587 {
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	588 // 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	589
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	590 editor_tab_map[fileName] = ID;
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	591 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	592
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	593 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	594 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	595 {
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	596 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	597 }
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	598
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	599 void
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	600 file_editor::handle_editor_state_changed (bool copy_available, 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	601 {
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	602 // 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	603 // all the file editor tabs, just process info from the current active 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	604 if (sender() == _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	605 {
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	606 _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	607 _cut_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	608 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	609 {
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	610 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	611 int lastslash = ced.lastIndexOf ('/');
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	612 // 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	613 // 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	614 if (lastslash > 0 && lastslash != ced.count ())
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	615 {
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	616 ced = ced.left (lastslash);
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	617 }
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	618 }
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	619 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	620 }
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	621 }
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	622
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	623 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	624 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	625 {
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16517 diff changeset	626 int icon_size = settings->value ("toolbar_icon_size",24).toInt ();
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16517 diff changeset	627 _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	628 // 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	629 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	630 }
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	631
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	632 void
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	633 file_editor::construct ()
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13504 diff changeset	634 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	635 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	636
9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15873 diff changeset	637 // 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	638 // QStyle *editor_style = QApplication::style ();
13566 d22b9973120f Renamed language files to match convention. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13562 diff changeset	639
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	640 _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	641 _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	642 _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	643 _tab_widget->setTabsClosable (true);
13562 a89aa9e05e19 editor: menu bar, run editor file in octave ttl <ttl@justmail.de> parents: 13558 diff changeset	644
14727 f34984656658 Added crystal project icons. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14718 diff changeset	645 QAction *new_action = new QAction (QIcon(":/actions/icons/filenew.png"),
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	646 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	647
14727 f34984656658 Added crystal project icons. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14718 diff changeset	648 QAction *open_action = new QAction (QIcon(":/actions/icons/fileopen.png"),
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	649 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	650
14727 f34984656658 Added crystal project icons. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14718 diff changeset	651 QAction *save_action = new QAction (QIcon(":/actions/icons/filesave.png"),
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	652 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	653
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	654 QAction *save_as_action
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	655 = new QAction (QIcon(":/actions/icons/filesaveas.png"),
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	656 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	657
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	658 QAction *print_action
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	659 = new QAction ( QIcon(":/actions/icons/fileprint.png"),
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	660 tr ("Print"), _tool_bar);
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	661
14727 f34984656658 Added crystal project icons. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14718 diff changeset	662 QAction *undo_action = new QAction (QIcon(":/actions/icons/undo.png"),
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	663 tr("&Undo"), _tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	664
14727 f34984656658 Added crystal project icons. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14718 diff changeset	665 QAction *redo_action = new QAction (QIcon(":/actions/icons/redo.png"),
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	666 tr("&Redo"), _tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	667
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	668 _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	669 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	670
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	671 _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	672 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	673
14727 f34984656658 Added crystal project icons. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14718 diff changeset	674 QAction *paste_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	675 = new QAction (QIcon (":/actions/icons/editpaste.png"),
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	676 tr("Paste"), _tool_bar);
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	677 QAction *next_bookmark_action = new QAction (tr ("&Next Bookmark"),_tool_bar);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	678 QAction *previous_bookmark_action = new QAction (tr ("Pre&vious Bookmark"),_tool_bar);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	679 QAction *toggle_bookmark_action = new QAction (tr ("Toggle &Bookmark"),_tool_bar);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	680 QAction *remove_bookmark_action = 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	681
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	682 QAction *next_breakpoint_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	683 = 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	684 tr ("&Next breakpoint"), _tool_bar);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	685 QAction *previous_breakpoint_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	686 = 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	687 tr ("Pre&vious breakpoint"), _tool_bar);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	688 QAction *toggle_breakpoint_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	689 = 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	690 tr ("Toggle &breakpoint"), _tool_bar);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	691 QAction *remove_all_breakpoints_action
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	692 = 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	693 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	694
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	695 QAction *comment_selection_action = new QAction (tr ("&Comment Selected Text"),_tool_bar);
3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	696 QAction *uncomment_selection_action = new QAction (tr ("&Uncomment Selected Text"),_tool_bar);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	697
16517 b348c5835ce4 * file-editor.cc(construct): icon search.png instead of find.png Torsten <ttl@justmail.de> parents: 16457 diff changeset	698 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	699 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	700
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	701 _run_action = new QAction (QIcon(":/actions/icons/artsbuilderexecute.png"),
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	702 tr("Save File And Run"), _tool_bar);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	703
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	704 QAction *goto_line_action = new QAction (tr ("Go&to Line"), _tool_bar);
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	705
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	706 // 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	707 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	708 // 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	709 _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	710 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	711 {
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	712 _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	713 _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	714 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	715
13584 e76a22bfe406 editor: added bookmark feature ttl <ttl@justmail.de> parents: 13566 diff changeset	716 // some actions are disabled from the beginning
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	717 _copy_action->setEnabled(false);
b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	718 _cut_action->setEnabled(false);
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	719 _run_action->setShortcut (Qt::ControlModifier+ Qt::Key_R);
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	720 _run_action->setShortcutContext (Qt::WindowShortcut);
16176 74ba79f79fcc gui: improve shortcuts for the editor (bug #38383) and for widget navigation Torsten <ttl@justmail.de> parents: 16175 diff changeset	721 save_action->setShortcut (QKeySequence::Save);
74ba79f79fcc gui: improve shortcuts for the editor (bug #38383) and for widget navigation Torsten <ttl@justmail.de> parents: 16175 diff changeset	722 save_action->setShortcutContext (Qt::WindowShortcut);
74ba79f79fcc gui: improve shortcuts for the editor (bug #38383) and for widget navigation Torsten <ttl@justmail.de> parents: 16175 diff changeset	723 save_as_action->setShortcut (QKeySequence::SaveAs);
74ba79f79fcc gui: improve shortcuts for the editor (bug #38383) and for widget navigation Torsten <ttl@justmail.de> parents: 16175 diff changeset	724 save_as_action->setShortcutContext (Qt::WindowShortcut);
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	725
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	726 print_action->setShortcut (QKeySequence::Print);
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	727 print_action->setShortcutContext (Qt::WindowShortcut);
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	728
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	729 next_bookmark_action->setShortcut (Qt::Key_F2);
14785 7e41fcbb23a4 Fixed shortcuts in file editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14778 diff changeset	730 next_bookmark_action->setShortcutContext (Qt::WindowShortcut);
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	731 previous_bookmark_action->setShortcut (Qt::SHIFT + Qt::Key_F2);
14785 7e41fcbb23a4 Fixed shortcuts in file editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14778 diff changeset	732 previous_bookmark_action->setShortcutContext (Qt::WindowShortcut);
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	733 toggle_bookmark_action->setShortcut (Qt::Key_F7);
14785 7e41fcbb23a4 Fixed shortcuts in file editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14778 diff changeset	734 toggle_bookmark_action->setShortcutContext (Qt::WindowShortcut);
14812 9d9eb9bac65e Improved menu structure of file, edit and window menu. Removed ambiguous shortcuts, improved focus handling for operating the GUI with the keyboard. Added new shortcuts to focus subwindows directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	735 comment_selection_action->setShortcut (Qt::ControlModifier + Qt::Key_7);
14785 7e41fcbb23a4 Fixed shortcuts in file editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14778 diff changeset	736 comment_selection_action->setShortcutContext (Qt::WindowShortcut);
14812 9d9eb9bac65e Improved menu structure of file, edit and window menu. Removed ambiguous shortcuts, improved focus handling for operating the GUI with the keyboard. Added new shortcuts to focus subwindows directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	737 uncomment_selection_action->setShortcut (Qt::ControlModifier + Qt::Key_8);
14785 7e41fcbb23a4 Fixed shortcuts in file editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14778 diff changeset	738 uncomment_selection_action->setShortcutContext(Qt::WindowShortcut);
16176 74ba79f79fcc gui: improve shortcuts for the editor (bug #38383) and for widget navigation Torsten <ttl@justmail.de> parents: 16175 diff changeset	739 find_action->setShortcut (QKeySequence::Find);
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	740 find_action->setShortcutContext (Qt::WindowShortcut);
16389 f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16386 diff changeset	741 goto_line_action->setShortcut (Qt::ControlModifier+ Qt::Key_G);
f5204f486a29 gui: add shortcut for goto line action in the editor and center the target line Torsten <ttl@justmail.de> parents: 16386 diff changeset	742 goto_line_action->setShortcutContext (Qt::WindowShortcut);
13556 0d18b0e168ae editor: shortcuts for toolbar actions, window icon ttl <ttl@justmail.de> parents: 13555 diff changeset	743
13562 a89aa9e05e19 editor: menu bar, run editor file in octave ttl <ttl@justmail.de> parents: 13558 diff changeset	744 // toolbar
14718 3df7ef0080c7 Added event based processing and implement exit and change directory event. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	745 _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	746 _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	747 _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	748 _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	749 _tool_bar->addSeparator ();
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	750 _tool_bar->addAction(print_action);
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	751 _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	752 _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	753 _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	754 _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	755 _tool_bar->addAction (_cut_action);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	756 _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	757 _tool_bar->addSeparator ();
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	758 _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	759 _tool_bar->addAction (_run_action);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	760 _tool_bar->addSeparator ();
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	761 _tool_bar->addAction (toggle_breakpoint_action);
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	762 _tool_bar->addAction (next_breakpoint_action);
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	763 _tool_bar->addAction (previous_breakpoint_action);
59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	764 _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	765
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	766 // 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	767 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	768 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	769 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	770 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	771 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	772 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	773 _mru_file_menu = new QMenu (tr ("&Recent Editor Files"), fileMenu);
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	774 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	775 {
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	776 _mru_file_menu->addAction (_mru_file_actions[i]);
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	777 }
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	778 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	779 _menu_bar->addMenu (fileMenu);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	780
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	781 fileMenu->addSeparator ();
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	782 fileMenu->addAction (print_action);
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	783
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	784 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	785 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	786 editMenu->addAction (redo_action);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	787 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	788 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	789 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	790 editMenu->addAction (paste_action);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	791 editMenu->addSeparator ();
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	792 editMenu->addAction (find_action);
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	793 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	794 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	795 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	796 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	797 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	798 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	799 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	800 editMenu->addAction (remove_bookmark_action);
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	801 editMenu->addSeparator ();
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	802 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	803 _menu_bar->addMenu (editMenu);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	804
14778 f43916137064 Added debug menu to file editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	805 _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	806 _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	807 _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	808 _debug_menu->addAction (previous_breakpoint_action);
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	809 _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	810 _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	811 // 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	812 _menu_bar->addMenu (_debug_menu);
f43916137064 Added debug menu to file editor. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14727 diff changeset	813
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	814 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	815 _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	816 _menu_bar->addMenu (_run_menu);
13566 d22b9973120f Renamed language files to match convention. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13562 diff changeset	817
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	818 QVBoxLayout *vbox_layout = new QVBoxLayout ();
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	819 vbox_layout->addWidget (_menu_bar);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	820 vbox_layout->addWidget (_tool_bar);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	821 vbox_layout->addWidget (_tab_widget);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	822 vbox_layout->setMargin (0);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	823 editor_widget->setLayout (vbox_layout);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	824 setWidget (editor_widget);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	825
16455 38ed6bdd1f7f move signal/slot connections from main window to sub window where possible John W. Eaton <jwe@octave.org> parents: 16452 diff changeset	826 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	827 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	828
16457 10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	829 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	830 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	831
10edb6f1ae98 improve encapsulation of file editor window object John W. Eaton <jwe@octave.org> parents: 16455 diff changeset	832 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	833 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	834
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	835 connect (new_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	836 SIGNAL (triggered ()), this, SLOT (request_new_file ()));
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	837 connect (open_action,
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	838 SIGNAL (triggered ()), this, SLOT (request_open_file ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	839 connect (undo_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	840 SIGNAL (triggered ()), this, SLOT (request_undo ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	841 connect (redo_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	842 SIGNAL (triggered ()), this, SLOT (request_redo ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	843 connect (_copy_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	844 SIGNAL (triggered ()), this, SLOT (request_copy ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	845 connect (_cut_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	846 SIGNAL (triggered ()), this, SLOT (request_cut ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	847 connect (paste_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	848 SIGNAL (triggered ()), this, SLOT (request_paste ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	849 connect (save_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	850 SIGNAL (triggered ()), this, SLOT (request_save_file ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	851 connect (save_as_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	852 SIGNAL (triggered ()), this, SLOT (request_save_file_as ()));
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	853 connect (print_action,
aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	854 SIGNAL (triggered ()), this, SLOT (request_print_file ()));
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	855 connect (_run_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	856 SIGNAL (triggered ()), this, SLOT (request_run_file ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	857 connect (toggle_bookmark_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	858 SIGNAL (triggered ()), this, SLOT (request_toggle_bookmark ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	859 connect (next_bookmark_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	860 SIGNAL (triggered ()), this, SLOT (request_next_bookmark ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	861 connect (previous_bookmark_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	862 SIGNAL (triggered ()), this, SLOT (request_previous_bookmark ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	863 connect (remove_bookmark_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	864 SIGNAL (triggered ()), this, SLOT (request_remove_bookmark ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	865 connect (toggle_breakpoint_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	866 SIGNAL (triggered ()), this, SLOT (request_toggle_breakpoint ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	867 connect (next_breakpoint_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	868 SIGNAL (triggered ()), this, SLOT (request_next_breakpoint ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	869 connect (previous_breakpoint_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	870 SIGNAL (triggered ()), this, SLOT (request_previous_breakpoint ()));
15106 59175df7dcf6 Created and added debug action icons. Jacob Dawid <jacob.dawid@gmail.com> parents: 15105 diff changeset	871 connect (remove_all_breakpoints_action,
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	872 SIGNAL (triggered ()), this, SLOT (request_remove_breakpoint ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	873 connect (comment_selection_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	874 SIGNAL (triggered ()), this, SLOT (request_comment_selected_text ()));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	875 connect (uncomment_selection_action,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	876 SIGNAL (triggered ()), this, SLOT (request_uncomment_selected_text ()));
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	877 connect (find_action,
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	878 SIGNAL (triggered ()), this, SLOT (request_find ()));
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	879
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	880 connect (goto_line_action,
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	881 SIGNAL (triggered ()), this, SLOT (request_goto_line ()));
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16307 diff changeset	882
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	883 // 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	884 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	885 {
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	886 connect(_mru_file_actions[i], SIGNAL (triggered ()), this, SLOT (request_mru_open_file ()));
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	887 }
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	888 mru_menu_update ();
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	889 connect (_tab_widget,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	890 SIGNAL (tabCloseRequested (int)), this, SLOT (handle_tab_close_request (int)));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	891 connect (_tab_widget,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14874 diff changeset	892 SIGNAL (currentChanged(int)), 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	893
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	894 resize (500, 400);
15552 bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15425 diff changeset	895 setWindowIcon (QIcon(":/actions/icons/logo.png"));
bbbb89cc338f make a floating widget behave like a normal window (bug #37190) Torsten <ttl@justmail.de> parents: 15425 diff changeset	896 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	897
842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15321 diff changeset	898 //restore previous session
842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15321 diff changeset	899 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	900 {
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	901 QStringList sessionFileNames = 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	902
15425 8ae34ffe5c1b Retain QsciAPIs lexer_api as part of lexer_octave_gui object (bug #37359) Daniel J Sebald <daniel.sebald@ieee.org> parents: 15389 diff changeset	903 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	904 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	905 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	906 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	907
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	908 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	909 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	910 {
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	911 _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	912
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	913 // 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	914 connect (f, SIGNAL (file_name_changed (const QString&, const QString&)),
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	915 this, SLOT (handle_file_name_changed (const QString&, 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	916 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	917 this, SLOT (handle_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	918 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	919 this, SLOT (handle_tab_remove_request ()));
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	920 connect (f, SIGNAL (add_filename_to_list (const QString&, QWidget *)),
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	921 this, SLOT (handle_add_filename_to_list (const QString&, QWidget *)));
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	922 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	923 this, SLOT (check_conflict_save (const QString&, bool)));
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15848 diff changeset	924 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	925 this, SLOT (handle_mru_add_file (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	926 connect (f, SIGNAL (process_octave_code (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	927 parent (), SLOT (handle_command_double_clicked (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	928
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	929 // 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	930 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	931 f, SLOT (notice_settings (const QSettings *)));
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	932 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	933 f, SLOT (conditional_close (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	934 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	935 f, SLOT (change_editor_state (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	936 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	937 f, SLOT (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	938 connect (this, SIGNAL (fetab_save_file (const QWidget*, 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	939 f, SLOT (save_file (const QWidget*, 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	940 // 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	941 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	942 f, SLOT (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	943 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	944 f, SLOT (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	945 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	946 f, SLOT (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	947 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	948 f, SLOT (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	949 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	950 f, SLOT (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	951 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	952 f, SLOT (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	953 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	954 f, SLOT (save_file_as (const QWidget*)));
16440 aaf024ac8015 Add editor print menu/toolbutton implementation John Donoghue <john.donoghue@ieee.org> parents: 16438 diff changeset	955 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	956 f, SLOT (print_file (const QWidget*)));
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	957 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	958 f, SLOT (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	959 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	960 f, SLOT (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	961 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	962 f, SLOT (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	963 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	964 f, SLOT (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	965 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	966 f, SLOT (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	967 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	968 f, SLOT (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	969 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	970 f, SLOT (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	971 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	972 f, SLOT (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	973 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	974 f, SLOT (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	975 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	976 f, SLOT (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	977 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	978 f, SLOT (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	979 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	980 f, SLOT (find (const QWidget*)));
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	981 connect (this, SIGNAL (fetab_goto_line (const QWidget *, int)),
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	982 f, SLOT (goto_line (const QWidget *, int)));
15980 6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15901 diff changeset	983 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	984 f, SLOT (set_focus (const QWidget*)));
16395 fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	985 connect (this, SIGNAL (fetab_insert_debugger_pointer (const QWidget *, int)),
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	986 f, SLOT (insert_debugger_pointer (const QWidget *, int)));
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	987 connect (this, SIGNAL (fetab_delete_debugger_pointer (const QWidget *, int)),
fc491da603f6 also provide a hook for exiting debugger John W. Eaton <jwe@octave.org> parents: 16389 diff changeset	988 f, SLOT (delete_debugger_pointer (const QWidget *, int)));
16443 7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	989 connect (this, SIGNAL (fetab_do_breakpoint_marker (bool, const QWidget *, int)),
7a2ee6ea7800 rename dbstop -> breakpoint in GUI interface functions John W. Eaton <jwe@octave.org> parents: 16440 diff changeset	990 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	991
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	992 _tab_widget->setCurrentWidget (f);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14674 diff changeset	993 }
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	994
7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15861 diff changeset	995 #endif

Mercurial > octave

annotate libgui/src/m-editor/file-editor.cc @ 16525:e192525236ad