2 files changed, 18 insertions, 10 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 13b4330..3edf8e7 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -110,5 +110,5 @@ class Jornada : public ODevice {
 protected:
         virtual void init ( );
-        virtual void initButtons ( );
+        //virtual void initButtons ( );
 public:
         virtual bool setSoftSuspend ( bool soft );
@@ -208,10 +208,10 @@ struct i_button {
         char *fheldaction;
 } ipaq_buttons [] = {
-    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx,
+    { 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_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",
@@ -223,15 +223,15 @@ struct i_button {
          "QPE/TaskBar", "toggleMenu()",
         "QPE/TaskBar", "toggleStartMenu()" },
-    { Model_iPAQ_H38xx | Model_iPAQ_H39xx,
+    { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
     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,
+    { 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",
         "QPE/Launcher", "home()",
         "buttonsettings", "raise()" },
-    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx,
+    { 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",
@@ -1119,4 +1119,6 @@ void iPAQ::init ( )
                 else if ( d-> m_modelstr == "H3900" )
                         d-> m_model = Model_iPAQ_H39xx;
+                else if ( d-> m_modelstr == "H5400" )
+                        d-> m_model = Model_iPAQ_H5xxx;
                 else
                         d-> m_model = Model_Unknown;
@@ -1136,5 +1138,7 @@ void iPAQ::init ( )
                         d-> m_rotation = Rot270;
                         break;
-        }
+                case Model_iPAQ_H5xxx:
+                        d-> m_rotation = Rot0;
+                }
 
         f. setName ( "/etc/familiar-version" );
@@ -1293,5 +1297,6 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
                 case HardKey_Menu: {
                         if (( d-> m_model == Model_iPAQ_H38xx ) ||
-                            ( d-> m_model == Model_iPAQ_H39xx )) {
+                            ( d-> m_model == Model_iPAQ_H39xx ) ||
+                            ( d-> m_model == Model_iPAQ_H5xxx)) {
                                 newkeycode = HardKey_Mail;
                         }
@@ -1437,4 +1442,6 @@ int iPAQ::displayBrightnessResolution ( ) const
                 case Model_iPAQ_H39xx:
                         return 64;
+                case Model_iPAQ_H5xxx:
+                        return 255;
 
                 default:
@@ -2517,5 +2524,5 @@ void Jornada::init ( )
 }
 
-
+#if 0
 void Jornada::initButtons ( )
 {
@@ -2546,5 +2553,5 @@ void Jornada::initButtons ( )
         connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
 }
-
+#endif
 int Jornada::displayBrightnessResolution ( ) const
 {
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 35e3eff..46f1614 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -51,4 +51,5 @@ enum OModel {
         Model_iPAQ_H38xx    = ( Model_iPAQ | 0x000008 ),
         Model_iPAQ_H39xx    = ( Model_iPAQ | 0x000010 ),
+        Model_iPAQ_H5xxx    = ( Model_iPAQ | 0x000011 ),
 
         Model_Jornada       = ( 6 << 24 ),