escape close

1 files changed, 3 insertions, 1 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index d0e9613..040b2fe 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1103,54 +1103,56 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e )
 					else if ( ( ( HackWidget * ) active ) ->needsOk() ) {
 						QSignal s;
 						s.connect( active, SLOT( accept() ) );
 						s.activate();
 					}
 					else {
 						// do the same as with the select key: Map to the default action of the widget:
 						mapToDefaultAction( ke, Qt::Key_Return );
 					}
 				}
 			}
 		}
 		else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
 			// Use special "select" key to do whatever default action a widget has
 			mapToDefaultAction( ke, Qt::Key_Space );
 		}
 		else if ( ke->simpleData.keycode == Qt::Key_Escape &&
 		          ke->simpleData.is_press ) {
 			// Escape key closes app if focus on toplevel
 			QWidget * active = activeWindow();
 			if ( active && active->testWFlags( WType_TopLevel ) &&
 			        ( int ) active->winId() == ke->simpleData.window &&
 			        !active->testWFlags( WStyle_Dialog | WStyle_Customize | WType_Popup | WType_Desktop ) ) {
 				if ( active->inherits( "QDialog" ) ) {
-					qDebug("dialog hack");
 					HackDialog * d = ( HackDialog * ) active;
 					d->rejectIt();
 					return TRUE;
+				} else /*if ( strcmp( argv() [ 0 ], "embeddedkonsole" ) != 0 )*/ {
+				active->close();
 				}
 			}
+
 		}
 		else if ( ke->simpleData.keycode >= Qt::Key_F1 && ke->simpleData.keycode <= Qt::Key_F29 ) {
 			// this should be if ( ODevice::inst ( )-> buttonForKeycode ( ... ))
 			// but we cannot access libopie function within libqpe :(
 
 			QWidget * active = activeWindow ( );
 			if ( active && ((int) active-> winId ( ) == ke-> simpleData.window )) {
 				if ( d-> kbgrabbed ) { // we grabbed the keyboard
 					QChar ch ( ke-> simpleData.unicode );
 					QKeyEvent qke ( ke-> simpleData. is_press ? QEvent::KeyPress : QEvent::KeyRelease,
 					                ke-> simpleData.keycode,
 					                ch. latin1 ( ),
 					                ke-> simpleData.modifiers,
 					                QString ( ch ),
 					                ke-> simpleData.is_auto_repeat, 1 );
 
 					QObject *which = QWidget::keyboardGrabber ( );
 					if ( !which )
 						which = QApplication::focusWidget ( );
 					if ( !which )
 						which = QApplication::activeWindow ( );
 					if ( !which )
 						which = qApp;