1 files changed, 50 insertions, 9 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 2873407..01932c9 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -229,83 +229,124 @@ struct z_button {
          "QPE/TaskBar", "toggleMenu()",
         "QPE/TaskBar", "toggleStartMenu()" },
     { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
         "devicebuttons/z_mail",
         "mail", "raise()",
         "mail", "newMail()" },
 };
 
 struct z_button z_buttons_c700 [] = {
     { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
         "devicebuttons/z_calendar",
         "datebook", "nextView()",
         "today", "raise()" },
     { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
         "devicebuttons/z_contact",
         "addressbook", "raise()",
         "addressbook", "beamBusinessCard()" },
     { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
         "devicebuttons/z_home",
         "QPE/Launcher", "home()",
         "buttonsettings", "raise()" },
     { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
         "devicebuttons/z_menu",
          "QPE/TaskBar", "toggleMenu()",
         "QPE/TaskBar", "toggleStartMenu()" },
     { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Display Rotate"),
         "",
         "QPE/Rotation", "flip()",
         "QPE/Rotation", "flip()" },
 };
 
 struct s_button {
-        uint model;
+    uint model;
     Qt::Key code;
     char *utext;
     char *pix;
     char *fpressedservice;
     char *fpressedaction;
     char *fheldservice;
     char *fheldaction;
 } simpad_buttons [] = {
     { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
-    Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
-        "devicebuttons/simpad_menu",
-         "QPE/TaskBar", "toggleMenu()",
-        "QPE/TaskBar", "toggleStartMenu()" },
+    Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"),
+    "devicebuttons/simpad_lower_up",
+    "datebook", "nextView()",
+    "today", "raise()" },
     { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
-    Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
-        "devicebuttons/ipaq_home",
-        "QPE/Launcher", "home()",
-        "buttonsettings", "raise()" },
+    Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"),
+    "devicebuttons/simpad_lower_down",
+    "addressbook", "raise()",
+    "addressbook", "beamBusinessCard()" },
+    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
+    Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Lower+Right"),
+    "devicebuttons/simpad_lower_right",
+    "QPE/TaskBar", "toggleMenu()",
+    "QPE/TaskBar", "toggleStartMenu()" },
+    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
+    Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"),
+    "devicebuttons/simpad_lower_upper",
+    "QPE/Launcher", "home()",
+    "buttonsettings", "raise()" },
+    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
+    Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Lower+Left"),
+    "devicebuttons/simpad_lower_left",
+    "mail", "raise()",
+    "mail", "newMail()" },
+
+    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
+    Qt::Key_F5, QT_TRANSLATE_NOOP("Button", "Upper+Up"),
+    "devicebuttons/simpad_upper_up",
+    "datebook", "nextView()",
+    "today", "raise()" },
+    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
+    Qt::Key_F6, QT_TRANSLATE_NOOP("Button", "Upper+Down"),
+    "devicebuttons/simpad_upper_down",
+    "addressbook", "raise()",
+    "addressbook", "beamBusinessCard()" },
+    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
+    Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Upper+Right"),
+    "devicebuttons/simpad_upper_right",
+    "QPE/TaskBar", "toggleMenu()",
+    "QPE/TaskBar", "toggleStartMenu()" },
+    /*{ Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
+    Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"),
+    "devicebuttons/simpad_lower_upper",
+    "QPE/Launcher", "home()",
+    "buttonsettings", "raise()" },*/
+    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
+    Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Upper+Left"),
+    "devicebuttons/simpad_upper_left",
+    "mail", "raise()",
+    "mail", "newMail()" },
 };
 
 static QCString makeChannel ( const char *str )
 {
         if ( str && !::strchr ( str, '/' ))
                 return QCString ( "QPE/Application/" ) + str;
         else
                 return str;
 }
 
 static inline bool isQWS()
 {
         return qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false;
 }
 
 ODevice *ODevice::inst ( )
 {
         static ODevice *dev = 0;
 
         if ( !dev ) {
                 if ( QFile::exists ( "/proc/hal/model" ))
                         dev = new iPAQ ( );
                 else if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
                         dev = new Zaurus ( );
                 else if ( QFile::exists ( "/proc/ucb1x00" ) && QFile::exists ( "/proc/cs3" ))
                         dev = new SIMpad ( );
                 else
                         dev = new ODevice ( );
 
                 dev-> init ( );
         }
         return dev;