-rw-r--r-- | core/launcher/desktop.cpp | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index ab4f14a..7662e48 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp @@ -45,2 +45,4 @@ +#include <opie/odevice.h> + #include <qgfx_qws.h> @@ -269,3 +271,3 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) } - if ( press ) + if (( press && !autoRepeat ) || ( !press && autoRepeat )) qpedesktop->keyClick(); @@ -329,6 +331,2 @@ QPE_MEMALERTER_IMPL -#if defined(CUSTOM_SOUND_IMPL) -CUSTOM_SOUND_IMPL -#endif - //=========================================================================== @@ -341,6 +339,2 @@ Desktop::Desktop() : { -#ifdef CUSTOM_SOUND_INIT - CUSTOM_SOUND_INIT; -#endif - qpedesktop = this; @@ -758,6 +752,4 @@ void Desktop::keyClick() { -#ifdef CUSTOM_SOUND_KEYCLICK if ( keyclick ) - CUSTOM_SOUND_KEYCLICK; -#endif + ODevice::inst ( )-> keySound ( ); } @@ -766,6 +758,4 @@ void Desktop::screenClick() { -#ifdef CUSTOM_SOUND_TOUCH if ( touchclick ) - CUSTOM_SOUND_TOUCH; -#endif + ODevice::inst ( )-> touchSound ( ); } @@ -774,9 +764,7 @@ void Desktop::soundAlarm() { -#ifdef CUSTOM_SOUND_ALARM if (qpedesktop->alarmsound) - CUSTOM_SOUND_ALARM; -#endif + ODevice::inst ( )-> alarmSound ( ); } -bool Desktop::eventFilter( QObject *w, QEvent *ev ) +bool Desktop::eventFilter( QObject *, QEvent *ev ) { @@ -786,11 +774,11 @@ bool Desktop::eventFilter( QObject *w, QEvent *ev ) QWidget *active = qApp->activeWindow(); - if ( active && active->isPopup() ) { + + if ( active && active-> isPopup ( )) active->close(); - } + raiseMenu(); - return TRUE; + return true; } } - return FALSE; + return false; } - |