| -rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 77 | ||||
| -rw-r--r-- | libopie2/opiecore/device/odevice_mypal.cpp | 17 |
2 files changed, 43 insertions, 51 deletions
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp index 00939bf..16ecc27 100644 --- a/libopie2/opiecore/device/odevice_ipaq.cpp +++ b/libopie2/opiecore/device/odevice_ipaq.cpp @@ -86,4 +86,8 @@ typedef struct { +#define Model_Keyboardless_2_6 (Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx) + struct i_button ipaq_buttons [] = { - { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx, + + // Common button map for all keyboardless devices with 2.6 kernel + { Model_Keyboardless_2_6, Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), @@ -92,3 +96,3 @@ struct i_button ipaq_buttons [] = { "today", "raise()" }, - { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx, + { Model_Keyboardless_2_6, Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), @@ -97,9 +101,4 @@ struct i_button ipaq_buttons [] = { "addressbook", "beamBusinessCard()" }, - { 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 | Model_iPAQ_H5xxx, - Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), + { Model_Keyboardless_2_6, + Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"), "devicebuttons/ipaq_mail", @@ -107,3 +106,3 @@ struct i_button ipaq_buttons [] = { "opiemail", "newMail()" }, - { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H4xxx, + { Model_Keyboardless_2_6, Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), @@ -112,3 +111,3 @@ struct i_button ipaq_buttons [] = { "buttonsettings", "raise()" }, - { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, + { Model_Keyboardless_2_6, Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), @@ -118,21 +117,15 @@ struct i_button ipaq_buttons [] = { - { Model_iPAQ_H191x | Model_iPAQ_H4xxx, - Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Mail Button"), - "devicebuttons/ipaq_mail", - "opiemail", "raise()", - "opiemail", "newMail()" }, - { Model_iPAQ_H191x | Model_iPAQ_H4xxx, - Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Record Button"), - "devicebuttons/ipaq_record", - "QPE/VMemo", "toggleRecord()", - "sound", "raise()" }, - - //h2200 has different button mapping - { Model_iPAQ_H22xx, - Qt::Key_NumLock, QT_TRANSLATE_NOOP("Button", "Mail Button"), - "devicebuttons/ipaq_mail", - "opiemail", "raise()", - "opiemail", "newMail()" }, - { Model_iPAQ_H22xx, - Qt::Key_ScrollLock, QT_TRANSLATE_NOOP("Button", "Menu Button"), + // Devices with 2.4 kernel + { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, + Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), + "devicebuttons/ipaq_calendar", + "datebook", "nextView()", + "today", "raise()" }, + { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, + Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), + "devicebuttons/ipaq_contact", + "addressbook", "raise()", + "addressbook", "beamBusinessCard()" }, + { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx, + Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), "devicebuttons/ipaq_menu", @@ -140,5 +133,4 @@ struct i_button ipaq_buttons [] = { "QPE/TaskBar", "toggleStartMenu()" }, - // and hx4700 has different button mapping still - { Model_iPAQ_HX4700, - Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"), + { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, + Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), "devicebuttons/ipaq_mail", @@ -146,9 +138,4 @@ struct i_button ipaq_buttons [] = { "opiemail", "newMail()" }, - { Model_iPAQ_HX4700, - Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Record Button"), - "devicebuttons/ipaq_record", - "QPE/VMemo", "toggleRecord()", - "sound", "raise()" }, - { Model_iPAQ_HX4700, - Qt::Key_Home, QT_TRANSLATE_NOOP("Button", "Home Button"), + { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, + Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), "devicebuttons/ipaq_home", @@ -156,2 +143,7 @@ struct i_button ipaq_buttons [] = { "buttonsettings", "raise()" }, + { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, + Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), + "devicebuttons/ipaq_record", + "QPE/VMemo", "toggleRecord()", + "sound", "raise()" }, @@ -348,7 +340,4 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b - // map Power Button short/long press to F6 for h191x - case Key_F6: - if ( d->m_model != Model_iPAQ_H191x && d->m_model != Model_iPAQ_H4xxx ) - break; // map Power Button short/long press to F34/F35 + case HardKey_Suspend: // Hope we don't have infinite recursion here case Key_SysReq: { diff --git a/libopie2/opiecore/device/odevice_mypal.cpp b/libopie2/opiecore/device/odevice_mypal.cpp index 7eb8d1d..208be46 100644 --- a/libopie2/opiecore/device/odevice_mypal.cpp +++ b/libopie2/opiecore/device/odevice_mypal.cpp @@ -62,4 +62,7 @@ using namespace Opie::Core::Internal; +#define Model_Keyboardless_2_6 (Model_MyPal_716) + struct m_button mypal_buttons [] = { - { Model_MyPal_716, + // Common button map for all keyboardless devices with 2.6 kernel + { Model_Keyboardless_2_6, Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), @@ -68,3 +71,3 @@ struct m_button mypal_buttons [] = { "today", "raise()" }, - { Model_MyPal_716, + { Model_Keyboardless_2_6, Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), @@ -73,4 +76,4 @@ struct m_button mypal_buttons [] = { "addressbook", "beamBusinessCard()" }, - { Model_MyPal_716, - Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Mail Button"), + { Model_Keyboardless_2_6, + Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"), "devicebuttons/ipaq_mail", @@ -78,3 +81,3 @@ struct m_button mypal_buttons [] = { "opiemail", "newMail()" }, - { Model_MyPal_716, + { Model_Keyboardless_2_6, Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), @@ -83,4 +86,4 @@ struct m_button mypal_buttons [] = { "buttonsettings", "raise()" }, - { Model_MyPal_716, - Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Record Button"), + { Model_Keyboardless_2_6, + Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), "devicebuttons/ipaq_record", |