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

annotate libgui/src/m-editor/file-editor-tab.cc @ 15355:a9fd6821eedf

GUI: recognize editor prefences for long title names; changed default value to false * file-editor-tab.cc (file-editor-tab::file-editor-tab): read long title bool from settings * settings-dialog.cc (settings-dialog::settings-dialog): change long title default to false

author	Thorsten Liebig <Thorsten.Liebig@gmx.de>
date	Tue, 11 Sep 2012 10:50:43 +0200
parents	eefbbc1ed60e
children	842ab161c10a

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 */
14676 35512b788af2 Editor can now handle multiple files in tabs. 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: 15257 diff changeset	23 #ifdef HAVE_CONFIG_H
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15257 diff changeset	24 #include <config.h>
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15257 diff changeset	25 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15257 diff changeset	26
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	27 #include "file-editor-tab.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	28 #include "file-editor.h"
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	29 #include "find-dialog.h"
14804 a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	30 #include "octave-link.h"
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	31
14873 355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	32
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	33 #include <Qsci/qsciapis.h>
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	34 // Not available in the Debian repos yet!
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	35 // #include <Qsci/qscilexeroctave.h>
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	36 #include "lexer-octave-gui.h"
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	37 #include <Qsci/qscilexercpp.h>
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	38 #include <Qsci/qscilexerbash.h>
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	39 #include <Qsci/qscilexerperl.h>
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	40 #include <Qsci/qscilexerbatch.h>
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	41 #include <Qsci/qscilexerdiff.h>
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	42 #include "resource-manager.h"
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	43 #include <QApplication>
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	44 #include <QFileDialog>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	45 #include <QMessageBox>
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	46 #include <QTextStream>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	47 #include <QVBoxLayout>
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	48
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	49 file_editor_tab::file_editor_tab(file_editor *fileEditor)
14804 a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	50 : QWidget ((QWidget*)fileEditor), octave_event_observer ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	51 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15080 diff changeset	52 QSettings *settings = resource_manager::get_settings ();
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15080 diff changeset	53
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15080 diff changeset	54 // FIXME -- what should happen if settings is 0?
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15080 diff changeset	55
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	56 _file_editor = fileEditor;
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	57 _file_name = "";
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	58 _edit_area = new QsciScintilla (this);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	59
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: 14804 diff changeset	60 // symbols
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	61 _edit_area->setMarginType (1, QsciScintilla::SymbolMargin);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	62 _edit_area->setMarginSensitivity (1, true);
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: 14804 diff changeset	63 _edit_area->markerDefine (QsciScintilla::RightTriangle, bookmark);
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	64 _edit_area->markerDefine (QPixmap (":/actions/icons/redled.png"),
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	65 breakpoint);
14826 ed0f820c7ce0 Changed QImage to QPixmap to allow compilation with QScintilla2 < 2.6. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14825 diff changeset	66 _edit_area->markerDefine (QPixmap (":/actions/icons/arrow_right.png"),
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: 14804 diff changeset	67 debugger_position);
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: 14804 diff changeset	68
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	69 connect (_edit_area, SIGNAL (marginClicked (int, int,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	70 Qt::KeyboardModifiers)),
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	71 this, SLOT (handle_margin_clicked (int, int,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	72 Qt::KeyboardModifiers)));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	73
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	74 // line numbers
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	75 _edit_area->setMarginsForegroundColor(QColor(96,96,96));
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	76 _edit_area->setMarginsBackgroundColor(QColor(232,232,220));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	77 if (settings->value ("editor/showLineNumbers",true).toBool ())
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	78 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	79 QFont marginFont( settings->value ("editor/fontName","Courier").toString () ,
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	80 settings->value ("editor/fontSize",10).toInt () );
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	81 _edit_area->setMarginsFont( marginFont );
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	82 QFontMetrics metrics(marginFont);
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	83 _edit_area->setMarginType (2, QsciScintilla::TextMargin);
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: 14804 diff changeset	84 _edit_area->setMarginWidth(2, metrics.width("9999"));
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: 14804 diff changeset	85 _edit_area->setMarginLineNumbers (2, true);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	86 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	87
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	88 // code folding
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	89 _edit_area->setMarginType (3, QsciScintilla::SymbolMargin);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	90 _edit_area->setFolding (QsciScintilla::BoxedTreeFoldStyle , 3);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	91
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	92 // other features
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	93 if (settings->value ("editor/highlightCurrentLine",true).toBool ())
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	94 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	95 _edit_area->setCaretLineVisible(true);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	96 _edit_area->setCaretLineBackgroundColor(QColor(245,245,245));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	97 }
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	98 _edit_area->setBraceMatching (QsciScintilla::StrictBraceMatch);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	99 _edit_area->setAutoIndent (true);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	100 _edit_area->setIndentationWidth (2);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	101 _edit_area->setIndentationsUseTabs (false);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	102 if (settings->value ("editor/codeCompletion",true).toBool ())
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	103 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	104 _edit_area->autoCompleteFromAll ();
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	105 _edit_area->setAutoCompletionSource(QsciScintilla::AcsAll);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	106 _edit_area->setAutoCompletionThreshold (1);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	107 }
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	108 _edit_area->setUtf8 (true);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	109
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	110 QVBoxLayout *layout = new QVBoxLayout ();
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	111 layout->addWidget (_edit_area);
14680 628eeaf879f7 Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14676 diff changeset	112 layout->setMargin (0);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	113 setLayout (layout);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	114
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	115 // connect modified signal
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	116 connect (_edit_area, SIGNAL (modificationChanged (bool)),
14788 85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	117 this, SLOT (update_window_title (bool)));
14715 b4db843b1f26 Done some extra method renaming to fit the overall octave coding style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	118 connect (_edit_area, SIGNAL (copyAvailable (bool)),
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	119 this, SLOT (handle_copy_available (bool)));
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	120 connect (&_file_system_watcher, SIGNAL (fileChanged (QString)),
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	121 this, SLOT (file_has_changed (QString)));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	122
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	123 _file_name = "";
15355 a9fd6821eedf GUI: recognize editor prefences for long title names; changed default value to false Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15320 diff changeset	124 _long_title = settings->value ("editor/longWindowTitle",false).toBool ();
14788 85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	125 update_window_title (false);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	126 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	127
14680 628eeaf879f7 Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14676 diff changeset	128 bool
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	129 file_editor_tab::copy_available ()
14680 628eeaf879f7 Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14676 diff changeset	130 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	131 return _copy_available;
14680 628eeaf879f7 Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14676 diff changeset	132 }
628eeaf879f7 Copy/Paste buttons get greyed out in the editor correctly again. Removed margin in editor tabs and status bar. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14676 diff changeset	133
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	134 void
14804 a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	135 file_editor_tab::event_accepted (octave_event *e)
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	136 {
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	137 if (dynamic_cast<octave_run_file_event*> (e))
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	138 {
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	139 // File was run successfully.
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	140 }
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	141
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	142 if (octave_add_breakpoint_event *abe
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	143 = dynamic_cast<octave_add_breakpoint_event*> (e))
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	144 {
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	145 // TODO: Check file.
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	146 _edit_area->markerAdd (abe->get_line (), breakpoint);
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	147 }
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	148
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	149 if (octave_remove_breakpoint_event *rbe
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	150 = dynamic_cast<octave_remove_breakpoint_event*> (e))
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	151 {
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	152 // TODO: Check file.
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	153 _edit_area->markerDelete (rbe->get_line (), breakpoint);
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	154 }
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	155
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	156 if (octave_remove_all_breakpoints_event *rabe
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	157 = dynamic_cast<octave_remove_all_breakpoints_event*> (e))
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	158 {
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	159 Q_UNUSED (rabe);
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	160 _edit_area->markerDeleteAll (breakpoint);
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	161 }
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	162
14804 a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	163 delete e;
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	164 }
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	165
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	166 void
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	167 file_editor_tab::event_reject (octave_event *e)
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	168 {
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	169 if (dynamic_cast<octave_run_file_event*> (e))
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	170 {
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	171 // Running file failed.
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	172 }
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	173 delete e;
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	174 }
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	175
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	176 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	177 file_editor_tab::closeEvent (QCloseEvent *event)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	178 {
14795 e3ae0850b105 Fixed integrating debug menu in the editor window. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14788 diff changeset	179 if (_file_editor->get_main_window ()->is_closing ())
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	180 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	181 // close whole application: save file or not if modified
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	182 check_file_modified ("Closing Octave", 0); // no cancel possible
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	183 event->accept ();
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	184 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	185 else
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	186 {
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	187 // ignore close event if file is not saved and user cancels
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	188 // closing this window
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	189 if (check_file_modified ("Close File",
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	190 QMessageBox::Cancel) == QMessageBox::Cancel)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	191 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	192 event->ignore ();
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	193 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	194 else
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	195 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	196 event->accept();
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	197 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	198 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	199 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	200
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	201 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	202 file_editor_tab::set_file_name (const QString& fileName)
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: 14680 diff changeset	203 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	204 _file_name = fileName;
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	205 update_lexer ();
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	206 update_tracked_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: 14680 diff changeset	207 }
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: 14680 diff changeset	208
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: 14680 diff changeset	209 void
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	210 file_editor_tab::handle_margin_clicked(int margin, int line,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	211 Qt::KeyboardModifiers state)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	212 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	213 Q_UNUSED (state);
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: 14804 diff changeset	214 if (margin == 1)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	215 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	216 unsigned int mask = _edit_area->markersAtLine (line);
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: 14804 diff changeset	217
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: 14804 diff changeset	218 if (state & Qt::ControlModifier)
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: 14804 diff changeset	219 {
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: 14804 diff changeset	220 if (mask && (1 << bookmark))
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: 14804 diff changeset	221 _edit_area->markerDelete(line,bookmark);
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: 14804 diff changeset	222 else
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: 14804 diff changeset	223 _edit_area->markerAdd(line,bookmark);
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: 14804 diff changeset	224 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	225 else
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: 14804 diff changeset	226 {
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: 14804 diff changeset	227 if (mask && (1 << breakpoint))
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	228 {
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	229 request_remove_breakpoint (line);
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	230 }
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: 14804 diff changeset	231 else
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	232 {
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	233 request_add_breakpoint (line);
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	234 }
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: 14804 diff changeset	235 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	236 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	237 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	238
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	239 void
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	240 file_editor_tab::update_lexer ()
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	241 {
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	242 QsciLexer *lexer = _edit_area->lexer ();
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	243 delete lexer;
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	244
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	245 if (_file_name.endsWith (".m") \|\| _file_name.endsWith (".M"))
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	246 {
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	247 lexer = new lexer_octave_gui ();
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	248
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	249 // The API info that is used for auto completion
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	250 // TODO: Where to store a file with API info (raw or prepared?)?
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	251 // TODO: Also provide infos on octave-forge functions?
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	252 // TODO: Also provide infos on function parameters?
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	253 // By now, use the keywords-list from syntax highlighting
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	254
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	255 QsciAPIs *lexer_api = new QsciAPIs (lexer);
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	256
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	257 QString keyword;
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	258 QStringList keywordList;
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	259
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	260 // get whole string with all keywords
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	261 keyword = lexer->keywords (1);
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	262 // split into single strings
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	263 keywordList = keyword.split (QRegExp ("\\s+"));
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	264
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	265 int i;
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	266 for (i = 0; i < keywordList.size (); i++)
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	267 {
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	268 // add single strings to the API
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	269 lexer_api->add (keywordList.at (i));
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	270 }
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	271 // prepare API info ... this make take some time
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	272 lexer_api->prepare ();
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	273 }
14874 5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	274 else if (_file_name.endsWith (".c")
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	275 \|\| _file_name.endsWith (".cc")
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	276 \|\| _file_name.endsWith (".cpp")
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	277 \|\| _file_name.endsWith (".cxx")
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	278 \|\| _file_name.endsWith (".c++")
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	279 \|\| _file_name.endsWith (".h")
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	280 \|\| _file_name.endsWith (".hh")
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	281 \|\| _file_name.endsWith (".hpp")
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	282 \|\| _file_name.endsWith (".h++"))
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	283 {
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	284 lexer = new QsciLexerCPP ();
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	285 }
14873 355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	286 else if (_file_name.endsWith (".pl"))
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	287 {
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	288 lexer = new QsciLexerPerl ();
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	289 }
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	290 else if (_file_name.endsWith (".bat"))
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	291 {
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	292 lexer = new QsciLexerBatch ();
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	293 }
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	294 else if (_file_name.endsWith (".diff"))
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	295 {
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	296 lexer = new QsciLexerDiff ();
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	297 }
14874 5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	298 else // Default to bash lexer.
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	299 {
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	300 lexer = new QsciLexerBash ();
5d74d8b982a5 Forgot to have a fallback lexer when the file suffix is unknown. Removed unused variable and added comments. Jacob Dawid <jacob.dawid@gmail.com> parents: 14873 diff changeset	301 }
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	302
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15080 diff changeset	303 QSettings *settings = resource_manager::get_settings ();
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15080 diff changeset	304
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15080 diff changeset	305 // FIXME -- what should happen if settings is 0?
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	306
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	307 // Editor font (default or from settings)
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	308 lexer->setDefaultFont (QFont (
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	309 settings->value ("editor/fontName",
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	310 "Courier").toString (),
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	311 settings->value ("editor/fontSize",
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	312 10).toInt ()));
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	313
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	314 // TODO: Autoindent not working as it should
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	315 lexer->setAutoIndentStyle (QsciScintilla::AiMaintain \|\|
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	316 QsciScintilla::AiOpening \|\|
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	317 QsciScintilla::AiClosing);
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	318
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	319 _edit_area->setLexer (lexer);
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	320 }
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	321
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	322 void
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	323 file_editor_tab::request_add_breakpoint (int line)
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	324 {
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	325 QFileInfo file_info (_file_name);
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	326 QString path = file_info.absolutePath ();
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	327 QString function_name = file_info.fileName ();
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	328
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	329 // We have to cut off the suffix, because octave appends it.
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	330 function_name.chop (file_info.suffix ().length () + 1);
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	331
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	332 octave_link::instance ()->post_event
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	333 (new octave_add_breakpoint_event (*this,
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	334 path.toStdString (),
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	335 function_name.toStdString (),
14833 422b0b2ce5f8 Second attempt to fix setting breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14832 diff changeset	336 line));
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	337 }
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	338
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	339 void
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	340 file_editor_tab::request_remove_breakpoint (int line)
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	341 {
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	342 QFileInfo file_info (_file_name);
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	343 QString path = file_info.absolutePath ();
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	344 QString function_name = file_info.fileName ();
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	345
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	346 // We have to cut off the suffix, because octave appends it.
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	347 function_name.chop (file_info.suffix ().length () + 1);
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	348
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	349 octave_link::instance ()->post_event
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	350 (new octave_remove_breakpoint_event (*this,
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	351 path.toStdString (),
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	352 function_name.toStdString (),
14833 422b0b2ce5f8 Second attempt to fix setting breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14832 diff changeset	353 line));
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	354 }
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	355
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	356 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	357 file_editor_tab::comment_selected_text ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	358 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	359 do_comment_selected_text (true);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	360 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	361
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	362 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	363 file_editor_tab::uncomment_selected_text ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	364 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	365 do_comment_selected_text (false);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	366 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	367
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	368 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	369 file_editor_tab::do_comment_selected_text (bool comment)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	370 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	371 if ( _edit_area->hasSelectedText() )
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	372 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	373 int lineFrom, lineTo, colFrom, colTo, i;
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	374 _edit_area->getSelection (&lineFrom,&colFrom,&lineTo,&colTo);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	375 if ( colTo == 0 ) // the beginning of last line is not selected
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	376 lineTo--; // stop at line above
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	377 _edit_area->beginUndoAction ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	378 for ( i=lineFrom; i<=lineTo; i++ )
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	379 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	380 if ( comment )
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	381 _edit_area->insertAt("%",i,0);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	382 else
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	383 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	384 QString line(_edit_area->text(i));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	385 if ( line.startsWith("%") )
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	386 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	387 _edit_area->setSelection(i,0,i,1);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	388 _edit_area->removeSelectedText();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	389 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	390 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	391 }
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	392 _edit_area->endUndoAction ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	393 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	394 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	395
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	396 void
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	397 file_editor_tab::find ()
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	398 {
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	399 find_dialog dialog (_edit_area);
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	400 dialog.exec ();
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	401 }
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	402
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	403 void
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	404 file_editor_tab::update_window_title (bool modified)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	405 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	406 QString title(_file_name);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	407 if ( !_long_title )
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	408 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	409 QFileInfo file(_file_name);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	410 title = file.fileName();
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	411 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	412
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	413 if ( modified )
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	414 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	415 emit file_name_changed (title.prepend("* "));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	416 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	417 else
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	418 emit file_name_changed (title);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	419 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	420
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	421 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	422 file_editor_tab::handle_copy_available(bool enableCopy)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	423 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	424 _copy_available = enableCopy;
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	425 emit editor_state_changed ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	426 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	427
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: 14680 diff changeset	428 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	429 file_editor_tab::update_tracked_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: 14680 diff changeset	430 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	431 QStringList trackedFiles = _file_system_watcher.files ();
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: 14680 diff changeset	432 if (!trackedFiles.isEmpty ())
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	433 _file_system_watcher.removePaths (trackedFiles);
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: 14680 diff changeset	434
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	435 if (_file_name != UNNAMED_FILE)
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	436 _file_system_watcher.addPath (_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: 14680 diff changeset	437 }
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: 14680 diff changeset	438
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	439 int
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	440 file_editor_tab::check_file_modified (const QString& msg, int cancelButton)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	441 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	442 int decision = QMessageBox::Yes;
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	443 if (_edit_area->isModified ())
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	444 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	445 // file is modified but not saved, aks user what to do
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	446 decision = QMessageBox::warning (this,
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	447 msg,
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	448 tr ("The file %1\n"
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	449 "has been modified. Do you want to save the changes?").
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	450 arg (_file_name),
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	451 QMessageBox::Save,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	452 QMessageBox::Discard, cancelButton );
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	453 if (decision == QMessageBox::Save)
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	454 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	455 save_file ();
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	456 if (_edit_area->isModified ())
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	457 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	458 // If the user attempted to save the file, but it's still
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	459 // modified, then probably something went wrong, so return
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	460 // cancel for cancel this operation or try to save files
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	461 // as if cancel not possible
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	462 if ( cancelButton )
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	463 return (QMessageBox::Cancel);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	464 else
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	465 save_file_as ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	466 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	467 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	468 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	469 return (decision);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	470 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	471
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	472 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	473 file_editor_tab::remove_bookmark ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	474 {
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: 14804 diff changeset	475 _edit_area->markerDeleteAll (bookmark);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	476 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	477
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	478 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	479 file_editor_tab::toggle_bookmark ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	480 {
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: 14804 diff changeset	481 int line, cur;
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: 14804 diff changeset	482 _edit_area->getCursorPosition (&line,&cur);
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: 14804 diff changeset	483 if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
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: 14804 diff changeset	484 _edit_area->markerDelete (line, bookmark);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	485 else
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: 14804 diff changeset	486 _edit_area->markerAdd (line, bookmark);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	487 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	488
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	489 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: 14804 diff changeset	490 file_editor_tab::next_bookmark()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	491 {
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: 14804 diff changeset	492 int line, cur, nextline;
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: 14804 diff changeset	493 _edit_area->getCursorPosition (&line, &cur);
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: 14804 diff changeset	494 if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
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: 14804 diff changeset	495 line++; // we have a breakpoint here, so start search from next line
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: 14804 diff changeset	496 nextline = _edit_area->markerFindNext (line, (1 << bookmark));
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: 14804 diff changeset	497 _edit_area->setCursorPosition (nextline, 0);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	498 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	499
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	500 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	501 file_editor_tab::previous_bookmark ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	502 {
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: 14804 diff changeset	503 int line, cur, prevline;
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: 14804 diff changeset	504 _edit_area->getCursorPosition (&line, &cur);
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: 14804 diff changeset	505 if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
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: 14804 diff changeset	506 line--; // we have a breakpoint here, so start search from prev line
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: 14804 diff changeset	507 prevline = _edit_area->markerFindPrevious (line, (1 << bookmark));
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: 14804 diff changeset	508 _edit_area->setCursorPosition (prevline, 0);
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: 14804 diff changeset	509 }
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: 14804 diff changeset	510
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: 14804 diff changeset	511 void
14829 e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	512 file_editor_tab::remove_all_breakpoints ()
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: 14804 diff changeset	513 {
14829 e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	514 QFileInfo file_info (_file_name);
e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	515 QString path = file_info.absolutePath ();
e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	516 QString function_name = file_info.fileName ();
e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	517
e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	518 // We have to cut off the suffix, because octave appends it.
e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	519 function_name.chop (file_info.suffix ().length () + 1);
e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	520
e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	521 octave_link::instance ()->post_event
e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	522 (new octave_remove_all_breakpoints_event (*this,
e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	523 path.toStdString (),
e97be88fc478 Fixed removing all breakpoints. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14827 diff changeset	524 function_name.toStdString ()));
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: 14804 diff changeset	525 }
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	526
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	527 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: 14804 diff changeset	528 file_editor_tab::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: 14804 diff changeset	529 {
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: 14804 diff changeset	530 int line, cur;
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	531 _edit_area->getCursorPosition (&line, &cur);
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: 14804 diff changeset	532 if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	533 request_remove_breakpoint (line);
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: 14804 diff changeset	534 else
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	535 request_add_breakpoint (line);
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: 14804 diff changeset	536 }
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: 14804 diff changeset	537
eae0e9f2a8c6 Added menus, markers and methods to visualize debugging in the editor and add, remove and navigate breakpoints* . Jacob Dawid <jacob.dawid@googlemail.com> parents: 14804 diff changeset	538 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: 14804 diff changeset	539 file_editor_tab::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: 14804 diff changeset	540 {
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: 14804 diff changeset	541 int line, cur, nextline;
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: 14804 diff changeset	542 _edit_area->getCursorPosition (&line, &cur);
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: 14804 diff changeset	543 if ( _edit_area->markersAtLine (line) && (1 << 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: 14804 diff changeset	544 line++; // we have a breakpoint here, so start search from next line
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: 14804 diff changeset	545 nextline = _edit_area->markerFindNext (line, (1 << 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: 14804 diff changeset	546 _edit_area->setCursorPosition (nextline, 0);
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: 14804 diff changeset	547 }
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: 14804 diff changeset	548
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: 14804 diff changeset	549 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: 14804 diff changeset	550 file_editor_tab::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: 14804 diff changeset	551 {
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: 14804 diff changeset	552 int line, cur, prevline;
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: 14804 diff changeset	553 _edit_area->getCursorPosition (&line, &cur);
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: 14804 diff changeset	554 if ( _edit_area->markersAtLine (line) && (1 << 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: 14804 diff changeset	555 line--; // we have a breakpoint here, so start search from prev line
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: 14804 diff changeset	556 prevline = _edit_area->markerFindPrevious (line, (1 << 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: 14804 diff changeset	557 _edit_area->setCursorPosition (prevline, 0);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	558 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	559
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	560 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	561 file_editor_tab::cut ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	562 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	563 _edit_area->cut ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	564 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	565
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	566 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	567 file_editor_tab::copy ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	568 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	569 _edit_area->copy ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	570 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	571
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	572 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	573 file_editor_tab::paste ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	574 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	575 _edit_area->paste ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	576 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	577
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	578 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	579 file_editor_tab::undo ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	580 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	581 _edit_area->undo ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	582 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	583
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	584 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	585 file_editor_tab::redo ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	586 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	587 _edit_area->redo ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	588 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	589
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	590 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: 14804 diff changeset	591 file_editor_tab::set_debugger_position (int line)
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: 14804 diff changeset	592 {
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: 14804 diff changeset	593 _edit_area->markerDeleteAll (debugger_position);
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: 14804 diff changeset	594 if (line > 0)
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: 14804 diff changeset	595 {
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: 14804 diff changeset	596 _edit_area->markerAdd (line, debugger_position);
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: 14804 diff changeset	597 }
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: 14804 diff changeset	598 }
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: 14804 diff changeset	599
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: 14804 diff changeset	600 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	601 file_editor_tab::set_modified (bool modified)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	602 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	603 _edit_area->setModified (modified);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	604 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	605
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: 14680 diff changeset	606 bool
15316 ba243f0234b0 file-editor-tab.cc (file_editor_tab::open_file): Make argument const reference Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15314 diff changeset	607 file_editor_tab::open_file (const QString& dir)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	608 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	609 QString openFileName;
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	610 QFileDialog fileDialog(this);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	611 fileDialog.setNameFilter(SAVE_FILE_FILTER);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	612 fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	613 fileDialog.setViewMode(QFileDialog::Detail);
15312 d81105896288 m-editor: open a new file from the directory of the last active tab Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15286 diff changeset	614 fileDialog.setDirectory(dir);
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: 14680 diff changeset	615 if (fileDialog.exec () == QDialog::Accepted)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	616 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	617 openFileName = fileDialog.selectedFiles().at(0);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	618 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: 14680 diff changeset	619 return false;
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: 14680 diff changeset	620
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	621 load_file(openFileName);
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: 14680 diff changeset	622 return true;
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: 14680 diff changeset	623 }
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: 14680 diff changeset	624 else
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: 14680 diff changeset	625 {
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: 14680 diff changeset	626 return false;
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	627 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	628 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	629
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	630 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	631 file_editor_tab::load_file (const QString& fileName)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	632 {
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 if (!_file_editor->isVisible ())
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: 14680 diff changeset	634 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	635 _file_editor->show ();
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: 14680 diff changeset	636 }
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: 14680 diff changeset	637
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	638 QFile file (fileName);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	639 if (!file.open (QFile::ReadOnly))
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	640 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	641 QMessageBox::warning (this, tr ("Octave Editor"),
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	642 tr ("Could not open file %1 for read:\n%2.").arg (fileName).
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	643 arg (file.errorString ()));
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	644 return;
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	645 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	646
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	647 QTextStream in (&file);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	648 QApplication::setOverrideCursor (Qt::WaitCursor);
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	649 _edit_area->setText (in.readAll ());
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	650 QApplication::restoreOverrideCursor ();
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	651
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	652 set_file_name (fileName);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	653 update_tracked_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: 14680 diff changeset	654
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: 14680 diff changeset	655
14788 85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	656 update_window_title (false); // window title (no modification)
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	657 _edit_area->setModified (false); // loaded file is not modified yet
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	658 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	659
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	660 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	661 file_editor_tab::new_file ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	662 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	663 if (!_file_editor->isVisible ())
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: 14680 diff changeset	664 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	665 _file_editor->show ();
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: 14680 diff changeset	666 }
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: 14680 diff changeset	667
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	668 set_file_name (UNNAMED_FILE);
14788 85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	669 update_window_title (false); // window title (no modification)
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	670 _edit_area->setText ("");
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	671 _edit_area->setModified (false); // new file is not modified yet
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	672 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	673
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	674 bool file_editor_tab::save_file()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	675 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	676 return save_file (_file_name);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	677 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	678
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: 14680 diff changeset	679 bool
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	680 file_editor_tab::save_file (const QString& saveFileName)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	681 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	682 // it is a new file with the name "<unnamed>" -> call saveFielAs
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	683 if (saveFileName == UNNAMED_FILE \|\| saveFileName.isEmpty ())
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	684 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	685 return save_file_as();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	686 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	687
14788 85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	688 QStringList watched_files = _file_system_watcher.files();
14796 e10d7bcfdd9e Now recognizing more symbol types in workspace view. Fixed bug with file system watcher complaining with new files. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	689 if (!watched_files.isEmpty ())
e10d7bcfdd9e Now recognizing more symbol types in workspace view. Fixed bug with file system watcher complaining with new files. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	690 _file_system_watcher.removePaths(watched_files);
14788 85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	691
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	692 // open the file for writing
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	693 QFile file (saveFileName);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	694 if (!file.open (QFile::WriteOnly))
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	695 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	696 QMessageBox::warning (this, tr ("Octave Editor"),
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	697 tr ("Could not open file %1 for write:\n%2.").
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	698 arg (saveFileName).arg (file.errorString ()));
14788 85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	699 _file_system_watcher.addPaths (watched_files);
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: 14680 diff changeset	700 return false;
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	701 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	702
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	703 // save the contents into the file
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	704 QTextStream out (&file);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	705 QApplication::setOverrideCursor (Qt::WaitCursor);
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	706 out << _edit_area->text ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	707 QApplication::restoreOverrideCursor ();
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	708
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	709 // save file name for later use
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	710 _file_name = saveFileName;
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	711 // set the window title to actual file name (not modified)
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	712 update_window_title (false);
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	713 // files is save -> not modified
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	714 _edit_area->setModified (false);
14788 85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	715 file.close();
85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	716
14796 e10d7bcfdd9e Now recognizing more symbol types in workspace view. Fixed bug with file system watcher complaining with new files. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	717 if (!watched_files.isEmpty ())
e10d7bcfdd9e Now recognizing more symbol types in workspace view. Fixed bug with file system watcher complaining with new files. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14795 diff changeset	718 _file_system_watcher.addPaths (watched_files);
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: 14680 diff changeset	719 return true;
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	720 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	721
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: 14680 diff changeset	722 bool
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	723 file_editor_tab::save_file_as ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	724 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	725 QString saveFileName(_file_name);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	726 QFileDialog fileDialog(this);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	727 if (saveFileName == UNNAMED_FILE \|\| saveFileName.isEmpty ())
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	728 {
14804 a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	729 QString directory = QString::fromStdString
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	730 (octave_link::instance ()->get_last_working_directory ());
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	731
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	732 if (directory.isEmpty ())
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	733 {
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	734 directory = QDir::homePath ();
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	735 }
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	736
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	737 fileDialog.setDirectory (directory);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	738 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	739 else
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	740 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	741 fileDialog.selectFile (saveFileName);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	742 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	743 fileDialog.setNameFilter (SAVE_FILE_FILTER);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	744 fileDialog.setDefaultSuffix ("m");
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	745 fileDialog.setAcceptMode (QFileDialog::AcceptSave);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	746 fileDialog.setViewMode (QFileDialog::Detail);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	747
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	748 if (fileDialog.exec ())
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	749 {
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	750 saveFileName = fileDialog.selectedFiles ().at (0);
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	751 if (saveFileName.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: 14680 diff changeset	752 return false;
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: 14680 diff changeset	753
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	754 return save_file (saveFileName);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	755 }
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: 14680 diff changeset	756
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: 14680 diff changeset	757 return false;
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	758 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	759
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	760 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	761 file_editor_tab::run_file ()
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	762 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	763 if (_edit_area->isModified ())
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	764 save_file(_file_name);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	765
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	766 QFileInfo file_info (_file_name);
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	767 QString path = file_info.absolutePath ();
14890 3ad363879015 Fixed bug with error message about missing arguments when running a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14877 diff changeset	768 //QString current_path = QString::fromStdString
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	769 (octave_link::instance ()->get_last_working_directory ());
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	770 QString function_name = file_info.fileName ();
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	771
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	772 // We have to cut off the suffix, because octave appends it.
41b86dc61306 Removed run command, instead cding into the script directory and executing script directly. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14829 diff changeset	773 function_name.chop (file_info.suffix ().length () + 1);
14877 bc6c099eacc0 Removed cd'ing back after running a script for compatibility with less. Jacob Dawid <jacob.dawid@gmail.com> parents: 14874 diff changeset	774 _file_editor->terminal ()->sendText (QString ("cd \'%1\'\n%2\n")
14890 3ad363879015 Fixed bug with error message about missing arguments when running a file. Jacob Dawid <jacob.dawid@gmail.com> parents: 14877 diff changeset	775 .arg(path).arg (function_name));
14804 a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	776 // TODO: Sending a run event crashes for long scripts. Find out why.
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	777 // octave_link::instance ()
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14796 diff changeset	778 // ->post_event (new octave_run_file_event (*this, _file_name.toStdString ()));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	779 }
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: 14680 diff changeset	780
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: 14680 diff changeset	781 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	782 file_editor_tab::file_has_changed (const QString& fileName)
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: 14680 diff changeset	783 {
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: 14680 diff changeset	784 Q_UNUSED (fileName);
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	785 if (QFile::exists (_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: 14680 diff changeset	786 {
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	787 // Prevent popping up multiple message boxes when the file has
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	788 // been changed multiple times.
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: 14680 diff changeset	789 static bool alreadyAsking = false;
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: 14680 diff changeset	790 if (!alreadyAsking)
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: 14680 diff changeset	791 {
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: 14680 diff changeset	792 alreadyAsking = true;
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: 14680 diff changeset	793
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: 14680 diff changeset	794 int decision =
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: 14680 diff changeset	795 QMessageBox::warning (this, tr ("Octave Editor"),
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: 14680 diff changeset	796 tr ("It seems that \'%1\' has been modified by another application. Do you want to reload it?").
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	797 arg (_file_name), QMessageBox::Yes,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	798 QMessageBox::No);
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: 14680 diff changeset	799
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: 14680 diff changeset	800 if (decision == QMessageBox::Yes)
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: 14680 diff changeset	801 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	802 load_file (_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: 14680 diff changeset	803 }
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: 14680 diff changeset	804
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: 14680 diff changeset	805 alreadyAsking = false;
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: 14680 diff changeset	806 }
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: 14680 diff changeset	807 }
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: 14680 diff changeset	808 else
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: 14680 diff changeset	809 {
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: 14680 diff changeset	810 int decision =
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: 14680 diff changeset	811 QMessageBox::warning (this, tr ("Octave Editor"),
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: 14680 diff changeset	812 tr ("It seems that \'%1\' has been deleted or renamed. Do you want to save it now?").
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	813 arg (_file_name), QMessageBox::Save,
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	814 QMessageBox::Close);
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: 14680 diff changeset	815 if (decision == QMessageBox::Save)
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: 14680 diff changeset	816 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	817 if (!save_file_as ())
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: 14680 diff changeset	818 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	819 set_file_name (UNNAMED_FILE);
14788 85daba52b2d4 Fixed bug with editor complaining that a file has been modified by another application when saving. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14715 diff changeset	820 update_window_title (true); // window title (no modification)
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	821 set_modified (true);
f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	822 update_tracked_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: 14680 diff changeset	823 }
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: 14680 diff changeset	824 }
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: 14680 diff changeset	825 else
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: 14680 diff changeset	826 {
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	827 emit close_request ();
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: 14680 diff changeset	828 }
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: 14680 diff changeset	829 }
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: 14680 diff changeset	830 }

Mercurial > hg > octave-nkf

annotate libgui/src/m-editor/file-editor-tab.cc @ 15355:a9fd6821eedf