Mercurial > octave-antonio

changeset 20137:4ba6c61c8794

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
no copying of empty text in terminal when copy shortcut is not Ctrl-C * TerminalView.cpp (copyClipboard): * QWinTerminalImpl.cpp (copyClipboard): in the case of an extra interrupt action, do not copy to clipboard without correctly checking for selected text
author Torsten <ttl@justmail.de>
date Mon, 27 Apr 2015 16:48:37 +0200
parents 46fb763e5f3a
children 4ff975c58584
files libgui/qterminal/libqterminal/unix/TerminalView.cpp libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Fri Apr 24 23:36:59 2015 -0500
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Mon Apr 27 16:48:37 2015 +0200
@@ -2281,8 +2281,11 @@
 
   QString text = _screenWindow->selectedText(_preserveLineBreaks);
 
-  if (text.isEmpty () && ! extra_interrupt)
-    emit interrupt_signal ();
+  if (text.isEmpty ())
+    {
+      if (! extra_interrupt)
+        emit interrupt_signal ();
+    }
   else
     QApplication::clipboard()->setText(text);
 }
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Apr 24 23:36:59 2015 -0500
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Mon Apr 27 16:48:37 2015 +0200
@@ -1769,12 +1769,14 @@
 
   QString selection = d->getSelection ();
 
-  if (selection.isEmpty () && ! _extra_interrupt)
-    terminal_interrupt ();
+  if (selection.isEmpty ())
+    {
+      if (! _extra_interrupt)
+        terminal_interrupt ();
+    }
   else
     {
       clipboard->setText (selection);
-
       emit report_status_message (tr ("copied selection to clipboard"));
     }
 }