-rw-r--r-- | core/apps/embeddedkonsole/TEWidget.cpp | 20 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/main.cpp | 1 |
2 files changed, 9 insertions, 12 deletions
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index 350ab3a..0cd7ed1 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp | |||
@@ -854,4 +854,5 @@ void TEWidget::mouseDoubleClickEvent(QMouseEvent* ev) | |||
854 | void TEWidget::focusInEvent( QFocusEvent * ) | 854 | void TEWidget::focusInEvent( QFocusEvent * ) |
855 | { | 855 | { |
856 | |||
856 | // do nothing, to prevent repainting | 857 | // do nothing, to prevent repainting |
857 | } | 858 | } |
@@ -976,6 +977,5 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | |||
976 | { | 977 | { |
977 | if ( (e->type() == QEvent::Accel || | 978 | if ( (e->type() == QEvent::Accel || |
978 | e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this ) | 979 | e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this ) { |
979 | { | ||
980 | static_cast<QKeyEvent *>( e )->ignore(); | 980 | static_cast<QKeyEvent *>( e )->ignore(); |
981 | return true; | 981 | return true; |
@@ -983,6 +983,5 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | |||
983 | if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) | 983 | if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) |
984 | return FALSE; // not us | 984 | return FALSE; // not us |
985 | if ( e->type() == QEvent::Wheel) | 985 | if ( e->type() == QEvent::Wheel) { |
986 | { | ||
987 | QApplication::sendEvent(scrollbar, e); | 986 | QApplication::sendEvent(scrollbar, e); |
988 | } | 987 | } |
@@ -1025,13 +1024,12 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | |||
1025 | #endif | 1024 | #endif |
1026 | 1025 | ||
1027 | if ( e->type() == QEvent::KeyPress ) | 1026 | if ( e->type() == QEvent::KeyPress ) { |
1028 | { | ||
1029 | QKeyEvent* ke = (QKeyEvent*)e; | 1027 | QKeyEvent* ke = (QKeyEvent*)e; |
1030 | actSel=0; // Key stroke implies a screen update, so TEWidget won't | 1028 | actSel=0; // Key stroke implies a screen update, so TEWidget won't |
1031 | // know where the current selection is. | 1029 | // know where the current selection is. |
1032 | 1030 | ||
1033 | // qDebug("key pressed is 0x%x",ke->key()); | 1031 | qDebug("key pressed is 0x%x",ke->key()); |
1034 | if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker | 1032 | if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker |
1035 | // qDebug("key pressed 2 is 0x%x",ke->key()); | 1033 | qDebug("key pressed 2 is 0x%x",ke->key()); |
1036 | emitText("\\"); // expose | 1034 | emitText("\\"); // expose |
1037 | } else | 1035 | } else |
@@ -1043,11 +1041,9 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e ) | |||
1043 | return true; // stop the event | 1041 | return true; // stop the event |
1044 | } | 1042 | } |
1045 | if ( e->type() == QEvent::Enter ) | 1043 | if ( e->type() == QEvent::Enter ) { |
1046 | { | ||
1047 | QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()), | 1044 | QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()), |
1048 | this, SLOT(onClearSelection()) ); | 1045 | this, SLOT(onClearSelection()) ); |
1049 | } | 1046 | } |
1050 | if ( e->type() == QEvent::Leave ) | 1047 | if ( e->type() == QEvent::Leave ) { |
1051 | { | ||
1052 | QObject::connect( (QObject*)cb, SIGNAL(dataChanged()), | 1048 | QObject::connect( (QObject*)cb, SIGNAL(dataChanged()), |
1053 | this, SLOT(onClearSelection()) ); | 1049 | this, SLOT(onClearSelection()) ); |
diff --git a/core/apps/embeddedkonsole/main.cpp b/core/apps/embeddedkonsole/main.cpp index e3ba346..b3c0453 100644 --- a/core/apps/embeddedkonsole/main.cpp +++ b/core/apps/embeddedkonsole/main.cpp | |||
@@ -39,4 +39,5 @@ int main(int argc, char* argv[]) | |||
39 | 39 | ||
40 | #ifdef FAKE_CTRL_AND_ALT | 40 | #ifdef FAKE_CTRL_AND_ALT |
41 | qDebug("Fake Ctrl and Alt defined"); | ||
41 | QPEApplication::grabKeyboard(); // for CTRL and ALT | 42 | QPEApplication::grabKeyboard(); // for CTRL and ALT |
42 | #endif | 43 | #endif |