| -rw-r--r-- | core/launcher/desktop.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index fbcce7c..86527f6 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp @@ -349,12 +349,15 @@ bool DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keyc m_button_timer-> stop ( ); if (!db-> pressedAction ( ). channel ( ) .isEmpty()) { + if ( db-> pressedAction ( ). channel ( )!="ignore") { + db-> pressedAction ( ). send ( ); } - else return false; + else + return false; } } else if ( press && !autoRepeat ) { m_button_timer-> stop ( ); @@ -373,15 +376,17 @@ bool DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keyc } bool DesktopApplication::eventFilter ( QObject *o, QEvent *e ) { + if ( e-> type ( ) == QEvent::KeyPress || e-> type ( ) == QEvent::KeyRelease ) { QKeyEvent *ke = (QKeyEvent *) e; const ODeviceButton *db = ODevice::inst ( )-> buttonForKeycode ( ke-> key ( )); if ( db ) { - return checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( )); + if (checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( ))) + return true; //checkButtonAction retrune false if events should be routed through } } return QPEApplication::eventFilter ( o, e ); } @@ -664,10 +669,8 @@ void Desktop::execAutoStart() void Desktop::togglePower() { static bool excllock = false; - qDebug ( "togglePower (locked == %d)", excllock ? 1 : 0 ); - if ( excllock ) return ; excllock = true; |