author | llornkcor <llornkcor> | 2003-02-17 00:56:19 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-02-17 00:56:19 (UTC) |
commit | 0c50793d0ef839e90b9b2dea5001c3170971fc06 (patch) (unidiff) | |
tree | 7cb670b64059524eab1130212ba1c43ebed66720 | |
parent | 4d0e8ffd8518fe24ed94cfcf92eeff666b014094 (diff) | |
download | opie-0c50793d0ef839e90b9b2dea5001c3170971fc06.zip opie-0c50793d0ef839e90b9b2dea5001c3170971fc06.tar.gz opie-0c50793d0ef839e90b9b2dea5001c3170971fc06.tar.bz2 |
fixes bug 671 - clipboard copy causes new line
-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index 23720cd..a989e10 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp | |||
@@ -928,13 +928,14 @@ void TEWidget::setMouseMarks(bool on) | |||
928 | 928 | ||
929 | void TEWidget::emitSelection() | 929 | void TEWidget::emitSelection() |
930 | // Paste Clipboard by simulating keypress events | 930 | // Paste Clipboard by simulating keypress events |
931 | { | 931 | { |
932 | #ifndef QT_NO_CLIPBOARD | 932 | #ifndef QT_NO_CLIPBOARD |
933 | QString text = QApplication::clipboard()->text(); | 933 | QString text = QApplication::clipboard()->text(); |
934 | if ( ! text.isNull() ) | 934 | //qDebug(text); |
935 | if ( ! text.isNull()) | ||
935 | { | 936 | { |
936 | text.replace(QRegExp("\n"), "\r"); | 937 | text.replace(QRegExp("\n"), "\r"); |
937 | QKeyEvent e(QEvent::KeyPress, 0, -1, 0, text); | 938 | QKeyEvent e(QEvent::KeyPress, 0, -1, 0, text); |
938 | emit keyPressedSignal(&e); // expose as a big fat keypress event | 939 | emit keyPressedSignal(&e); // expose as a big fat keypress event |
939 | emit clearSelectionSignal(); | 940 | emit clearSelectionSignal(); |
940 | } | 941 | } |
@@ -1064,12 +1065,15 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | |||
1064 | // qDebug("key pressed 2 is 0x%x", ke->key()); | 1065 | // qDebug("key pressed 2 is 0x%x", ke->key()); |
1065 | emitText("\\"); // expose | 1066 | emitText("\\"); // expose |
1066 | } | 1067 | } |
1067 | else if( ke->state() == ControlButton && ke->key() == Key_V) { | 1068 | else if( ke->state() == ControlButton && ke->key() == Key_V) { |
1068 | pasteClipboard(); | 1069 | pasteClipboard(); |
1069 | } | 1070 | } |
1071 | else if( ke->state() == ControlButton && ke->key() == Key_C) { | ||
1072 | // pasteClipboard(); | ||
1073 | } | ||
1070 | else | 1074 | else |
1071 | emit keyPressedSignal(ke); // expose | 1075 | emit keyPressedSignal(ke); // expose |
1072 | ke->accept(); | 1076 | ke->accept(); |
1073 | #ifdef FAKE_CTRL_AND_ALT | 1077 | #ifdef FAKE_CTRL_AND_ALT |
1074 | if ( dele ) delete e; | 1078 | if ( dele ) delete e; |
1075 | #endif | 1079 | #endif |