| -rw-r--r-- | libopie/odevice.cpp | 8 | ||||
| -rw-r--r-- | libopie/odevice.h | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index f93d1ed..a3c30cb 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp @@ -150,13 +150,13 @@ struct i_button { { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx, Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), "devicebuttons/ipaq_menu", "QPE/TaskBar", "toggleMenu()", "QPE/TaskBar", "toggleStartMenu()" }, { Model_iPAQ_H38xx | Model_iPAQ_H39xx, - Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"), + Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), "devicebuttons/ipaq_mail", "mail", "raise()", "mail", "newMail()" }, { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx, Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), "devicebuttons/ipaq_home", @@ -603,24 +603,20 @@ void iPAQ::init ( ) m_power_timer = 0; for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) { i_button *ib = ipaq_buttons + i; ODeviceButton b; - qDebug ( "%d: %d", i, ib-> model ); - if (( ib-> model & d-> m_model ) == d-> m_model ) { b. setKeycode ( ib-> code ); b. setUserText ( qApp-> translate ( "Button", ib-> utext )); b. setPixmap ( Resource::loadPixmap ( ib-> pix )); b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction )); b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction )); d-> m_buttons. append ( b ); - - qDebug ( "code: %d", ib-> code ); } } reloadButtonMapping ( ); if ( d-> m_qwsserver ) QWSServer::setKeyboardFilter ( this ); @@ -751,13 +747,13 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b } newkeycode = Key_unknown; break; } } - if ( newkeycode != keycode ) { +k if ( newkeycode != keycode ) { if ( newkeycode != Key_unknown ) QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat ); return true; } else return false; diff --git a/libopie/odevice.h b/libopie/odevice.h index ce62f1a..54b85a2 100644 --- a/libopie/odevice.h +++ b/libopie/odevice.h @@ -80,13 +80,13 @@ enum OLed { enum OHardKey { HardKey_Datebook = Qt::Key_F9, HardKey_Contacts = Qt::Key_F10, HardKey_Menu = Qt::Key_F11, HardKey_Home = Qt::Key_F12, - HardKey_Mail = Qt::Key_F14, + HardKey_Mail = Qt::Key_F13, HardKey_Record = Qt::Key_F24, HardKey_Suspend = Qt::Key_F34, HardKey_Backlight = Qt::Key_F35, }; |