Mercurial > hg > octave-lyh
diff libgui/src/main-window.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 (2013-05-13) |
parents | e3a0ca9c8836 |
children | d749c9b588e5 |
line wrap: on
line diff
--- a/libgui/src/main-window.h +++ b/libgui/src/main-window.h @@ -86,6 +86,9 @@ void update_breakpoint_marker_signal (bool insert, const QString& file, int line); + void copyClipboard_signal (void); + void pasteClipboard_signal (void); + public slots: void report_status_message (const QString& statusMessage); void handle_save_workspace_request (void); @@ -138,6 +141,9 @@ void write_settings (void); void connect_visibility_changed (void); + void copyClipboard (void); + void pasteClipboard (void); + void connect_uiwidget_links (); void handle_create_dialog (const QString& message, const QString& title, @@ -256,7 +262,6 @@ QAction *_new_script_action; QAction *_open_action; - QAction *_cut_action; QAction *_copy_action; QAction *_paste_action; QAction *_undo_action;