| author | kergoth <kergoth> | 2003-01-26 01:01:32 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-01-26 01:01:32 (UTC) |
| commit | 7b5f4142a1ace5fba9fdf9b8e5538669a56ba60b (patch) (side-by-side diff) | |
| tree | 29ab0dfa5c6d35621857af78a6fa3eaae517be33 /libopie | |
| parent | 7d07568352e368fe473e4c1c5493df2ebb0090d2 (diff) | |
| download | opie-7b5f4142a1ace5fba9fdf9b8e5538669a56ba60b.zip opie-7b5f4142a1ace5fba9fdf9b8e5538669a56ba60b.tar.gz opie-7b5f4142a1ace5fba9fdf9b8e5538669a56ba60b.tar.bz2 | |
1) Add Sharp Zaurus A300/B600|5600/C700 models, will add the model specific bits
later.
2) Add rotation data and method, to set a default rotation based on model .. so
we can ditch the use of the startup script to set that.
| -rw-r--r-- | libopie/odevice.cpp | 55 | ||||
| -rw-r--r-- | libopie/odevice.h | 10 |
2 files changed, 54 insertions, 11 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index d39d72f..78eb416 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp @@ -67,2 +67,4 @@ public: QString m_sysverstr; + + Transformation m_rotation; @@ -251,2 +253,3 @@ ODevice::ODevice ( ) d-> m_sysverstr = "0.0"; + d-> m_rotation = None; @@ -402,2 +405,7 @@ QString ODevice::systemVersionString ( ) const +Transformation ODevice::rotation ( ) const +{ + return d-> m_rotation; +} + void ODevice::alarmSound ( ) @@ -589,2 +597,15 @@ void iPAQ::init ( ) + switch ( d-> m_model ) { + case Model_iPAQ_H31xx: + case Model_iPAQ_H38xx: + d-> m_rotation = Rot90; + break; + case Model_iPAQ_H36xx: + case Model_iPAQ_H37xx: + case Model_iPAQ_H39xx: + default: + d-> m_rotation = Rot270; + break; + } + f. setName ( "/etc/familiar-version" ); @@ -643,3 +664,2 @@ typedef struct { - QValueList <OLed> iPAQ::ledList ( ) const @@ -939,9 +959,14 @@ void Zaurus::init ( ) f. close ( ); - if ( model == "SL-5000D" ) { - d-> m_model = Model_Zaurus_SL5000; - d-> m_modelstr = "Zaurus SL-5000D"; - } else if ( model == "SL-5500" ) { + + d-> m_modelstr = QString("Zaurus ") + model; + if ( model == "SL-5500" ) d-> m_model = Model_Zaurus_SL5500; - d-> m_modelstr = "Zaurus SL-5500"; - } + else if ( model == "SL-C700" ) + d-> m_model = Model_Zaurus_SLC700; + else if ( model == "SL-A300" ) + d-> m_model = Model_Zaurus_SLA300; + else if ( model == "SL-B600" || model == "SL-5600" ) + d-> m_model = Model_Zaurus_SLB600; + else + d-> m_model = Model_Zaurus_SL5000; } @@ -949,3 +974,17 @@ void Zaurus::init ( ) d-> m_model = Model_Zaurus_SL5000; - d-> m_modelstr = "Zaurus SL-5000D (unverified)"; + d-> m_modelstr = "Zaurus (model unknown)"; + } + + switch ( d-> m_model ) { + case Model_Zaurus_SLC700: + /* note for C700, we must check the display rotation + * sensor to set an appropriate value + */ + case Model_Zaurus_SLA300: + case Model_Zaurus_SLB600: + case Model_Zaurus_SL5500: + case Model_Zaurus_SL5000: + default: + d-> m_rotation = Rot270; + break; } diff --git a/libopie/odevice.h b/libopie/odevice.h index 54b85a2..8164c4d 100644 --- a/libopie/odevice.h +++ b/libopie/odevice.h @@ -28,2 +28,4 @@ +enum Transformation { None, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ + class ODeviceData; @@ -50,2 +52,5 @@ enum OModel { Model_Zaurus_SL5500 = ( Model_Zaurus | 0x000002 ), + Model_Zaurus_SLA300 = ( Model_Zaurus | 0x000003 ), + Model_Zaurus_SLB600 = ( Model_Zaurus | 0x000004 ), + Model_Zaurus_SLC700 = ( Model_Zaurus | 0x000005 ), }; @@ -91,3 +96,2 @@ enum OHardKey { - class ODevice : public QObject { @@ -109,4 +113,2 @@ public: - - // information @@ -125,2 +127,4 @@ public: + Transformation rotation ( ) const; + // system |