Mercurial > octave-nkf
diff libgui/src/terminal-dock-widget.h @ 16648:b04413e5a811
improve handling of interrupts, copy and paste shortcuts
* QTerminal.h (QTerminal::report_status_message): New signal.
(QTerminal::QTerminal): Set shortcuts for copy and paste actions.
Add copy and paste actions to QTerminal widget.
Connect settings_changed, report_status_message, copyClipboard_signal,
and pasteClipboard_signal.
* QWinTerminalImpl.cpp (QWinTerminalImpl::copyClipboard): If selection
is set, copy it and report status message. Otherwise, interrupt.
* TerminalView.cpp (TerminalView::copyClipboard): Likewise.
* main-window.cc (main_menu::construct_file_menu): Don't set shortcut
for open action.
(main_window::construct_edit_menu): Delete unimplemented cut, select
all, and delete actions.
Connect copy and paste actions to signals.
(main_window::copyClipboard_signal,
main_window::pasteClipboard_signal): New signals.
(main_window::copyClipboard, main_window::pasteClipboard): New slots.
(main_window::_cut_action): Delete member variable.
* octave-qt-link.cc (octave_qt_link::do_pre_input_event):
Disable input processing by the windows console.
(octave_qt_link::do_post_input_event):
Enable input processing by the windows console.
* terminal-dock-widget.h, terminal-dock-widget.cc:
Delete notice_settings, copyClipboard, and pasteClipboard signals,
slots, and connections.
(terminal_dock_widget::terminal_dock_widget):
Don't connect visibilityChanged signal.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 13 May 2013 07:26:37 -0400 |
parents | 2754c5fd6ae0 |
children | d63878346099 |
line wrap: on
line diff
--- a/libgui/src/terminal-dock-widget.h Mon May 13 05:58:12 2013 -0400 +++ b/libgui/src/terminal-dock-widget.h Mon May 13 07:26:37 2013 -0400 @@ -39,26 +39,8 @@ bool has_focus (void) const; -signals: - -public slots: - - void notice_settings (const QSettings *settings); - - void copyClipboard (void); - - void pasteClipboard (void); - void focus (void); -signals: - - void notice_settings_signal (const QSettings *settings); - - void copyClipboard_signal (void); - - void pasteClipboard_signal (void); - private: QTerminal *terminal;