Mercurial > octave-nkf
changeset 16956:eefcfeb37446
make ctrl-c abort the actual octave command in linux (bug #37672)
* main-window.cc(construct_edit_menu): set ctrl-c and ctrl-v for copy and paste
* TerminalView.cc(copyClipboard): remove FIXME comment
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Thu, 11 Jul 2013 21:13:12 +0200 |
| parents | 9c971fa62a77 |
| children | 9f50dd7ece60 |
| files | libgui/qterminal/libqterminal/unix/TerminalView.cpp libgui/src/main-window.cc |
| diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp Thu Jul 11 11:16:57 2013 -0700 +++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp Thu Jul 11 21:13:12 2013 +0200 @@ -2267,9 +2267,6 @@ if (text.isEmpty ()) { - // FIXME -- interrupt is only appropriate here if CTRL-C is bound - // to the copy action. How can we determine that? - ::raise (SIGINT); } else
--- a/libgui/src/main-window.cc Thu Jul 11 11:16:57 2013 -0700 +++ b/libgui/src/main-window.cc Thu Jul 11 21:13:12 2013 +0200 @@ -1051,12 +1051,12 @@ _copy_action = edit_menu->addAction (QIcon (":/actions/icons/editcopy.png"), tr ("Copy"), this, SLOT (copyClipboard ())); - _copy_action->setShortcut (ctrl_shift + Qt::Key_C); + _copy_action->setShortcut (QKeySequence::Copy); _paste_action = edit_menu->addAction (QIcon (":/actions/icons/editpaste.png"), tr ("Paste"), this, SLOT (pasteClipboard ())); - _paste_action->setShortcut (ctrl_shift + Qt::Key_V); + _paste_action->setShortcut (QKeySequence::Paste); edit_menu->addSeparator ();