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

annotate libgui/src/m-editor/file-editor-tab.cc @ 16377:8430ea8c1594

open editor tab and insert marker for debugging with gui * file-editor-interface.h (file_editor_interface::request_open_file): New public slot. (file_editor_interface::handle_dbstop_request): New virtual function. * file-editor-tab.h, file-editor-tab.cc (file_editor_tab::goto_line): New arg, line, with default value. Don't prompt if line is greater than zero. (file_editor_tab::set_debugger_position): New arg, widget id. (file_editor_tab::add_filename_to_list): New arg, widget id. * file-editor.h, file-editor.cc (file_eidtor::editor_tab_map): New data member. (file_editor::fetFileNames) Delete. (file_editor::~file_editor, file_editor::check_conflict_save, file_editor::handle_add_filename_to_list): Use editor_tab_map instead of fetFileNames. (file_editor::request_open_file): New args, line and set_marker. Optionally position cursor at line and with debug marker. If file is already open in tab, switch to it instead of giving error. (file_editor::construct): Connect fetab_set_debugger_position signal to set_debugger_position slot. * main-window.h, main-window.cc (main_window::dbstop_signal): New signal. (main_window::handle_dbstop_request): New function. * octave-event-listener.h (octave_event_listener::dbstop): New virtual function. * octave-qt-event-listener.h, octave-qt-event-listener.cc (octave_qt_event_listener::dbstop): New function. (octave_qt_event_listener::dbstop_signal): New signal. * octave-link.h, octave-link.cc (octave_link::dbstop, octave_link::do_dbstop, octave_link::dbstop_event_hook_fcn, octave_link::do_dbstop_event_hook_fcn): New functions * octave-main-thread.h, octave-main-thread.cc (dbstop_event_hook_fcn): New function. (octave_main_thread::run): Add it to the list of dbstop event hook functions.

author	John W. Eaton <jwe@octave.org>
date	Wed, 27 Mar 2013 12:59:12 -0400
parents	f482302d81c9
children	4bb1b82076e5

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
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15860 diff changeset	27 #ifdef HAVE_QSCINTILLA
7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15860 diff changeset	28
14873 355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	29 #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	30 // 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	31 // #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	32 #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	33 #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	34 #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	35 #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	36 #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	37 #include <Qsci/qscilexerdiff.h>
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	38 #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	39 #include <QApplication>
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	40 #include <QFileDialog>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	41 #include <QMessageBox>
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15204 diff changeset	42 #include <QTextStream>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	43 #include <QVBoxLayout>
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	44 #include <QInputDialog>
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	45
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	46 #include "file-editor-tab.h"
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	47 #include "file-editor.h"
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	48 #include "octave-link.h"
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	49
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	50 #include "debug.h"
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	51 #include "oct-env.h"
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	52
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	53 // Make parent null for the file editor tab so that warning
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	54 // WindowModal messages don't affect grandparents.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	55 file_editor_tab::file_editor_tab (QString directory)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	56 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	57 // Make sure there is a slash at the end of the directory name
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	58 // for identification when saved later.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	59 if (directory.count () && directory.at (directory.count () - 1) != '/')
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	60 directory.append ("/");
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	61 _file_name = directory;
14709 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 = new QsciScintilla (this);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	63
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	64 // Leave the find dialog box out of memory until requested.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	65 _find_dialog = 0;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	66 _find_dialog_is_visible = false;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	67
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	68 // 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	69 _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	70 _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	71 _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	72 _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	73 breakpoint);
14826 ed0f820c7ce0 Changed QImage to QPixmap to allow compilation with QScintilla2 < 2.6. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14825 diff changeset	74 _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	75 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	76
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	77 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	78 Qt::KeyboardModifiers)),
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	79 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	80 Qt::KeyboardModifiers)));
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	81
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	82 // 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	83 _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	84 _edit_area->setMarginsBackgroundColor(QColor(232,232,220));
15365 b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	85 _edit_area->setMarginType (2, QsciScintilla::TextMargin);
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	86
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	87 // 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	88 _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	89 _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	90
15365 b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	91 //highlight current line color
b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	92 _edit_area->setCaretLineBackgroundColor(QColor(245,245,245));
b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	93
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	94 // other features
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->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	96 _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	97 _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	98 _edit_area->setIndentationsUseTabs (false);
15365 b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	99
14709 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->setUtf8 (true);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	101
15365 b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	102 // auto completion
b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	103 _edit_area->autoCompleteFromAll ();
b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	104 _edit_area->setAutoCompletionSource(QsciScintilla::AcsAll);
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	105
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	106 QVBoxLayout *edit_area_layout = new QVBoxLayout ();
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	107 edit_area_layout->addWidget (_edit_area);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	108 edit_area_layout->setMargin (0);
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	109 setLayout (edit_area_layout);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	110
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	111 // 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	112 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	113 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	114 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	115 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	116 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	117 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	118
15365 b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	119 notice_settings ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	120 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	121
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	122 file_editor_tab::~file_editor_tab ()
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	123 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	124 // Destroy items attached to _edit_area.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	125 QsciLexer *lexer = _edit_area->lexer ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	126 if (lexer)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	127 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	128 delete lexer;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	129 _edit_area->setLexer(0);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	130 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	131 if (_find_dialog)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	132 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	133 delete _find_dialog;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	134 _find_dialog = 0;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	135 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	136
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	137 // Destroy _edit_area.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	138 delete _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	139 }
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	140
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	141 void
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	142 file_editor_tab::closeEvent (QCloseEvent *e)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	143 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	144 // ignore close event if file is not saved and user cancels
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	145 // closing this window
16018 e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	146 if (check_file_modified () == QMessageBox::Cancel)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	147 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	148 e->ignore ();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	149 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	150 else
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	151 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	152 e->accept();
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	153 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	154 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	155
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	156 void
15300 fd27e10b9b05 pass QString by const reference instead of value John W. Eaton <jwe@octave.org> parents: 15286 diff changeset	157 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	158 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	159 // update tracked file if we really have a file on disk
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	160 QStringList trackedFiles = _file_system_watcher.files ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	161 if (!trackedFiles.isEmpty ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	162 _file_system_watcher.removePath (_file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	163 if (!fileName.isEmpty ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	164 _file_system_watcher.addPath (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	165 _file_name = fileName;
15425 8ae34ffe5c1b Retain QsciAPIs lexer_api as part of lexer_octave_gui object (bug #37359) Daniel J Sebald <daniel.sebald@ieee.org> parents: 15402 diff changeset	166
8ae34ffe5c1b Retain QsciAPIs lexer_api as part of lexer_octave_gui object (bug #37359) Daniel J Sebald <daniel.sebald@ieee.org> parents: 15402 diff changeset	167 // update lexer after _file_name change
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	168 update_lexer ();
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	169
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	170 // update the file editor with current editing directory
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	171 emit editor_state_changed (_copy_available, QDir::cleanPath (_file_name));
15860 feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15849 diff changeset	172 // add the new file to the mru list
feba9ff6e6a8 editor: add list of recently used files to the file menu Torsten <ttl@justmail.de> parents: 15849 diff changeset	173 emit mru_add_file (QDir::cleanPath (_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	174 }
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	175
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	176 void
15045 1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	177 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	178 Qt::KeyboardModifiers state)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	179 {
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	180 if (margin == 1)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	181 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	182 unsigned int markers_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	183
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	184 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	185 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	186 if (markers_mask && (1 << bookmark))
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	187 _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	188 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	189 _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	190 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	191 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	192 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	193 if (markers_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	194 {
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	195 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	196 }
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	197 else
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	198 {
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	199 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	200 }
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	201 }
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	202 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	203 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	204
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	205 void
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	206 file_editor_tab::update_lexer ()
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	207 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	208 QsciLexer *lexer = _edit_area->lexer ();
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	209 delete lexer;
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	210
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	211 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	212 {
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	213 lexer = new lexer_octave_gui ();
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	214 }
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	215 else if (_file_name.endsWith (".c")
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	216 \|\| _file_name.endsWith (".cc")
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	217 \|\| _file_name.endsWith (".cpp")
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	218 \|\| _file_name.endsWith (".cxx")
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	219 \|\| _file_name.endsWith (".c++")
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	220 \|\| _file_name.endsWith (".h")
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	221 \|\| _file_name.endsWith (".hh")
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	222 \|\| _file_name.endsWith (".hpp")
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	223 \|\| _file_name.endsWith (".h++"))
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	224 {
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	225 lexer = new QsciLexerCPP ();
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	226 }
14873 355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	227 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	228 {
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	229 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	230 }
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	231 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	232 {
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	233 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	234 }
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	235 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	236 {
355d6c165df0 Added syntax highlighting support for .sh/.bat/.pl and .diff-files. Jacob Dawid <jacob.dawid@gmail.com> parents: 14869 diff changeset	237 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	238 }
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	239 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	240 {
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	241 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	242 }
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	243
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15080 diff changeset	244 QSettings *settings = resource_manager::get_settings ();
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	245
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	246 // Editor font (default or from settings)
15365 b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	247 if (settings)
b4c32f245da7 GUI: Settings take immediate effect on the m-editor Thorsten Liebig <thorsten.liebig@gmx.de> parents: 15356 diff changeset	248 lexer->setDefaultFont (QFont (
15367 501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	249 settings->value ("editor/fontName",
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	250 "Courier").toString (),
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	251 settings->value ("editor/fontSize",
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	252 10).toInt ()));
501a9cc2c68f maint: whitespace cleanup in GUI code Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15365 diff changeset	253
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	254 // 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	255 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	256 QsciScintilla::AiOpening \|\|
1ffaad442161 Source code formatting (80-column lines, mostly whitespace changes) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14890 diff changeset	257 QsciScintilla::AiClosing);
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	258
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	259 _edit_area->setLexer (lexer);
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	260 }
db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	261
15980 6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	262 // slot for fetab_set_focus: sets the focus to the current edit area
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	263 void
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	264 file_editor_tab::set_focus (const QWidget* ID)
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	265 {
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	266 if (ID != this)
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	267 return;
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	268 _edit_area->setFocus ();
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	269 }
6c0fce0632a4 gui: set keyboard focus when switching between dock widgets (bug #36957) Torsten <ttl@justmail.de> parents: 15894 diff changeset	270
14869 db3c84d38345 Now supporting c/cc/cpp syntax highlighting. Jacob Dawid <jacob.dawid@gmail.com> parents: 14833 diff changeset	271 void
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	272 file_editor_tab::undo (const QWidget* ID)
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	273 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	274 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	275 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	276
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	277 _edit_area->undo ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	278 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	279
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	280 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	281 file_editor_tab::redo (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	282 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	283 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	284 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	285
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	286 _edit_area->redo ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	287 }
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	288
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	289 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	290 file_editor_tab::copy (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	291 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	292 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	293 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	294
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	295 _edit_area->copy ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	296 }
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	297
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	298 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	299 file_editor_tab::cut (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	300 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	301 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	302 return;
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	303
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	304 _edit_area->cut ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	305 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	306
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	307 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	308 file_editor_tab::paste (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	309 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	310 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	311 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	312
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	313 _edit_area->paste ();
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	314 }
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	315
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	316 void
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	317 file_editor_tab::save_file (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	318 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	319 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	320 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	321
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	322 save_file (_file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	323 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	324 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	325
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	326 file_editor_tab::save_file (const QWidget* ID, const QString& fileName, bool remove_on_success)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	327 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	328 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	329 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	330
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	331 save_file (fileName, remove_on_success);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	332 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	333
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	334 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	335 file_editor_tab::save_file_as (const QWidget* ID)
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	336 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	337 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	338 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	339
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	340 save_file_as ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	341 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	342
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	343 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	344 file_editor_tab::run_file_callback (void)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	345 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	346 // Maybe someday we will do something here?
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	347 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	348
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	349 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	350 file_editor_tab::run_file (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	351 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	352 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	353 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	354
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	355 if (_edit_area->isModified ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	356 save_file (_file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	357
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	358 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	359 QString path = file_info.absolutePath ();
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	360 QString current_path
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	361 = QString::fromStdString (octave_link::last_working_directory ());
14827 6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	362 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	363
6b90737f69cc Very basic breakpoint setting and removing in the editor works. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14826 diff changeset	364 // 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	365 function_name.chop (file_info.suffix ().length () + 1);
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	366 emit process_octave_code (QString ("cd \'%1\'\n%2\n")
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	367 .arg(path).arg (function_name));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	368
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	369 // TODO: Sending a run event crashes for long scripts. Find out why.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	370 // octave_link::post_event
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	371 // (this, &file_editor_tab::run_file_callback, _file_name.toStdString ()));
15080 4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	372 }
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	373
4c4f2fb07a50 Added find functionality in editor by to.lil. Jacob Dawid <jacob.dawid@gmail.com> parents: 15045 diff changeset	374 void
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	375 file_editor_tab::toggle_bookmark (const QWidget* ID)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	376 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	377 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	378 return;
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	379
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	380 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	381 _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	382 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	383 _edit_area->markerDelete (line, bookmark);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	384 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	385 _edit_area->markerAdd (line, bookmark);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	386 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	387
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	388 void
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	389 file_editor_tab::next_bookmark (const QWidget* ID)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	390 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	391 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	392 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	393
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	394 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	395 _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	396 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	397 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	398 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	399 _edit_area->setCursorPosition (nextline, 0);
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	400 }
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	401
35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	402 void
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	403 file_editor_tab::previous_bookmark (const QWidget* ID)
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	404 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	405 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	406 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	407
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	408 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	409 _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	410 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	411 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	412 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	413 _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	414 }
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	415
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	416 void
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	417 file_editor_tab::remove_bookmark (const QWidget* ID)
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	418 {
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	419 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	420 return;
14676 35512b788af2 Editor can now handle multiple files in tabs. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	421
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	422 _edit_area->markerDeleteAll (bookmark);
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	423 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	424
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	425 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	426 file_editor_tab::add_breakpoint_callback (const bp_info& info)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	427 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	428 bp_table::intmap intmap;
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	429 intmap[0] = info.line + 1;
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	430
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	431 std::string previous_directory = octave_env::get_current_directory ();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	432 octave_env::chdir (info.path);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	433 intmap = bp_table::add_breakpoint (info.function_name, intmap);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	434 octave_env::chdir (previous_directory);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	435
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	436 if (intmap.size () > 0)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	437 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	438 // FIXME -- Check file.
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	439 _edit_area->markerAdd (info.line, breakpoint);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	440 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	441 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	442
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	443 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	444 file_editor_tab::remove_breakpoint_callback (const bp_info& info)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	445 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	446 bp_table::intmap intmap;
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	447 intmap[0] = info.line;
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	448
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	449 std::string previous_directory = octave_env::get_current_directory ();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	450 octave_env::chdir (info.path);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	451 bp_table::remove_breakpoint (info.function_name, intmap);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	452 octave_env::chdir (previous_directory);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	453
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	454 // FIXME -- check result
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	455 bool success = true;
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	456
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	457 if (success)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	458 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	459 // FIXME -- check file.
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	460 _edit_area->markerDelete (info.line, breakpoint);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	461 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	462 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	463
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	464 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	465 file_editor_tab::remove_all_breakpoints_callback (const bp_info& info)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	466 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	467 bp_table::intmap intmap;
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	468 std::string previous_directory = octave_env::get_current_directory ();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	469 octave_env::chdir (info.path);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	470 intmap = bp_table::remove_all_breakpoints_in_file (info.function_name, true);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	471 octave_env::chdir (previous_directory);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	472
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	473 if (intmap.size() > 0)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	474 _edit_area->markerDeleteAll (breakpoint);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15389 diff changeset	475 }
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	476
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	477 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	478 file_editor_tab::request_add_breakpoint (int line)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	479 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	480 QFileInfo file_info (_file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	481 QString path = file_info.absolutePath ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	482 QString function_name = file_info.fileName ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	483
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	484 // We have to cut off the suffix, because octave appends it.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	485 function_name.chop (file_info.suffix ().length () + 1);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	486
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	487 bp_info info (path, function_name, line);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	488
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	489 octave_link::post_event
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	490 (this, &file_editor_tab::add_breakpoint_callback, info);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	491 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	492
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	493 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	494 file_editor_tab::request_remove_breakpoint (int line)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	495 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	496 QFileInfo file_info (_file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	497 QString path = file_info.absolutePath ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	498 QString function_name = file_info.fileName ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	499
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	500 // We have to cut off the suffix, because octave appends it.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	501 function_name.chop (file_info.suffix ().length () + 1);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	502
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	503 bp_info info (path, function_name, line);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	504
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	505 octave_link::post_event
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	506 (this, &file_editor_tab::remove_breakpoint_callback, info);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	507 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	508
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	509 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	510 file_editor_tab::toggle_breakpoint (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	511 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	512 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	513 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	514
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	515 int line, cur;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	516 _edit_area->getCursorPosition (&line, &cur);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	517 if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	518 request_remove_breakpoint (line);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	519 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	520 request_add_breakpoint (line);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	521 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	522
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	523 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	524 file_editor_tab::next_breakpoint (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	525 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	526 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	527 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	528
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	529 int line, cur, nextline;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	530 _edit_area->getCursorPosition (&line, &cur);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	531 if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	532 line++; // we have a breakpoint here, so start search from next line
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	533 nextline = _edit_area->markerFindNext (line, (1 << breakpoint));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	534 _edit_area->setCursorPosition (nextline, 0);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	535 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	536
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	537 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	538 file_editor_tab::previous_breakpoint (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	539 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	540 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	541 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	542
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	543 int line, cur, prevline;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	544 _edit_area->getCursorPosition (&line, &cur);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	545 if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	546 line--; // we have a breakpoint here, so start search from prev line
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	547 prevline = _edit_area->markerFindPrevious (line, (1 << breakpoint));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	548 _edit_area->setCursorPosition (prevline, 0);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	549 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	550
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	551 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	552 file_editor_tab::remove_all_breakpoints (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	553 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	554 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	555 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	556
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	557 QFileInfo file_info (_file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	558 QString path = file_info.absolutePath ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	559 QString function_name = file_info.fileName ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	560
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	561 // We have to cut off the suffix, because octave appends it.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	562 function_name.chop (file_info.suffix ().length () + 1);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	563
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	564 bp_info info (path, function_name, 0);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	565
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	566 octave_link::post_event
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	567 (this, &file_editor_tab::remove_all_breakpoints_callback, info);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	568 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	569
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	570 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	571 file_editor_tab::comment_selected_text (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	572 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	573 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	574 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	575
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	576 do_comment_selected_text (true);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	577 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	578
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	579 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	580 file_editor_tab::uncomment_selected_text (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	581 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	582 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	583 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	584
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	585 do_comment_selected_text (false);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	586 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	587
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	588 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	589 file_editor_tab::handle_find_dialog_finished (int)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	590 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	591 // Find dialog is going to hide. Save location of window for
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	592 // when it is reshown.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	593 _find_dialog_geometry = _find_dialog->geometry ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	594 _find_dialog_is_visible = false;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	595 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	596
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	597 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	598 file_editor_tab::find (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	599 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	600 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	601 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	602
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	603 // The find_dialog feature doesn't need a slot for return info.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	604 // Rather than Qt::DeleteOnClose, let the find feature hang about
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	605 // in case it contains useful information like previous searches
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	606 // and so on. Perhaps one find dialog for the whole editor is
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	607 // better, but individual find dialogs has the nice feature of
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	608 // retaining position per file editor tabs, which can be undocked.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	609
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	610 if (!_find_dialog)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	611 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	612 _find_dialog = new find_dialog (_edit_area);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	613 connect (_find_dialog, SIGNAL (finished (int)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	614 this, SLOT (handle_find_dialog_finished (int)));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	615 _find_dialog->setWindowModality (Qt::NonModal);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	616 _find_dialog_geometry = _find_dialog->geometry ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	617 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	618
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	619 if (!_find_dialog->isVisible ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	620 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	621 _find_dialog->setGeometry (_find_dialog_geometry);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	622 _find_dialog->show ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	623 _find_dialog_is_visible = true;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	624 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	625
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	626 _find_dialog->activateWindow ();
15988 38348a6c3db0 gui: initialize search text in the find dialog with selected text in editor file Torsten <ttl@justmail.de> parents: 15984 diff changeset	627 _find_dialog->init_search_text ();
38348a6c3db0 gui: initialize search text in the find dialog with selected text in editor file Torsten <ttl@justmail.de> parents: 15984 diff changeset	628
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	629 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	630
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	631 void
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	632 file_editor_tab::goto_line (const QWidget* ID, int line)
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	633 {
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	634 if (ID != this)
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	635 return;
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	636
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	637 bool ok = true;
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	638
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	639 if (line <= 0)
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	640 {
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	641 bool ok = false;
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	642
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	643 int index;
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	644
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	645 _edit_area->getCursorPosition(&line, &index);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	646
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	647
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	648 line = QInputDialog::getInt (_edit_area, "Goto line", "Line number",
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	649 line+1, 1, _edit_area->lines(), 1, &ok);
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	650 }
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	651
16375 f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	652 if (ok)
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	653 _edit_area->setCursorPosition (line-1, 0);
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	654 }
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	655
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	656
f482302d81c9 editor goto line menu item (bug #38590) John Donoghue <john.donoghue@ieee.org> parents: 16018 diff changeset	657 void
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	658 file_editor_tab::do_comment_selected_text (bool comment)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	659 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	660 if ( _edit_area->hasSelectedText() )
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	661 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	662 int lineFrom, lineTo, colFrom, colTo, i;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	663 _edit_area->getSelection (&lineFrom,&colFrom,&lineTo,&colTo);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	664 if ( colTo == 0 ) // the beginning of last line is not selected
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	665 lineTo--; // stop at line above
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	666 _edit_area->beginUndoAction ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	667 for ( i=lineFrom; i<=lineTo; i++ )
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	668 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	669 if ( comment )
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	670 _edit_area->insertAt("%",i,0);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	671 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	672 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	673 QString line(_edit_area->text(i));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	674 if ( line.startsWith("%") )
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	675 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	676 _edit_area->setSelection(i,0,i,1);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	677 _edit_area->removeSelectedText();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	678 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	679 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	680 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	681 _edit_area->endUndoAction ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	682 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	683 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	684
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	685 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	686 file_editor_tab::update_window_title (bool modified)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	687 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	688 QString title ("");
15984 1eb3c67139f6 Add full-length-name tool tip to editor file tab when name is not full length. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15982 diff changeset	689 QString tooltip ("");
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	690 if (_file_name.isEmpty () \|\| _file_name.at (_file_name.count () - 1) == '/')
15982 131d40cd805b gui: cleanup some string constants for translations Torsten <ttl@justmail.de> parents: 15981 diff changeset	691 title = tr("<unnamed>");
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	692 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	693 {
15981 e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	694 if ( _long_title )
e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	695 title = _file_name;
e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	696 else
e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	697 {
e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	698 QFileInfo file(_file_name);
e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	699 title = file.fileName();
15984 1eb3c67139f6 Add full-length-name tool tip to editor file tab when name is not full length. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15982 diff changeset	700 tooltip = _file_name;
15981 e3873531dd7c gui: correct tab title for new editor file if short title setting is selected Torsten <ttl@justmail.de> parents: 15980 diff changeset	701 }
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	702 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	703
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	704 if ( modified )
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	705 {
15984 1eb3c67139f6 Add full-length-name tool tip to editor file tab when name is not full length. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15982 diff changeset	706 emit file_name_changed (title.prepend("* "), tooltip);
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	707 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	708 else
15984 1eb3c67139f6 Add full-length-name tool tip to editor file tab when name is not full length. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15982 diff changeset	709 emit file_name_changed (title, tooltip);
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	710 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	711
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	712 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	713 file_editor_tab::handle_copy_available(bool enableCopy)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	714 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	715 _copy_available = enableCopy;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	716 emit editor_state_changed (_copy_available, QDir::cleanPath (_file_name));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	717 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	718
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	719 int
16018 e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	720 file_editor_tab::check_file_modified ()
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	721 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	722 int decision = QMessageBox::Yes;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	723 if (_edit_area->isModified ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	724 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	725 // File is modified but not saved, ask user what to do. The file
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	726 // editor tab can't be made parent because it may be deleted depending
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	727 // upon the response. Instead, change the _edit_area to read only.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	728 QMessageBox* msgBox = new QMessageBox (
16018 e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	729 QMessageBox::Warning, tr ("Octave Editor"),
e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	730 tr ("The file\n"
e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	731 "%1\n"
e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	732 "is about to be closed but has been modified.\n"
e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	733 "Do you want to cancel closing, save or discard the changes?").
e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	734 arg (_file_name),
e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	735 QMessageBox::Save \| QMessageBox::Cancel \| QMessageBox::Discard, 0);
e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	736 msgBox->setDefaultButton (QMessageBox::Save);
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	737 _edit_area->setReadOnly (true);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	738 connect (msgBox, SIGNAL (finished (int)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	739 this, SLOT (handle_file_modified_answer (int)));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	740 msgBox->setWindowModality (Qt::NonModal);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	741 msgBox->setAttribute (Qt::WA_DeleteOnClose);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	742 msgBox->show ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	743 return (QMessageBox::Cancel);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	744 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	745 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	746 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	747 // Nothing was modified, just remove from editor.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	748 emit tab_remove_request ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	749 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	750
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	751 return (decision);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	752 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	753
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	754 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	755 file_editor_tab::handle_file_modified_answer (int decision)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	756 {
16018 e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	757 if (decision == QMessageBox::Save)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	758 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	759 // Save file, then remove from editor.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	760 save_file (_file_name, true);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	761 }
16018 e0df71fbe39b gui: clearer message box with cancel button when closing an unsaved editor file Torsten <ttl@justmail.de> parents: 16017 diff changeset	762 else if (decision == QMessageBox::Discard)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	763 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	764 // User doesn't want to save, just remove from editor.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	765 emit tab_remove_request ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	766 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	767 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	768 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	769 // User canceled, allow editing again.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	770 _edit_area->setReadOnly (false);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	771 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	772 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	773
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	774 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	775 file_editor_tab::set_modified (bool modified)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	776 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	777 _edit_area->setModified (modified);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	778 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	779
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	780 QString
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	781 file_editor_tab::load_file(const QString& fileName)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	782 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	783 QFile file (fileName);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	784 if (!file.open (QFile::ReadOnly))
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	785 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	786 return file.errorString ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	787 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	788
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	789 QTextStream in (&file);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	790 QApplication::setOverrideCursor (Qt::WaitCursor);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	791 _edit_area->setText (in.readAll ());
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	792 QApplication::restoreOverrideCursor ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	793
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	794 set_file_name (fileName);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	795 update_window_title (false); // window title (no modification)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	796 _edit_area->setModified (false); // loaded file is not modified yet
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	797
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	798 return QString ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	799 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	800
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	801 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	802 file_editor_tab::new_file ()
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	803 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	804 update_window_title (false); // window title (no modification)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	805 _edit_area->setText ("");
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	806 _edit_area->setModified (false); // new file is not modified yet
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	807 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	808
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	809 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	810 file_editor_tab::save_file (const QString& saveFileName, bool remove_on_success)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	811 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	812 // If it is a new file with no name, signal that saveFileAs
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	813 // should be performed.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	814 if (saveFileName.isEmpty () \|\| saveFileName.at (saveFileName.count () - 1) == '/')
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	815 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	816 save_file_as (remove_on_success);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	817 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	818 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	819
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	820 // stop watching file
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	821 QStringList trackedFiles = _file_system_watcher.files ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	822 if (!trackedFiles.isEmpty ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	823 _file_system_watcher.removePath (saveFileName);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	824
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	825 // open the file for writing
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	826 QFile file (saveFileName);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	827 if (!file.open (QIODevice::WriteOnly))
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	828 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	829 // Unsuccessful, begin watching file again if it was being
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	830 // watched previously.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	831 if (trackedFiles.contains (saveFileName))
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	832 _file_system_watcher.addPath (saveFileName);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	833
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	834 // Create a NonModal message about error.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	835 QMessageBox* msgBox = new QMessageBox (
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	836 QMessageBox::Critical, tr ("Octave Editor"),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	837 tr ("Could not open file %1 for write:\n%2.").
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	838 arg (saveFileName).arg (file.errorString ()),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	839 QMessageBox::Ok, 0);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	840 msgBox->setWindowModality (Qt::NonModal);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	841 msgBox->setAttribute (Qt::WA_DeleteOnClose);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	842 msgBox->show ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	843 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	844 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	845
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	846 // save the contents into the file
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	847 QTextStream out (&file);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	848 QApplication::setOverrideCursor (Qt::WaitCursor);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	849 out << _edit_area->text ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	850 QApplication::restoreOverrideCursor ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	851 file.close();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	852
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	853 // save file name after closing file as set_file_name starts watching again
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	854 set_file_name (saveFileName);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	855 // set the window title to actual file name (not modified)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	856 update_window_title (false);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	857 // files is save -> not modified
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	858 _edit_area->setModified (false);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	859
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	860 if (remove_on_success)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	861 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	862 emit tab_remove_request ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	863 return; // Don't touch member variables after removal
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	864 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	865 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	866
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	867 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	868 file_editor_tab::save_file_as (bool remove_on_success)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	869 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	870 // Simply put up the file chooser dialog box with a slot connection
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	871 // then return control to the system waiting for a file selection.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	872
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	873 // If the tab is removed in response to a QFileDialog signal, the tab
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	874 // can't be a parent.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	875 QFileDialog* fileDialog;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	876 if (remove_on_success)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	877 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	878 // If tab is closed, "this" cannot be parent in which case modality
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	879 // has no effect. Disable editing instead.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	880 _edit_area->setReadOnly (true);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	881 fileDialog = new QFileDialog ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	882 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	883 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	884 fileDialog = new QFileDialog (this);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	885
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	886 if (!_file_name.isEmpty () && _file_name.at (_file_name.count () - 1) != '/')
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	887 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	888 fileDialog->selectFile (_file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	889 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	890 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	891 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	892 fileDialog->selectFile ("");
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	893 if (_file_name.isEmpty ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	894 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	895 fileDialog->setDirectory (QDir::currentPath ());
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	896 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	897 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	898 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	899 // The file name is actually the directory name from the
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	900 // constructor argument.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	901 fileDialog->setDirectory (_file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	902 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	903 }
15982 131d40cd805b gui: cleanup some string constants for translations Torsten <ttl@justmail.de> parents: 15981 diff changeset	904 fileDialog->setNameFilter (tr("Octave Files (.m);;All Files (.*)"));
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	905 fileDialog->setDefaultSuffix ("m");
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	906 fileDialog->setAcceptMode (QFileDialog::AcceptSave);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	907 fileDialog->setViewMode (QFileDialog::Detail);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	908 if (remove_on_success)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	909 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	910 connect (fileDialog, SIGNAL (fileSelected (const QString&)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	911 this, SLOT (handle_save_file_as_answer_close (const QString&)));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	912 connect (fileDialog, SIGNAL (rejected ()),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	913 this, SLOT (handle_save_file_as_answer_cancel ()));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	914 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	915 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	916 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	917 connect (fileDialog, SIGNAL (fileSelected (const QString&)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	918 this, SLOT (handle_save_file_as_answer (const QString&)));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	919 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	920 fileDialog->setWindowModality (Qt::WindowModal);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	921 fileDialog->setAttribute (Qt::WA_DeleteOnClose);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	922 fileDialog->show ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	923 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	924
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	925 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	926 file_editor_tab::message_duplicate_file_name (const QString& saveFileName)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	927 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	928 // Could overwrite the file here (and tell user the file was
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	929 // overwritten), but the user could have unintentionally
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	930 // selected the same name not intending to overwrite.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	931
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	932 // Create a NonModal message about error.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	933 QMessageBox* msgBox = new QMessageBox (
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	934 QMessageBox::Critical, tr ("Octave Editor"),
15982 131d40cd805b gui: cleanup some string constants for translations Torsten <ttl@justmail.de> parents: 15981 diff changeset	935 tr ("File not saved! The selected file name\n%1\n"
131d40cd805b gui: cleanup some string constants for translations Torsten <ttl@justmail.de> parents: 15981 diff changeset	936 "is the same as the current file name").
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	937 arg (saveFileName),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	938 QMessageBox::Ok, 0);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	939 msgBox->setWindowModality (Qt::NonModal);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	940 msgBox->setAttribute (Qt::WA_DeleteOnClose);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	941 msgBox->show ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	942 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	943
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	944 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	945 file_editor_tab::handle_save_file_as_answer (const QString& saveFileName)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	946 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	947 if (saveFileName == _file_name)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	948 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	949 message_duplicate_file_name (saveFileName);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	950 // Nothing done, allow editing again.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	951 _edit_area->setReadOnly (false);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	952 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	953 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	954 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	955 // Have editor check for conflict, do not delete tab after save.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	956 emit editor_check_conflict_save (saveFileName, false);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	957 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	958 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	959
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	960 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	961 file_editor_tab::handle_save_file_as_answer_close (const QString& saveFileName)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	962 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	963 if (saveFileName == _file_name)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	964 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	965 message_duplicate_file_name (saveFileName);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	966 // Nothing done, allow editing again.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	967 _edit_area->setReadOnly (false);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	968 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	969 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	970 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	971 // Have editor check for conflict, delete tab after save.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	972 emit editor_check_conflict_save (saveFileName, true);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	973 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	974 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	975
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	976 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	977 file_editor_tab::handle_save_file_as_answer_cancel ()
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	978 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	979 // User canceled, allow editing again.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	980 _edit_area->setReadOnly (false);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	981 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	982
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	983 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	984 file_editor_tab::file_has_changed (const QString&)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	985 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	986 // Prevent popping up multiple message boxes when the file has
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	987 // been changed multiple times by temporarily removing from the
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	988 // file watcher.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	989 QStringList trackedFiles = _file_system_watcher.files ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	990 if (!trackedFiles.isEmpty ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	991 _file_system_watcher.removePath (_file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	992
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	993 if (QFile::exists (_file_name))
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	994 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	995 // Create a WindowModal message that blocks the edit area
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	996 // by making _edit_area parent.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	997 QMessageBox* msgBox = new QMessageBox (
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	998 QMessageBox::Warning, tr ("Octave Editor"),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	999 tr ("It seems that \'%1\' has been modified by another application. Do you want to reload it?").
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1000 arg (_file_name), QMessageBox::Yes \| QMessageBox::No, this);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1001 connect (msgBox, SIGNAL (finished (int)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1002 this, SLOT (handle_file_reload_answer (int)));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1003 msgBox->setWindowModality (Qt::WindowModal);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1004 msgBox->setAttribute (Qt::WA_DeleteOnClose);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1005 msgBox->show ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1006 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1007 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1008 {
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1009 QString modified = "";
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1010 if (_edit_area->isModified ())
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1011 modified = tr ("\n\nWarning: The contents in the editor is modified!");
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1012 // Create a WindowModal message. The file editor tab can't be made
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1013 // parent because it may be deleted depending upon the response.
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1014 // Instead, change the _edit_area to read only.
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1015 QMessageBox* msgBox = new QMessageBox (
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1016 QMessageBox::Warning, tr ("Octave Editor"),
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1017 tr ("It seems that the file\n"
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1018 "%1\n"
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1019 "has been deleted or renamed. Do you want to save it now?%2").
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1020 arg (_file_name).arg (modified),
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1021 QMessageBox::Save \| QMessageBox::Close, 0);
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1022 _edit_area->setReadOnly (true);
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1023 connect (msgBox, SIGNAL (finished (int)),
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1024 this, SLOT (handle_file_resave_answer (int)));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1025 msgBox->setWindowModality (Qt::WindowModal);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1026 msgBox->setAttribute (Qt::WA_DeleteOnClose);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1027 msgBox->show ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1028 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1029 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1030
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1031 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1032 file_editor_tab::notice_settings ()
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1033 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1034 QSettings *settings = resource_manager::get_settings ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1035
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1036 if (settings==NULL)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1037 return; // this shouldn't happen!
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1038
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1039 _edit_area->setCaretLineVisible(settings->value ("editor/highlightCurrentLine",true).toBool ());
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1040
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1041 if (settings->value ("editor/codeCompletion",true).toBool ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1042 _edit_area->setAutoCompletionThreshold (1);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1043 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1044 _edit_area->setAutoCompletionThreshold (-1);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1045
15894 9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15873 diff changeset	1046 QFont xfont (settings->value ("editor/fontName","Courier").toString (),
9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15873 diff changeset	1047 settings->value ("editor/fontSize",10).toInt ());
9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15873 diff changeset	1048
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1049 if (settings->value ("editor/showLineNumbers",true).toBool ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1050 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1051 _edit_area->setMarginLineNumbers (2, true);
15894 9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15873 diff changeset	1052 _edit_area->setMarginsFont (xfont);
9cd14e53e906 eliminate some compiler warnings for GUI code John W. Eaton <jwe@octave.org> parents: 15873 diff changeset	1053 QFontMetrics metrics (xfont);
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1054 _edit_area->setMarginWidth(2, metrics.width("9999"));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1055 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1056 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1057 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1058 _edit_area->setMarginLineNumbers (2, false);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1059 _edit_area->setMarginWidth(2, 0);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1060 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1061
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1062 update_lexer ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1063
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1064 _long_title = settings->value ("editor/longWindowTitle",false).toBool ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1065
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1066 update_window_title (false);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1067 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1068
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1069 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1070 file_editor_tab::conditional_close (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1071 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1072 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1073 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1074
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1075 close ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1076 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1077
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1078 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1079 file_editor_tab::change_editor_state (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1080 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1081 if (ID != this)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1082 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1083 // Widget may be going out of focus. If so, record location.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1084 if (_find_dialog)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1085 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1086 if (_find_dialog->isVisible ())
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1087 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1088 _find_dialog_geometry = _find_dialog->geometry ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1089 _find_dialog->hide ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1090 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1091 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1092 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1093 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1094
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1095 if (_find_dialog && _find_dialog_is_visible)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1096 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1097 _find_dialog->setGeometry (_find_dialog_geometry);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1098 _find_dialog->show ();
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1099 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1100 emit editor_state_changed (_copy_available, QDir::cleanPath (_file_name));
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1101 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1102
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1103 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1104 file_editor_tab::file_name_query (const QWidget* ID)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1105 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1106 // A zero (null pointer) means that all file editor tabs
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1107 // should respond, otherwise just the desired file editor tab.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1108 if (ID != this && ID != 0)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1109 return;
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1110
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1111 // Unnamed files shouldn't be transmitted.
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1112 if (!_file_name.isEmpty ())
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1113 emit add_filename_to_list (_file_name, this);
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1114 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1115
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1116 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1117 file_editor_tab::handle_file_reload_answer (int decision)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1118 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1119 if (decision == QMessageBox::Yes)
15849 e55a64f49346 editor: prevent reloaded file from being added twice to the file watcher Torsten <ttl@justmail.de> parents: 15848 diff changeset	1120 { // reload: file is readded to the file watcher in set_file_name ()
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1121 load_file (_file_name);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1122 }
15849 e55a64f49346 editor: prevent reloaded file from being added twice to the file watcher Torsten <ttl@justmail.de> parents: 15848 diff changeset	1123 else
e55a64f49346 editor: prevent reloaded file from being added twice to the file watcher Torsten <ttl@justmail.de> parents: 15848 diff changeset	1124 { // do not reload: readd to the file watche
e55a64f49346 editor: prevent reloaded file from being added twice to the file watcher Torsten <ttl@justmail.de> parents: 15848 diff changeset	1125 _file_system_watcher.addPath (_file_name);
e55a64f49346 editor: prevent reloaded file from being added twice to the file watcher Torsten <ttl@justmail.de> parents: 15848 diff changeset	1126 }
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1127 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1128
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1129 void
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1130 file_editor_tab::handle_file_resave_answer (int decision)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1131 {
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1132 // check decision of user in dialog
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1133 if (decision == QMessageBox::Save)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1134 {
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1135 save_file (_file_name); // readds file to watcher in set_file_name ()
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1136 _edit_area->setReadOnly (false); // delete read only flag
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1137 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1138 else
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1139 {
16017 06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1140 // Definitely close the file.
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1141 // Set modified to false to prevent the dialog box when the close event
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1142 // is posted. If the user cancels the close in this dialog the tab is
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1143 // left open with a non-existing file.
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1144 _edit_area->setModified (false);
06187a0b7a62 gui: new handling when an editor file is deleted or renamed (bug #38282) Torsten <ttl@justmail.de> parents: 15988 diff changeset	1145 close ();
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1146 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1147 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1148
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1149 void
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1150 file_editor_tab::set_debugger_position (const QWidget *ID, int line)
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1151 {
16377 8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1152 if (ID != this \|\| ID == 0)
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1153 return;
8430ea8c1594 open editor tab and insert marker for debugging with gui John W. Eaton <jwe@octave.org> parents: 16375 diff changeset	1154
15848 424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1155 _edit_area->markerDeleteAll (debugger_position);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1156 if (line > 0)
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1157 {
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1158 _edit_area->markerAdd (line, debugger_position);
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1159 }
424edeca3c66 Redo portions of file editor to use more signals/slots rather than casting. Daniel J Sebald <daniel.sebald@ieee.org> parents: 15449 diff changeset	1160 }
15873 7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15860 diff changeset	1161
7d300b85ee25 allow build to proceed if either Qt or QScintilla is missing John W. Eaton <jwe@octave.org> parents: 15860 diff changeset	1162 #endif

Mercurial > octave-nkf

annotate libgui/src/m-editor/file-editor-tab.cc @ 16377:8430ea8c1594