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

comparison libgui/src/m-editor/file-editor-tab.cc @ 15848:424edeca3c66

Redo portions of file editor to use more signals/slots rather than casting. * file-editor-tab.cc, file-editor-tab.h (file_editor_tab::~file_editor_tab): Add. Delete lexer to prevent memory leak. Delete _edit_area to prevent memory leak. (file_editor_tab::conditional_close): Add. Simple slot that uses QWidget pointer as unique ID, not for function call. (file_editor_tab::file_name_query): Add. Simple slot that signals file name to whomever is connected. (file_editor_tab::find, file_editor_tab : public QWidget): Removed use of exec() and keep a pointer to the find_dialog as a member. Toggle hide()/show() via a connected slot to toggle visibility as desired. * file-editor.cc, file-editor.h, file-editor-tab.cc file-editor-tab.h (file_editor : public file_editor_interface, file_editor_tab : public QWidget, file_editor_tab::file_editor_tab, file_editor_tab::closeEvent, file_editor_tab::load_file, file_editor_tab::new_file, file_editor_tab::run_file): Remove _file_editor pointer member from file_editor_tab and rid file_editor::get_main_window from file_editor. There should be no need for such information about higher-level hierarchy inside lower-level objects. (file_editor::request_open_file, file_editor_tab::open_file): Move QFileDialog to file_editor::request_open_file and delete file_editor_tab::open_file since most of the remaining functionality is in file_editor_tab::load_file. (file_editor::active_editor_tab): Deleted. (file_editor::fetab_change_request, file_editor_tab::change_editor_state): Added to initiate a request for the editor tab to change focus. (file_editor_tab::editor_state_changed): Added arguments to pass the copy status and the directory path so that editor doesn't have to call functions for such information. (file_editor::handle_editor_state_changed): Add copying directory of the file_editor_tab to the current editing directory. (file_editor::check_conflict_save, file_editor_tab::editor_check_conflict_save, file_editor_tab::save_file_as, file_editor_tab::handle_save_file_as_answer): Moved a portion of the save-file-as dialog mechanism to the file_editor where all file names can be obtained to check for conflict with already open files. The new signal indicates to the editor that a name check be done, and in turn the editor signals the tab to save the file. * main-window.cc, file-editor.cc, file-editor.h, file-editor-interface.h (file_editor::terminal, file_editor : public file_editor_interface, file_editor_interface : public QDockWidget): Since file_editor_tab no longer looks up to main_window, remove _main_window and _terminal from file_editor and file_editor_interface, as well as file_editor::terminal. * file-editor-tab.cc (file_editor_tab::file_has_changed): Make the dialog boxes non-modal and use slots to handle user answers. (file_editor_tab::closeEvent): Remove portion that accesses upper hierarchy member functions, can find better approaches. (file_editor_tab::file_editor_tab): Make there no parent for QsciScintilla so that window modality can be set to individual editor. * file-editor-tab.cc, file-editor.cc (file_editor_tab::load_file): Use show() member rather than exec() and set modality to window so that rest of application may function. Return a QString with message rather than a boolean. * file-editor-tab.cc, (file_editor_tab::file_has_changed): Remove static variable alreadyAsking. Multiple file_editor_tabs are using this code so do not want to block recognition of multiple file having changed on disk (bug #37406). Instead, simply stop tracking via the file watcher. (file_editor_tab::save_file, file_editor_tab::save_file_as, file_editor_tab::handle_save_file_as_answer, file_editor_tab::handle_save_file_as_answer_close): Added a remove_on_success variable. Changed the QFileDialog to WindowModal and created slots to handle file selected signal and finished signal. Signal/slot connects vary based upon remove_on_success setting. (file_editor_tab::check_file_modified): Changed the QFileDialog to NonModal and attach some slots. Editor tab can't be parent in case deleted, so use read-only state of the editor area. * file-editor-tab.h (file_editor_tab : public QWidget): New signals for file_editor for tab and file name management. (file_editor_tab::get_file_name): Delete. * file-editor.h (file_editor : public file_editor_interface): Make QStringList sessionFileNames a member of file_editor so that it can retain data between file_editor_tab signals. Also can be used for checking precense of filenames and prevent opening multiple copies (bug #36869) Added signals for file editor tabs--settings_changed, fetab_close_request, and query_file_name. Three new slots for tab and file name management. * file-editor-interface.h, file-editor.h (file_editor_interface::add_file_editor_tab, file_editor::add_file_editor_tab): Made the text name for the tab an input variable. * file-editor.cc (file_editor::~file_editor): Replace dynamic_cast with simple signal querying all file editor tabs for file names which end up in savedSessionTabs. (file_editor::handle_file_name_changed): Dynamic cast not necessary since QObject and QWidget are compatible. (file_editor::handle_tab_close_request): Replace dynamic_cast with signal to request file_editor_tab with associated tabID tag should close. (file_editor::handle_tab_remove_request): Rename of handle_tab_close_request. Instead of dynamic cast, loop through pointers comparing QWidget* to QObject*, if same tag remove tab via index and also delete which fixes a memory leak. (file_editor::handle_add_filename_to_list): Simple slot that uses append() of the list member functions. (file_editor::notice_settings): Rather than dynamic cast, emit signal for the file_editor_tabs. (file_editor::add_file_editor_tab): New variety of connections for improved flow. (file_editor::request_open_file): Given error messages are made WindowModal, the tab shouldn't be delete if file open is not successful. The file_editor_tab takes care of that. (file_editor::request_open_file): Added check and message box for the requested file already open in editor. For the non-interactive overloaded version, open a message dialog box to tell the user file not found, e.g., could not find file in the settings when launched. (file_editor::request_open_file): Inquire file names and update list before checking for existence of files. Supply empty title to editor tab then have file_editor_tab update name. * file-editor-tab.h, file-editor-tab.cc, file-editor.cc (file_editor_tab::run_file): New signal process_octave_code. (file_editor::add_file_editor_tab): Connect signal process_octave_code to file_editor's parent's slot handle_command_double_clicked.

author	Daniel J Sebald <daniel.sebald@ieee.org>
date	Sun, 23 Dec 2012 14:33:48 -0600
parents	63dd6c30b294
children	e55a64f49346

comparison

equal deleted inserted replaced

-:13d1e9bfa362
+:424edeca3c66
 #include <QTextStream>
 #include <QVBoxLayout>
 #include "file-editor-tab.h"
 #include "file-editor.h"
-#include "find-dialog.h"
 #include "octave-link.h"
 #include "debug.h"
 #include "oct-env.h"
-file_editor_tab::file_editor_tab(file_editor *fileEditor)
+// Make parent null for the file editor tab so that warning
-: QWidget ((QWidget*)fileEditor)
+// WindowModal messages don't affect grandparents.
-{
+file_editor_tab::file_editor_tab (QString directory)
-_file_editor = fileEditor;
+{
-_file_name = "";
+// Make sure there is a slash at the end of the directory name
+// for identification when saved later.
+if (directory.count () && directory.at (directory.count () - 1) != '/')
+directory.append ("/");
+_file_name = directory;
 _edit_area = new QsciScintilla (this);
+// Leave the find dialog box out of memory until requested.
+_find_dialog = 0;
+_find_dialog_is_visible = false;
 // symbols
 _edit_area->setMarginType (1, QsciScintilla::SymbolMargin);
 _edit_area->setMarginSensitivity (1, true);
 _edit_area->markerDefine (QsciScintilla::RightTriangle, bookmark);
 connect (_edit_area, SIGNAL (copyAvailable (bool)),
 this, SLOT (handle_copy_available (bool)));
 connect (&_file_system_watcher, SIGNAL (fileChanged (QString)),
 this, SLOT (file_has_changed (QString)));
-_file_name = "";
 notice_settings ();
 }
-bool
+file_editor_tab::~file_editor_tab ()
-file_editor_tab::copy_available ()
+{
-{
+// Destroy items attached to _edit_area.
-return _copy_available;
+QsciLexer *lexer = _edit_area->lexer ();
+if (lexer)
+{
+delete lexer;
+_edit_area->setLexer(0);
+}
+if (_find_dialog)
+{
+delete _find_dialog;
+_find_dialog = 0;
+}
+// Destroy _edit_area.
+delete _edit_area;
 }
 void
 file_editor_tab::closeEvent (QCloseEvent *e)
 {
-if (_file_editor->get_main_window ()->is_closing ())
+// ignore close event if file is not saved and user cancels
-{
+// closing this window
-// close whole application: save file or not if modified
+if (check_file_modified ("Close File",
-check_file_modified ("Closing Octave", 0); // no cancel possible
+QMessageBox::Cancel) == QMessageBox::Cancel)
-e->accept ();
+{
-}
+e->ignore ();
-else
+}
-{
+else
-// ignore close event if file is not saved and user cancels
+{
-// closing this window
+e->accept();
-if (check_file_modified ("Close File",
-QMessageBox::Cancel) == QMessageBox::Cancel)
-{
-e->ignore ();
-}
-else
-{
-e->accept();
-}
 }
 }
 void
 file_editor_tab::set_file_name (const QString& fileName)
 {
-if (fileName != UNNAMED_FILE)
+// update tracked file if we really have a file on disk
-{
+QStringList trackedFiles = _file_system_watcher.files ();
-// update tracked file if wie really hae a file on disk
+if (!trackedFiles.isEmpty ())
-QStringList trackedFiles = _file_system_watcher.files ();
+_file_system_watcher.removePath (_file_name);
-if (!trackedFiles.isEmpty ())
+if (!fileName.isEmpty ())
-_file_system_watcher.removePath (_file_name);
+_file_system_watcher.addPath (fileName);
-_file_system_watcher.addPath (fileName);
-}
 _file_name = fileName;
 // update lexer after _file_name change
 update_lexer ();
+// update the file editor with current editing directory
+emit editor_state_changed (_copy_available, QDir::cleanPath (_file_name));
 }
 void
 file_editor_tab::handle_margin_clicked(int margin, int line,
 Qt::KeyboardModifiers state)
 }
 void
 file_editor_tab::update_lexer ()
 {
-QsciLexer *lexer =  _edit_area->lexer ();
+QsciLexer *lexer = _edit_area->lexer ();
 delete lexer;
 if (_file_name.endsWith (".m") || _file_name.endsWith (".M"))
 {
 lexer = new lexer_octave_gui ();
 _edit_area->setLexer (lexer);
 }
 void
+file_editor_tab::undo (const QWidget* ID)
+{
+if (ID != this)
+return;
+_edit_area->undo ();
+}
+void
+file_editor_tab::redo (const QWidget* ID)
+{
+if (ID != this)
+return;
+_edit_area->redo ();
+}
+void
+file_editor_tab::copy (const QWidget* ID)
+{
+if (ID != this)
+return;
+_edit_area->copy ();
+}
+void
+file_editor_tab::cut (const QWidget* ID)
+{
+if (ID != this)
+return;
+_edit_area->cut ();
+}
+void
+file_editor_tab::paste (const QWidget* ID)
+{
+if (ID != this)
+return;
+_edit_area->paste ();
+}
+void
+file_editor_tab::save_file (const QWidget* ID)
+{
+if (ID != this)
+return;
+save_file (_file_name);
+}
+void
+file_editor_tab::save_file (const QWidget* ID, const QString& fileName, bool remove_on_success)
+{
+if (ID != this)
+return;
+save_file (fileName, remove_on_success);
+}
+void
+file_editor_tab::save_file_as (const QWidget* ID)
+{
+if (ID != this)
+return;
+save_file_as ();
+}
+void
+file_editor_tab::run_file_callback (void)
+{
+// Maybe someday we will do something here?
+}
+void
+file_editor_tab::run_file (const QWidget* ID)
+{
+if (ID != this)
+return;
+if (_edit_area->isModified ())
+save_file (_file_name);
+QFileInfo file_info (_file_name);
+QString path = file_info.absolutePath ();
+QString current_path
+= QString::fromStdString (octave_link::last_working_directory ());
+QString function_name = file_info.fileName ();
+// We have to cut off the suffix, because octave appends it.
+function_name.chop (file_info.suffix ().length () + 1);
+emit process_octave_code (QString ("cd \'%1\'\n%2\n")
+.arg(path).arg (function_name));
+// TODO: Sending a run event crashes for long scripts. Find out why.
+// octave_link::post_event
+//   (this, &file_editor_tab::run_file_callback, _file_name.toStdString ()));
+}
+void
+file_editor_tab::toggle_bookmark (const QWidget* ID)
+{
+if (ID != this)
+return;
+int line, cur;
+_edit_area->getCursorPosition (&line,&cur);
+if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
+_edit_area->markerDelete (line, bookmark);
+else
+_edit_area->markerAdd (line, bookmark);
+}
+void
+file_editor_tab::next_bookmark (const QWidget* ID)
+{
+if (ID != this)
+return;
+int line, cur, nextline;
+_edit_area->getCursorPosition (&line, &cur);
+if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
+line++; // we have a breakpoint here, so start search from next line
+nextline = _edit_area->markerFindNext (line, (1 << bookmark));
+_edit_area->setCursorPosition (nextline, 0);
+}
+void
+file_editor_tab::previous_bookmark (const QWidget* ID)
+{
+if (ID != this)
+return;
+int line, cur, prevline;
+_edit_area->getCursorPosition (&line, &cur);
+if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
+line--; // we have a breakpoint here, so start search from prev line
+prevline = _edit_area->markerFindPrevious (line, (1 << bookmark));
+_edit_area->setCursorPosition (prevline, 0);
+}
+void
+file_editor_tab::remove_bookmark (const QWidget* ID)
+{
+if (ID != this)
+return;
+_edit_area->markerDeleteAll (bookmark);
+}
+void
+file_editor_tab::add_breakpoint_callback (const bp_info& info)
+{
+bp_table::intmap intmap;
+intmap[0] = info.line + 1;
+std::string previous_directory = octave_env::get_current_directory ();
+octave_env::chdir (info.path);
+intmap = bp_table::add_breakpoint (info.function_name, intmap);
+octave_env::chdir (previous_directory);
+if (intmap.size () > 0)
+{
+// FIXME -- Check file.
+_edit_area->markerAdd (info.line, breakpoint);
+}
+}
+void
+file_editor_tab::remove_breakpoint_callback (const bp_info& info)
+{
+bp_table::intmap intmap;
+intmap[0] = info.line;
+std::string previous_directory = octave_env::get_current_directory ();
+octave_env::chdir (info.path);
+bp_table::remove_breakpoint (info.function_name, intmap);
+octave_env::chdir (previous_directory);
+// FIXME -- check result
+bool success = true;
+if (success)
+{
+// FIXME -- check file.
+_edit_area->markerDelete (info.line, breakpoint);
+}
+}
+void
+file_editor_tab::remove_all_breakpoints_callback (const bp_info& info)
+{
+bp_table::intmap intmap;
+std::string previous_directory = octave_env::get_current_directory ();
+octave_env::chdir (info.path);
+intmap = bp_table::remove_all_breakpoints_in_file (info.function_name, true);
+octave_env::chdir (previous_directory);
+if (intmap.size() > 0)
+_edit_area->markerDeleteAll (breakpoint);
+}
+void
 file_editor_tab::request_add_breakpoint (int line)
 {
 QFileInfo file_info (_file_name);
 QString path = file_info.absolutePath ();
 QString function_name = file_info.fileName ();
 octave_link::post_event
 (this, &file_editor_tab::remove_breakpoint_callback, info);
 }
 void
-file_editor_tab::comment_selected_text ()
+file_editor_tab::toggle_breakpoint (const QWidget* ID)
 {
+if (ID != this)
+return;
+int line, cur;
+_edit_area->getCursorPosition (&line, &cur);
+if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
+request_remove_breakpoint (line);
+else
+request_add_breakpoint (line);
+}
+void
+file_editor_tab::next_breakpoint (const QWidget* ID)
+{
+if (ID != this)
+return;
+int line, cur, nextline;
+_edit_area->getCursorPosition (&line, &cur);
+if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
+line++; // we have a breakpoint here, so start search from next line
+nextline = _edit_area->markerFindNext (line, (1 << breakpoint));
+_edit_area->setCursorPosition (nextline, 0);
+}
+void
+file_editor_tab::previous_breakpoint (const QWidget* ID)
+{
+if (ID != this)
+return;
+int line, cur, prevline;
+_edit_area->getCursorPosition (&line, &cur);
+if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
+line--; // we have a breakpoint here, so start search from prev line
+prevline = _edit_area->markerFindPrevious (line, (1 << breakpoint));
+_edit_area->setCursorPosition (prevline, 0);
+}
+void
+file_editor_tab::remove_all_breakpoints (const QWidget* ID)
+{
+if (ID != this)
+return;
+QFileInfo file_info (_file_name);
+QString path = file_info.absolutePath ();
+QString function_name = file_info.fileName ();
+// We have to cut off the suffix, because octave appends it.
+function_name.chop (file_info.suffix ().length () + 1);
+bp_info info (path, function_name, 0);
+octave_link::post_event
+(this, &file_editor_tab::remove_all_breakpoints_callback, info);
+}
+void
+file_editor_tab::comment_selected_text (const QWidget* ID)
+{
+if (ID != this)
+return;
 do_comment_selected_text (true);
 }
 void
-file_editor_tab::uncomment_selected_text ()
+file_editor_tab::uncomment_selected_text (const QWidget* ID)
 {
+if (ID != this)
+return;
 do_comment_selected_text (false);
+}
+void
+file_editor_tab::handle_find_dialog_finished (int)
+{
+// Find dialog is going to hide.  Save location of window for
+// when it is reshown.
+_find_dialog_geometry = _find_dialog->geometry ();
+_find_dialog_is_visible = false;
+}
+void
+file_editor_tab::find (const QWidget* ID)
+{
+if (ID != this)
+return;
+// The find_dialog feature doesn't need a slot for return info.
+// Rather than Qt::DeleteOnClose, let the find feature hang about
+// in case it contains useful information like previous searches
+// and so on.  Perhaps one find dialog for the whole editor is
+// better, but individual find dialogs has the nice feature of
+// retaining position per file editor tabs, which can be undocked.
+if (!_find_dialog)
+{
+_find_dialog = new find_dialog (_edit_area);
+connect (_find_dialog, SIGNAL (finished (int)),
+this, SLOT (handle_find_dialog_finished (int)));
+_find_dialog->setWindowModality (Qt::NonModal);
+_find_dialog_geometry = _find_dialog->geometry ();
+}
+if (!_find_dialog->isVisible ())
+{
+_find_dialog->setGeometry (_find_dialog_geometry);
+_find_dialog->show ();
+_find_dialog_is_visible = true;
+}
+_find_dialog->activateWindow ();
 }
 void
 file_editor_tab::do_comment_selected_text (bool comment)
 {
 _edit_area->endUndoAction ();
 }
 }
 void
-file_editor_tab::find ()
-{
-find_dialog dialog (_edit_area);
-dialog.exec ();
-}
-void
 file_editor_tab::update_window_title (bool modified)
 {
-QString title(_file_name);
+QString title ("");
+if (_file_name.isEmpty () || _file_name.at (_file_name.count () - 1) == '/')
+title = UNNAMED_FILE;
+else
+title = _file_name;
 if ( !_long_title )
 {
 QFileInfo file(_file_name);
 title = file.fileName();
 }
 void
 file_editor_tab::handle_copy_available(bool enableCopy)
 {
 _copy_available = enableCopy;
-emit editor_state_changed ();
+emit editor_state_changed (_copy_available, QDir::cleanPath (_file_name));
 }
 int
 file_editor_tab::check_file_modified (const QString& msg, int cancelButton)
 {
 int decision = QMessageBox::Yes;
 if (_edit_area->isModified ())
 {
-// file is modified but not saved, ask user what to do
+// File is modified but not saved, ask user what to do.  The file
-decision = QMessageBox::warning (this,
+// editor tab can't be made parent because it may be deleted depending
-msg,
+// upon the response.  Instead, change the _edit_area to read only.
-tr ("The file %1\n"
+QMessageBox* msgBox = new QMessageBox (
-"has been modified. Do you want to save the changes?").
+QMessageBox::Warning, tr ("Octave Editor"),
-arg (_file_name),
+tr ("The file \'%1\' has been modified. Do you want to save the changes?").
-QMessageBox::Save,
+arg (_file_name), QMessageBox::Yes | QMessageBox::No, 0);
-QMessageBox::Discard, cancelButton );
+_edit_area->setReadOnly (true);
-if (decision == QMessageBox::Save)
+connect (msgBox, SIGNAL (finished (int)),
-{
+this, SLOT (handle_file_modified_answer (int)));
-save_file ();
+msgBox->setWindowModality (Qt::NonModal);
-if (_edit_area->isModified ())
+msgBox->setAttribute (Qt::WA_DeleteOnClose);
-{
+msgBox->show ();
-// If the user attempted to save the file, but it's still
+return (QMessageBox::Cancel);
-// modified, then probably something went wrong, so return
+}
-// cancel for cancel this operation or try to save files
+else
-// as if cancel not possible
+{
-if ( cancelButton )
+// Nothing was modified, just remove from editor.
-return (QMessageBox::Cancel);
+emit tab_remove_request ();
-else
+}
-save_file_as ();
-}
-}
-}
 return (decision);
 }
 void
-file_editor_tab::remove_bookmark ()
+file_editor_tab::handle_file_modified_answer (int decision)
 {
-_edit_area->markerDeleteAll (bookmark);
+if (decision == QMessageBox::Yes)
-}
+{
+// Save file, then remove from editor.
-void
+save_file (_file_name, true);
-file_editor_tab::toggle_bookmark ()
+}
-{
+else if (decision == QMessageBox::No)
-int line, cur;
+{
-_edit_area->getCursorPosition (&line,&cur);
+// User doesn't want to save, just remove from editor.
-if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
+emit tab_remove_request ();
-_edit_area->markerDelete (line, bookmark);
+}
 else
-_edit_area->markerAdd (line, bookmark);
+{
-}
+// User canceled, allow editing again.
+_edit_area->setReadOnly (false);
-void
-file_editor_tab::next_bookmark()
-{
-int line, cur, nextline;
-_edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
-line++; // we have a breakpoint here, so start search from next line
-nextline = _edit_area->markerFindNext (line, (1 << bookmark));
-_edit_area->setCursorPosition (nextline, 0);
-}
-void
-file_editor_tab::previous_bookmark ()
-{
-int line, cur, prevline;
-_edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << bookmark) )
-line--; // we have a breakpoint here, so start search from prev line
-prevline = _edit_area->markerFindPrevious (line, (1 << bookmark));
-_edit_area->setCursorPosition (prevline, 0);
-}
-void
-file_editor_tab::remove_all_breakpoints ()
-{
-QFileInfo file_info (_file_name);
-QString path = file_info.absolutePath ();
-QString function_name = file_info.fileName ();
-// We have to cut off the suffix, because octave appends it.
-function_name.chop (file_info.suffix ().length () + 1);
-bp_info info (path, function_name, 0);
-octave_link::post_event
-(this, &file_editor_tab::remove_all_breakpoints_callback, info);
-}
-void
-file_editor_tab::toggle_breakpoint ()
-{
-int line, cur;
-_edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
-request_remove_breakpoint (line);
-else
-request_add_breakpoint (line);
-}
-void
-file_editor_tab::next_breakpoint ()
-{
-int line, cur, nextline;
-_edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
-line++; // we have a breakpoint here, so start search from next line
-nextline = _edit_area->markerFindNext (line, (1 << breakpoint));
-_edit_area->setCursorPosition (nextline, 0);
-}
-void
-file_editor_tab::previous_breakpoint ()
-{
-int line, cur, prevline;
-_edit_area->getCursorPosition (&line, &cur);
-if ( _edit_area->markersAtLine (line) && (1 << breakpoint) )
-line--; // we have a breakpoint here, so start search from prev line
-prevline = _edit_area->markerFindPrevious (line, (1 << breakpoint));
-_edit_area->setCursorPosition (prevline, 0);
-}
-void
-file_editor_tab::cut ()
-{
-_edit_area->cut ();
-}
-void
-file_editor_tab::copy ()
-{
-_edit_area->copy ();
-}
-void
-file_editor_tab::paste ()
-{
-_edit_area->paste ();
-}
-void
-file_editor_tab::undo ()
-{
-_edit_area->undo ();
-}
-void
-file_editor_tab::redo ()
-{
-_edit_area->redo ();
-}
-void
-file_editor_tab::set_debugger_position (int line)
-{
-_edit_area->markerDeleteAll (debugger_position);
-if (line > 0)
-{
-_edit_area->markerAdd (line, debugger_position);
 }
 }
 void
 file_editor_tab::set_modified (bool modified)
 {
 _edit_area->setModified (modified);
 }
-bool
+QString
-file_editor_tab::open_file (const QString& dir)
+file_editor_tab::load_file(const QString& fileName)
 {
-QString openFileName;
-QFileDialog fileDialog(this);
-fileDialog.setNameFilter(SAVE_FILE_FILTER);
-fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
-fileDialog.setViewMode(QFileDialog::Detail);
-fileDialog.setDirectory(dir);
-if (fileDialog.exec () == QDialog::Accepted)
-{
-openFileName = fileDialog.selectedFiles().at(0);
-if (openFileName.isEmpty ())
-return false;
-return load_file(openFileName);
-}
-else
-{
-return false;
-}
-}
-bool
-file_editor_tab::load_file(const QString& fileName, bool silent)
-{
-if (!_file_editor->isVisible ())
-{
-_file_editor->show ();
-}
 QFile file (fileName);
 if (!file.open (QFile::ReadOnly))
 {
-if (silent==false)
+return file.errorString ();
-QMessageBox::warning (this, tr ("Octave Editor"),
-tr ("Could not open file %1 for read:\n%2.").arg (fileName).
-arg (file.errorString ()));
-return false;
 }
 QTextStream in (&file);
 QApplication::setOverrideCursor (Qt::WaitCursor);
 _edit_area->setText (in.readAll ());
 set_file_name (fileName);
 update_window_title (false); // window title (no modification)
 _edit_area->setModified (false); // loaded file is not modified yet
-return true;
+return QString ();
 }
 void
 file_editor_tab::new_file ()
 {
-if (!_file_editor->isVisible ())
-{
-_file_editor->show ();
-}
-set_file_name (UNNAMED_FILE);
 update_window_title (false); // window title (no modification)
 _edit_area->setText ("");
 _edit_area->setModified (false); // new file is not modified yet
 }
-bool file_editor_tab::save_file()
+void
-{
+file_editor_tab::save_file (const QString& saveFileName, bool remove_on_success)
-return save_file (_file_name);
+{
-}
+// If it is a new file with no name, signal that saveFileAs
+// should be performed.
-bool
+if (saveFileName.isEmpty () || saveFileName.at (saveFileName.count () - 1) == '/')
-file_editor_tab::save_file (const QString& saveFileName)
+{
-{
+save_file_as (remove_on_success);
-// it is a new file with the name "<unnamed>" -> call saveFielAs
+return;
-if (saveFileName == UNNAMED_FILE || saveFileName.isEmpty ())
+}
-{
-return save_file_as();
+// stop watching file
-}
+QStringList trackedFiles = _file_system_watcher.files ();
+if (!trackedFiles.isEmpty ())
-// remove the file to save from the tracker since we will change it on disk now
+_file_system_watcher.removePath (saveFileName);
-QStringList watched_files = _file_system_watcher.files();
-if (!watched_files.isEmpty ())
-_file_system_watcher.removePath(saveFileName);
 // open the file for writing
 QFile file (saveFileName);
-if (!file.open (QFile::WriteOnly))
+if (!file.open (QIODevice::WriteOnly))
 {
-QMessageBox::warning (this, tr ("Octave Editor"),
+// Unsuccessful, begin watching file again if it was being
-tr ("Could not open file %1 for write:\n%2.").
+// watched previously.
-arg (saveFileName).arg (file.errorString ()));
+if (trackedFiles.contains (saveFileName))
-return false;
+_file_system_watcher.addPath (saveFileName);
+// Create a NonModal message about error.
+QMessageBox* msgBox = new QMessageBox (
+QMessageBox::Critical, tr ("Octave Editor"),
+tr ("Could not open file %1 for write:\n%2.").
+arg (saveFileName).arg (file.errorString ()),
+QMessageBox::Ok, 0);
+msgBox->setWindowModality (Qt::NonModal);
+msgBox->setAttribute (Qt::WA_DeleteOnClose);
+msgBox->show ();
+return;
 }
 // save the contents into the file
 QTextStream out (&file);
 QApplication::setOverrideCursor (Qt::WaitCursor);
 out << _edit_area->text ();
 QApplication::restoreOverrideCursor ();
 file.close();
-// save file name after closing file otherwise tracker will notice file change
+// save file name after closing file as set_file_name starts watching again
 set_file_name (saveFileName);
 // set the window title to actual file name (not modified)
 update_window_title (false);
 // files is save -> not modified
 _edit_area->setModified (false);
-return true;
+if (remove_on_success)
-}
+{
+emit tab_remove_request ();
-bool
+return;  // Don't touch member variables after removal
-file_editor_tab::save_file_as ()
+}
-{
+}
-QString saveFileName(_file_name);
-QFileDialog fileDialog(this);
+void
-if (saveFileName == UNNAMED_FILE || saveFileName.isEmpty ())
+file_editor_tab::save_file_as (bool remove_on_success)
 {
-QString directory = QString::fromStdString
+// Simply put up the file chooser dialog box with a slot connection
-(octave_link::last_working_directory ());
+// then return control to the system waiting for a file selection.
-if (directory.isEmpty ())
+// If the tab is removed in response to a QFileDialog signal, the tab
+// can't be a parent.
+QFileDialog* fileDialog;
+if (remove_on_success)
+{
+// If tab is closed, "this" cannot be parent in which case modality
+// has no effect.  Disable editing instead.
+_edit_area->setReadOnly (true);
+fileDialog = new QFileDialog ();
+}
+else
+fileDialog = new QFileDialog (this);
+if (!_file_name.isEmpty () && _file_name.at (_file_name.count () - 1) != '/')
+{
+fileDialog->selectFile (_file_name);
+}
+else
+{
+fileDialog->selectFile ("");
+if (_file_name.isEmpty ())
 {
-directory = QDir::homePath ();
+fileDialog->setDirectory (QDir::currentPath ());
-}
-fileDialog.setDirectory (directory);
-}
-else
-{
-fileDialog.selectFile (saveFileName);
-}
-fileDialog.setNameFilter (SAVE_FILE_FILTER);
-fileDialog.setDefaultSuffix ("m");
-fileDialog.setAcceptMode (QFileDialog::AcceptSave);
-fileDialog.setViewMode (QFileDialog::Detail);
-if (fileDialog.exec ())
-{
-saveFileName = fileDialog.selectedFiles ().at (0);
-if (saveFileName.isEmpty ())
-return false;
-return save_file (saveFileName);
-}
-return false;
-}
-void
-file_editor_tab::run_file ()
-{
-if (_edit_area->isModified ())
-save_file(_file_name);
-QFileInfo file_info (_file_name);
-QString path = file_info.absolutePath ();
-QString current_path
-= QString::fromStdString (octave_link::last_working_directory ());
-QString function_name = file_info.fileName ();
-// We have to cut off the suffix, because octave appends it.
-function_name.chop (file_info.suffix ().length () + 1);
-_file_editor->terminal ()->sendText (QString ("cd \'%1\'\n%2\n")
-.arg(path).arg (function_name));
-// TODO: Sending a run event crashes for long scripts. Find out why.
-// octave_link::post_event
-//   (this, &file_editor_tab::run_file_callback, _file_name.toStdString ()));
-}
-void
-file_editor_tab::file_has_changed (const QString&)
-{
-if (QFile::exists (_file_name))
-{
-// Prevent popping up multiple message boxes when the file has
-// been changed multiple times.
-static bool alreadyAsking = false;
-if (!alreadyAsking)
-{
-alreadyAsking = true;
-int decision =
-QMessageBox::warning (this, tr ("Octave Editor"),
-tr ("It seems that \'%1\' has been modified by another application. Do you want to reload it?").
-arg (_file_name), QMessageBox::Yes,
-QMessageBox::No);
-if (decision == QMessageBox::Yes)
-{
-load_file (_file_name);
-}
-alreadyAsking = false;
-}
-}
-else
-{
-int decision =
-QMessageBox::warning (this, tr ("Octave Editor"),
-tr ("It seems that \'%1\' has been deleted or renamed. Do you want to save it now?").
-arg (_file_name), QMessageBox::Save,
-QMessageBox::Close);
-if (decision == QMessageBox::Save)
-{
-if (!save_file_as ())
-{
-set_file_name (UNNAMED_FILE);
-update_window_title (true); // window title (no modification)
-set_modified (true);
-}
 }
 else
 {
-emit close_request ();
+// The file name is actually the directory name from the
+// constructor argument.
+fileDialog->setDirectory (_file_name);
 }
+}
+fileDialog->setNameFilter (SAVE_FILE_FILTER);
+fileDialog->setDefaultSuffix ("m");
+fileDialog->setAcceptMode (QFileDialog::AcceptSave);
+fileDialog->setViewMode (QFileDialog::Detail);
+if (remove_on_success)
+{
+connect (fileDialog, SIGNAL (fileSelected (const QString&)),
+this, SLOT (handle_save_file_as_answer_close (const QString&)));
+connect (fileDialog, SIGNAL (rejected ()),
+this, SLOT (handle_save_file_as_answer_cancel ()));
+}
+else
+{
+connect (fileDialog, SIGNAL (fileSelected (const QString&)),
+this, SLOT (handle_save_file_as_answer (const QString&)));
+}
+fileDialog->setWindowModality (Qt::WindowModal);
+fileDialog->setAttribute (Qt::WA_DeleteOnClose);
+fileDialog->show ();
+}
+void
+file_editor_tab::message_duplicate_file_name (const QString& saveFileName)
+{
+// Could overwrite the file here (and tell user the file was
+// overwritten), but the user could have unintentionally
+// selected the same name not intending to overwrite.
+// Create a NonModal message about error.
+QMessageBox* msgBox = new QMessageBox (
+QMessageBox::Critical, tr ("Octave Editor"),
+tr ("File not saved!  You've selected a file name\n\n     %1\n\nwhich is the same as the current file name.  Use ""Save"" to overwrite.  (Could allow overwriting, with message, if that is what folks want.)").
+arg (saveFileName),
+QMessageBox::Ok, 0);
+msgBox->setWindowModality (Qt::NonModal);
+msgBox->setAttribute (Qt::WA_DeleteOnClose);
+msgBox->show ();
+}
+void
+file_editor_tab::handle_save_file_as_answer (const QString& saveFileName)
+{
+if (saveFileName == _file_name)
+{
+message_duplicate_file_name (saveFileName);
+// Nothing done, allow editing again.
+_edit_area->setReadOnly (false);
+}
+else
+{
+// Have editor check for conflict, do not delete tab after save.
+emit editor_check_conflict_save (saveFileName, false);
+}
+}
+void
+file_editor_tab::handle_save_file_as_answer_close (const QString& saveFileName)
+{
+if (saveFileName == _file_name)
+{
+message_duplicate_file_name (saveFileName);
+// Nothing done, allow editing again.
+_edit_area->setReadOnly (false);
+}
+else
+{
+// Have editor check for conflict, delete tab after save.
+emit editor_check_conflict_save (saveFileName, true);
+}
+}
+void
+file_editor_tab::handle_save_file_as_answer_cancel ()
+{
+// User canceled, allow editing again.
+_edit_area->setReadOnly (false);
+}
+void
+file_editor_tab::file_has_changed (const QString&)
+{
+// Prevent popping up multiple message boxes when the file has
+// been changed multiple times by temporarily removing from the
+// file watcher.
+QStringList trackedFiles = _file_system_watcher.files ();
+if (!trackedFiles.isEmpty ())
+_file_system_watcher.removePath (_file_name);
+if (QFile::exists (_file_name))
+{
+// Create a WindowModal message that blocks the edit area
+// by making _edit_area parent.
+QMessageBox* msgBox = new QMessageBox (
+QMessageBox::Warning, tr ("Octave Editor"),
+tr ("It seems that \'%1\' has been modified by another application. Do you want to reload it?").
+arg (_file_name), QMessageBox::Yes | QMessageBox::No, this);
+connect (msgBox, SIGNAL (finished (int)),
+this, SLOT (handle_file_reload_answer (int)));
+msgBox->setWindowModality (Qt::WindowModal);
+msgBox->setAttribute (Qt::WA_DeleteOnClose);
+msgBox->show ();
+}
+else
+{
+// Create a WindowModal message that blocks the edit area
+// by making _edit_area parent.
+QMessageBox* msgBox = new QMessageBox (
+QMessageBox::Warning, tr ("Octave Editor"),
+tr ("It seems that \'%1\' has been deleted or renamed. Do you want to save it now?").
+arg (_file_name), QMessageBox::Save | QMessageBox::Close, this);
+connect (msgBox, SIGNAL (finished (int)),
+this, SLOT (handle_file_resave_answer (int)));
+msgBox->setWindowModality (Qt::WindowModal);
+msgBox->setAttribute (Qt::WA_DeleteOnClose);
+msgBox->show ();
 }
 }
 void
 file_editor_tab::notice_settings ()
 update_window_title (false);
 }
 void
-file_editor_tab::run_file_callback (void)
+file_editor_tab::conditional_close (const QWidget* ID)
 {
-// Maybe someday we will do something here?
+if (ID != this)
-}
+return;
-void
+close ();
-file_editor_tab::add_breakpoint_callback (const bp_info& info)
+}
-{
-bp_table::intmap intmap;
+void
-intmap[0] = info.line + 1;
+file_editor_tab::change_editor_state (const QWidget* ID)
+{
-std::string previous_directory = octave_env::get_current_directory ();
+if (ID != this)
-octave_env::chdir (info.path);
+{
-intmap = bp_table::add_breakpoint (info.function_name, intmap);
+// Widget may be going out of focus.  If so, record location.
-octave_env::chdir (previous_directory);
+if (_find_dialog)
+{
-if (intmap.size () > 0)
+if (_find_dialog->isVisible ())
 {
-// FIXME -- Check file.
+_find_dialog_geometry = _find_dialog->geometry ();
-_edit_area->markerAdd (info.line, breakpoint);
+_find_dialog->hide ();
 }
 }
+return;
-void
+}
-file_editor_tab::remove_breakpoint_callback (const bp_info& info)
-{
+if (_find_dialog && _find_dialog_is_visible)
-bp_table::intmap intmap;
+{
-intmap[0] = info.line;
+_find_dialog->setGeometry (_find_dialog_geometry);
+_find_dialog->show ();
-std::string previous_directory = octave_env::get_current_directory ();
+}
-octave_env::chdir (info.path);
+emit editor_state_changed (_copy_available, QDir::cleanPath (_file_name));
-bp_table::remove_breakpoint (info.function_name, intmap);
+}
-octave_env::chdir (previous_directory);
+void
-// FIXME -- check result
+file_editor_tab::file_name_query (const QWidget* ID)
-bool success = true;
+{
+// A zero (null pointer) means that all file editor tabs
-if (success)
+// should respond, otherwise just the desired file editor tab.
-{
+if (ID != this && ID != 0)
-// FIXME -- check file.
+return;
-_edit_area->markerDelete (info.line, breakpoint);
-}
+// Unnamed files shouldn't be transmitted.
-}
+if (!_file_name.isEmpty ())
+emit add_filename_to_list (_file_name);
-void
+}
-file_editor_tab::remove_all_breakpoints_callback (const bp_info& info)
-{
+void
-bp_table::intmap intmap;
+file_editor_tab::handle_file_reload_answer (int decision)
-std::string previous_directory = octave_env::get_current_directory ();
+{
-octave_env::chdir (info.path);
+if (decision == QMessageBox::Yes)
-intmap = bp_table::remove_all_breakpoints_in_file (info.function_name, true);
+{
-octave_env::chdir (previous_directory);
+load_file (_file_name);
+}
-if (intmap.size() > 0)
-_edit_area->markerDeleteAll (breakpoint);
+// Start watching file once again.
-}
+_file_system_watcher.addPath (_file_name);
+}
+void
+file_editor_tab::handle_file_resave_answer (int decision)
+{
+if (decision == QMessageBox::Save)
+{
+save_file (_file_name);
+}
+else
+{
+if (close ())
+{
+emit tab_remove_request ();
+return;  // Don't touch member variables after removal
+}
+}
+// Start watching file once again.
+_file_system_watcher.addPath (_file_name);
+}
+void
+file_editor_tab::set_debugger_position (int line)
+{
+_edit_area->markerDeleteAll (debugger_position);
+if (line > 0)
+{
+_edit_area->markerAdd (line, debugger_position);
+}
+}

Mercurial > hg > octave-nkf

comparison libgui/src/m-editor/file-editor-tab.cc @ 15848:424edeca3c66