Mercurial > hg > octave-avbm
changeset 13486:68a13d4f6e15
Copying from the terminal window works with Ctrl+Shift+C.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Wed, 27 Apr 2011 15:25:18 +0200 |
parents | 59d266f7ed89 |
children | 0c896eff7a80 |
files | gui//src/Session.cpp gui//src/TerminalDisplay.cpp |
diffstat | 2 files changed, 10 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/gui//src/Session.cpp +++ b/gui//src/Session.cpp @@ -1129,33 +1129,6 @@ return name; } -/* -void Session::saveSession(KConfigGroup& group) -{ - group.writePathEntry("WorkingDir", currentWorkingDirectory()); - group.writeEntry("LocalTab", tabTitleFormat(LocalTabTitle)); - group.writeEntry("RemoteTab", tabTitleFormat(RemoteTabTitle)); - group.writeEntry("SessionGuid", _uniqueIdentifier.toString()); - group.writeEntry("Encoding", QString(codec())); -} - -void Session::restoreSession(KConfigGroup& group) -{ - QString value; - - value = group.readPathEntry("WorkingDir", QString()); - if (!value.isEmpty()) setInitialWorkingDirectory(value); - value = group.readEntry("LocalTab"); - if (!value.isEmpty()) setTabTitleFormat(LocalTabTitle, value); - value = group.readEntry("RemoteTab"); - if (!value.isEmpty()) setTabTitleFormat(RemoteTabTitle, value); - value = group.readEntry("SessionGuid"); - if (!value.isEmpty()) _uniqueIdentifier = QUuid(value); - value = group.readEntry("Encoding"); - if (!value.isEmpty()) setCodec(value.toUtf8()); -} -*/ - SessionGroup::SessionGroup(QObject* parent) : QObject(parent), _masterMode(0) {
--- a/gui//src/TerminalDisplay.cpp +++ b/gui//src/TerminalDisplay.cpp @@ -2469,9 +2469,17 @@ { bool emitKeyPressSignal = true; - // Keyboard-based navigation - if ( event->modifiers() == Qt::ShiftModifier ) + if(event->modifiers() == Qt::ControlModifier | Qt::ControlModifier) { + switch(event->key()) { + case Qt::Key_C: + copyClipboard(); + break; + case Qt::Key_V: + //pasteClipboard(); + break; + }; + } else if ( event->modifiers() == Qt::ShiftModifier ) { bool update = true; if ( event->key() == Qt::Key_PageUp )