Mercurial > octave
comparison libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 17920:5c3f22dd0bbb
raise SIGINT in octave_interpreter instead of in QTerminal
* QTerminal.h (QTerminal::interrupt_signal): New signal.
(QTerminal::terminal_interrupt): New slot.
* QUnixTerminalImpl.cpp (QUnixTerminalImpl::initialize): Connect
m_terminalView::interrupt_signal to QTerminal::terminal_interrupt.
* TerminalView.h (TerminalView::interrupt_signal): New signal.
* TerminalView.cpp (TerminalView::copyClipboard): Emit
interrupt_signal instead of calling raising SIGINT signal.
* terminal-dock-widget.h, terminal-dock-widget.cc
(terminal_dock_widget::interrupt_signal): New signal.
(terminal_dock_widget::terminal_interrupt): New slot.
(terminal_dock_widget::terminal_dock_widget): Connect
terminal::interrupt_signal to
terminal_dock_widget::terminal_interrupt slot.
(terminal_dock_widget::terminal_interrupt): New function. Emit
terminal_dock_widget::interrupt_signal.
* QWinTerminalImpl.cpp (QWinTerminalImpl::copyClipboard): Call
terminal_interrupt instead of raising SIGINT signal.
main-window.cc (main_window::construct_octave_qt_link): Connect
command_window::interrupt_signal to
_octave_qt_link::terminal_interrupt slot.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::terminal_interrupt): New slot.
* octave-interpreter.h, octave_interpreter.cc
(octave_interpreter::interrupt): New slot. Raise SIGINT here.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 12 Nov 2013 15:46:59 -0500 |
parents | 0a8c35ae5ce1 |
children | afeb233ea443 |
comparison
equal
deleted
inserted
replaced
17919:b6d07dd90f3d | 17920:5c3f22dd0bbb |
---|---|
1516 QClipboard *clipboard = QApplication::clipboard (); | 1516 QClipboard *clipboard = QApplication::clipboard (); |
1517 | 1517 |
1518 QString selection = d->getSelection (); | 1518 QString selection = d->getSelection (); |
1519 | 1519 |
1520 if (selection.isEmpty ()) | 1520 if (selection.isEmpty ()) |
1521 { | 1521 terminal_interrupt (); |
1522 ::raise (SIGINT); | |
1523 } | |
1524 else | 1522 else |
1525 { | 1523 { |
1526 clipboard->setText (selection); | 1524 clipboard->setText (selection); |
1527 | 1525 |
1528 emit report_status_message (tr ("copied selection to clipboard")); | 1526 emit report_status_message (tr ("copied selection to clipboard")); |