Mercurial > octave-antonio
changeset 20146:f5e65f806123
fix checking copy shortcut in terminal when no setting available (bug #44968)
* QTerminal.cc (notice_settings): check for empty copy shortcut from settings
file and take the default in this case
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Fri, 01 May 2015 08:56:48 +0200 |
| parents | 3797df921988 |
| children | 0afc06948ba7 |
| files | libgui/qterminal/libqterminal/QTerminal.cc |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/QTerminal.cc Wed Apr 29 17:09:24 2015 -0700 +++ b/libgui/qterminal/libqterminal/QTerminal.cc Fri May 01 08:56:48 2015 +0200 @@ -139,6 +139,10 @@ key.append ("_1"); // if second set is active copy = QKeySequence (settings->value (key).toString ()); // the copy shortcut + // if copy is empty, shortcuts are not yet in the settings (take the default) + if (copy.isEmpty ()) // QKeySequence::Copy as second argument in + copy = QKeySequence::Copy; // settings->value () does not work! + // dis- or enable extra interrupt action QKeySequence ctrl; ctrl = Qt::ControlModifier;