Mercurial > octave-nkf

comparison libgui/src/main-window.cc @ 19748:21015ca26566

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restructure shutdown flow and behavior for improved robustness * file-editor-interface.h (file_editor_interface::check_closing): Remove closing_state argument from input. * file-editor-tab.cc (file_editor_tab::_cancelled): New static variable for managing chain of file closes. (file_editor_tab::file_editor_tab): Discard _app_closing and _modal_dialog initializations. (file_editor_tab::closeEvent): Upon accepting the close event, als request tab removal. (file_editor_tab::check_modified_file): New simple routine checking for modified file if there hasn't been cancellation yet. (file_editor_tab::run_file): Remove use of _modal_dialog. (file_editor_tab::show_dialog): Add modal input setting. Remove use of _app_closing and _modal_dialog. (file_editor_tab::check_file_modified): Remove situational message for just one. If modified, call show_dialog with modal true, return QMessageBox::Cancel if anything cancelled, otherwise the user decision. (file_editor_tab::handle_file_modified_answer): Do not remove file editor tab in any case. If user cancelled, set _cancelled true. (file_editor_tab::save_file): Add "false" (non-modal) to show_dialog() call. (file_editor_tab::save_file_as): Add "false" (non-modal) to show_dialog() call. (file_editor_tab::conditional_close): Remove input argument and use of variable _app_closing. * file-editor-tab.h (file_editor_tab::conditional_close): Remove input argument. (file_editor_tab::reset_cancel): New member function declaration for managing cancellation of tab chain saves. (file_editor_tab::was_cancel): New member function for indicating any cancellation when saving modified files. (file_editor_tab::check_modified_file): New slot declaration for checking and saving file modifications. (file_editor_tab::show_dialog): Add modal option input argument. (file_editor_tab::_app_closing, file_editor_tab::_modal_dialog): Remove. (file_editor_tab::_cancelled): Add. * file-editor.cc (file_editor::file_editor): Remove _check_closing_done initialization. (file_editor::~file_editor): Remove use of _check_closing_done and check_closing(). (file_editor::check_closing): Clear cancellation history and check all files for modifications, without closing. Close all tabs and delete associated widgets if no cancellation. Remove use of _check_closing_done. (file_editor::request_close_file): Remove argument from conditional_close() function call. (file_editor::request_close_all_files): Ditto. (file_editor::request_close_other_files): Ditto. (file_editor::handle_tab_close_request): Ditto. (file_editor::handle_tab_remove_request): Add comment about deleting sender. (file_editor::add_file_editor_tab): Connect fetab_check_modified_file signal to check_modified_file slot. * file-editor.h (file_editor::fetab_check_modified_file): New signal. (file_editor::check_closing): Remove input argument. (file_editor::_check_closing_done): Remove. * main-window.cc (main_window::confirm_shutdown_octave): Rename of member function main_window::confirm_exit_octave(). Change return type to void. Set octave/qt link confirmation result then awake worker process. (main_window::exit_app): Rename of member function main_window::exit(). (main_window::closeEvent): Rather than post callback event, queue "exit" in the command buffer. (main_window::construct_octave_qt_link): Connect confirm_shutdown_signal to confirm_shutdown_octave slot. Connect exit_app_signal to exit_app slot. (main_window::exit_callback): Remove. (main_window::confirm_exit_octave): Renamed as confirm_shutdown_octave(). * main-window.h (main_window::confirm_shutdown_octave): Rename of slot confirm_exit_octave(). (main_window::exit): Renamed exit_app(). (main_window::exit_callback): Removed declaration. (main_window::confirm_exit_octave): Renamed confirm_shutdown_octave(). * octave-qt-link.cc (octave_qt_link::do_confirm_shutdown): New virtual function definition for initiating GUI shutdown and confirm exit. Worker process goes into sleep mode after issuing cross-thread signal. Return confirmation result. (octave_qt_link::do_exit): Change exit_signal to exit_app_signal. octave-qt-link.h (octave_qt_link::do_confirm_shutdown): New virtual function declaration for qt GUI. (octave_qt_link::mutex): Added. A QMutex for communicating with Qt GUI. (octave_qt_link::waitcondition): Added. For process wait. (octave_qt_link::shutdown_confirmation): Added. Store confirmation result. (octave_qt_link::_shutdown_confirm_result): Added. Confirmation result. (octave_qt_link::exit_signal): Signal renamed exit_app_signal. (octave_qt_link::confirm_shutdown_signal): Added. (octave_qt_link::exit_app_signal): Renamed of exit_signal. octave-link.h (octave_link::confirm_shutdown): Added. Access virtual function do_confirm_shutdown. (octave_link::do_confirm_shutdown): Added. Virtual function for GUI link. toplev.cc (clean_up_and_exit): Change 'retval' to 'status', as header file uses argument name 'status'. (quit): First initiate GUI shutdown via octave_link::confirm_shutdown() and if not confirmed, immediately return thereby avoiding exit sequence.
author Daniel J Sebald <daniel.sebald@ieee.org>
date Sat, 14 Feb 2015 11:27:10 -0600
parents c048358da712
children 3fa35defe495
comparison
equal deleted inserted replaced
19747:1a6fa5a523e4 19748:21015ca26566
775 ! settings->value ("terminal/print_debug_location", false).toBool (); 775 ! settings->value ("terminal/print_debug_location", false).toBool ();
776 776
777 resource_manager::update_network_settings (); 777 resource_manager::update_network_settings ();
778 } 778 }
779 779
780 void
781 main_window::confirm_shutdown_octave (void)
782 {
783 bool closenow = true;
784
785 QSettings *settings = resource_manager::get_settings ();
786
787 if (settings->value ("prompt_to_exit", false).toBool ())
788 {
789 int ans = QMessageBox::question (this, tr ("Octave"),
790 tr ("Are you sure you want to exit Octave?"),
791 QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
792
793 if (ans != QMessageBox::Ok)
794 closenow = false;
795 }
796
797 #ifdef HAVE_QSCINTILLA
798 if (closenow)
799 closenow = editor_window->check_closing ();
800 #endif
801
802 _octave_qt_link->shutdown_confirmation (closenow);
803
804 // Awake the worker thread so that it continues shutting down (or not).
805 _octave_qt_link->waitcondition.wakeAll ();
806 }
780 807
781 void 808 void
782 main_window::prepare_to_exit (void) 809 main_window::prepare_to_exit (void)
783 { 810 {
784 write_settings (); 811 write_settings ();
785 } 812 }
786 813
787 void 814 void
788 main_window::exit (int status) 815 main_window::exit_app (int status)
789 { 816 {
790 qApp->exit (status); 817 qApp->exit (status);
791 } 818 }
792 819
793 void 820 void
983 1010
984 void 1011 void
985 main_window::closeEvent (QCloseEvent *e) 1012 main_window::closeEvent (QCloseEvent *e)
986 { 1013 {
987 e->ignore (); 1014 e->ignore ();
988 if (confirm_exit_octave()) 1015 queue_command ("exit");
989 octave_link::post_event (this, &main_window::exit_callback);
990 } 1016 }
991 1017
992 void 1018 void
993 main_window::read_settings (void) 1019 main_window::read_settings (void)
994 { 1020 {
1433 void 1459 void
1434 main_window::construct_octave_qt_link (void) 1460 main_window::construct_octave_qt_link (void)
1435 { 1461 {
1436 _octave_qt_link = new octave_qt_link (this); 1462 _octave_qt_link = new octave_qt_link (this);
1437 1463
1438 connect (_octave_qt_link, SIGNAL (exit_signal (int)), 1464 connect (_octave_qt_link, SIGNAL (confirm_shutdown_signal ()),
1439 this, SLOT (exit (int))); 1465 this, SLOT (confirm_shutdown_octave ()));
1466
1467 connect (_octave_qt_link, SIGNAL (exit_app_signal (int)),
1468 this, SLOT (exit_app (int)));
1440 1469
1441 connect (_octave_qt_link, 1470 connect (_octave_qt_link,
1442 SIGNAL (set_workspace_signal 1471 SIGNAL (set_workspace_signal
1443 (bool, const QString&, const QStringList&, 1472 (bool, const QString&, const QStringList&,
1444 const QStringList&, const QStringList&, 1473 const QStringList&, const QStringList&,
2136 octave_link::post_event (this, &main_window::execute_debug_callback); 2165 octave_link::post_event (this, &main_window::execute_debug_callback);
2137 2166
2138 } 2167 }
2139 2168
2140 void 2169 void
2141 main_window::exit_callback (void)
2142 {
2143 Fquit ();
2144 }
2145
2146 void
2147 main_window::find_files (const QString &start_dir) 2170 main_window::find_files (const QString &start_dir)
2148 { 2171 {
2149 2172
2150 if (! find_files_dlg) 2173 if (! find_files_dlg)
2151 { 2174 {
2356 main_window::clear_clipboard () 2379 main_window::clear_clipboard ()
2357 { 2380 {
2358 _clipboard->clear (QClipboard::Clipboard); 2381 _clipboard->clear (QClipboard::Clipboard);
2359 } 2382 }
2360 2383
2361 bool
2362 main_window::confirm_exit_octave ()
2363 {
2364 bool closenow = true;
2365
2366 QSettings *settings = resource_manager::get_settings ();
2367
2368 if (settings->value ("prompt_to_exit", false).toBool ())
2369 {
2370 int ans = QMessageBox::question (this, tr ("Octave"),
2371 tr ("Are you sure you want to exit Octave?"),
2372 QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
2373
2374 if (ans != QMessageBox::Ok)
2375 return false;
2376
2377 }
2378
2379 #ifdef HAVE_QSCINTILLA
2380 closenow = editor_window->check_closing (1); // 1: exit request from gui
2381 #endif
2382
2383 return closenow;
2384 }
2385
2386