Mercurial > octave-nkf

comparison libgui/src/main-window.cc @ 20288:0d94ec291ee6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to default.
author Rik <rik@octave.org>
date Tue, 09 Jun 2015 16:37:53 -0700
parents e914b5399c67 ede7224d062f
children 3b25741a9927
comparison
equal deleted inserted replaced
20284:b93a155dc200 20288:0d94ec291ee6
1500 this, SLOT (exit_app (int))); 1500 this, SLOT (exit_app (int)));
1501 1501
1502 connect (_octave_qt_link, SIGNAL (confirm_shutdown_signal ()), 1502 connect (_octave_qt_link, SIGNAL (confirm_shutdown_signal ()),
1503 this, SLOT (confirm_shutdown_octave ())); 1503 this, SLOT (confirm_shutdown_octave ()));
1504 1504
1505 connect (_octave_qt_link,
1506 SIGNAL (copy_image_to_clipboard_signal (const QString&, bool)),
1507 this, SLOT (copy_image_to_clipboard (const QString&, bool)));
1508
1505 if (_start_gui) 1509 if (_start_gui)
1506 { 1510 {
1507 connect (_octave_qt_link, 1511 connect (_octave_qt_link,
1508 SIGNAL (set_workspace_signal 1512 SIGNAL (set_workspace_signal
1509 (bool, bool, const QString&, const QStringList&, 1513 (bool, bool, const QString&, const QStringList&,
1548 this, SLOT (handle_exit_debugger ())); 1552 this, SLOT (handle_exit_debugger ()));
1549 1553
1550 connect (_octave_qt_link, 1554 connect (_octave_qt_link,
1551 SIGNAL (show_preferences_signal (void)), 1555 SIGNAL (show_preferences_signal (void)),
1552 this, SLOT (process_settings_dialog_request ())); 1556 this, SLOT (process_settings_dialog_request ()));
1553
1554 connect (_octave_qt_link,
1555 SIGNAL (copy_image_to_clipboard_signal (const QString&, bool)),
1556 this, SLOT (copy_image_to_clipboard (const QString&, bool)));
1557 1557
1558 #ifdef HAVE_QSCINTILLA 1558 #ifdef HAVE_QSCINTILLA
1559 connect (_octave_qt_link, 1559 connect (_octave_qt_link,
1560 SIGNAL (edit_file_signal (const QString&)), 1560 SIGNAL (edit_file_signal (const QString&)),
1561 editor_window, 1561 editor_window,