| -rw-r--r-- | libopie2/opiecore/device/odevice.h | 1 | ||||
| -rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 53 | ||||
| -rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.h | 42 |
3 files changed, 52 insertions, 44 deletions
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index e7cd82a..5db43ff 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h @@ -84,2 +84,3 @@ enum OModel { Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x000007 ), + Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x000008 ), diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 8aefc13..3bd7f6e 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp @@ -1,25 +1,25 @@ /* - This file is part of the Opie Project - Copyright (C) 2002,2003,2004 The Opie Team <opie-devel@handhelds.org> + � � � � � � � � This file is part of the Opie Project +� � � � � � � Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org> =. .=l. - .>+-= - _;:, .> :=|. This program is free software; you can -.> <`_, > . <= redistribute it and/or modify it under -:`=1 )Y*s>-.-- : the terms of the GNU Library General Public -.="- .-=="i, .._ License as published by the Free Software - - . .-<_> .<> Foundation; either version 2 of the License, - ._= =} : or (at your option) any later version. - .%`+i> _;_. - .i_,=:_. -<s. This program is distributed in the hope that - + . -:. = it will be useful, but WITHOUT ANY WARRANTY; - : .. .:, . . . without even the implied warranty of - =_ + =;=|` MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU -..}^=.= = ; Library General Public License for more -++= -. .` .: details. - : = ...= . :.=- - -. .:....=;==+<; You should have received a copy of the GNU - -_. . . )=. = Library General Public License along with - -- :-=` this library; see the file COPYING.LIB. +� � � � � �.>+-= +�_;:, � � .> � �:=|. This program is free software; you can +.> <`_, � > �. � <= redistribute it and/or modify it under +:`=1 )Y*s>-.-- � : the terms of the GNU Library General Public +.="- .-=="i, � � .._ License as published by the Free Software +�- . � .-<_> � � .<> Foundation; either version 2 of the License, +� � �._= =} � � � : or (at your option) any later version. +� � .%`+i> � � � _;_. +� � .i_,=:_. � � �-<s. This program is distributed in the hope that +� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY; +� � : .. � �.:, � � . . . without even the implied warranty of +� � =_ � � � �+ � � =;=|` MERCHANTABILITY or FITNESS FOR A +� _.=:. � � � : � �:=>`: PARTICULAR PURPOSE. See the GNU +..}^=.= � � � = � � � ; Library General Public License for more +++= � -. � � .` � � .: details. +�: � � = �...= . :.=- +�-. � .:....=;==+<; You should have received a copy of the GNU +� -_. . . � )=. �= Library General Public License along with +� � -- � � � �:-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, @@ -201,2 +201,5 @@ void Zaurus::init(const QString& cpu_info) d->m_modelstr = "Zaurus SL-C3000"; + } else if ( model == "SHARP Akita" ) { + d->m_model = Model_Zaurus_SLC1000; + d->m_modelstr = "Zaurus SL-C1000"; } else { @@ -213,2 +216,3 @@ void Zaurus::init(const QString& cpu_info) case Model_Zaurus_SLC3000: // fallthrough + case Model_Zaurus_SLC1000: // fallthrough case Model_Zaurus_SLC7x0: @@ -244,2 +248,3 @@ void Zaurus::initButtons() case Model_Zaurus_SLC3000: // fallthrough + case Model_Zaurus_SLC1000: // fallthrough case Model_Zaurus_SLC7x0: @@ -496,2 +501,3 @@ Transformation Zaurus::rotation() const case Model_Zaurus_SLC3000: // fallthrough + case Model_Zaurus_SLC1000: // fallthrough case Model_Zaurus_SLC7x0: @@ -533,2 +539,3 @@ ODirection Zaurus::direction() const case Model_Zaurus_SLC3000: // fallthrough + case Model_Zaurus_SLC1000: // fallthrough case Model_Zaurus_SLC7x0: { @@ -554,3 +561,3 @@ bool Zaurus::hasHingeSensor() const { - return d->m_model == Model_Zaurus_SLC7x0 || d->m_model == Model_Zaurus_SLC3000; + return d->m_model == Model_Zaurus_SLC7x0 || d->m_model == Model_Zaurus_SLC3000 || d->m_model == Model_Zaurus_SLC1000; } @@ -604,3 +611,3 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, - if (d->m_model!=Model_Zaurus_SLC3000 && d->m_model!=Model_Zaurus_SLC7x0) return false; + if (d->m_model != Model_Zaurus_SLC7x0 && d->m_model != Model_Zaurus_SLC3000 && d->m_model != Model_Zaurus_SLC1000) return false; diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h index 4548e35..4250356 100644 --- a/libopie2/opiecore/device/odevice_zaurus.h +++ b/libopie2/opiecore/device/odevice_zaurus.h @@ -1,25 +1,25 @@ /* - This file is part of the Opie Project - Copyright (C) 2002,2003,2004 The Opie Team <opie-devel@handhelds.org> + � � � � � � � � This file is part of the Opie Project +� � � � � � � Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org> =. .=l. - .>+-= - _;:, .> :=|. This program is free software; you can -.> <`_, > . <= redistribute it and/or modify it under -:`=1 )Y*s>-.-- : the terms of the GNU Library General Public -.="- .-=="i, .._ License as published by the Free Software - - . .-<_> .<> Foundation; either version 2 of the License, - ._= =} : or (at your option) any later version. - .%`+i> _;_. - .i_,=:_. -<s. This program is distributed in the hope that - + . -:. = it will be useful, but WITHOUT ANY WARRANTY; - : .. .:, . . . without even the implied warranty of - =_ + =;=|` MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU -..}^=.= = ; Library General Public License for more -++= -. .` .: details. - : = ...= . :.=- - -. .:....=;==+<; You should have received a copy of the GNU - -_. . . )=. = Library General Public License along with - -- :-=` this library; see the file COPYING.LIB. +� � � � � �.>+-= +�_;:, � � .> � �:=|. This program is free software; you can +.> <`_, � > �. � <= redistribute it and/or modify it under +:`=1 )Y*s>-.-- � : the terms of the GNU Library General Public +.="- .-=="i, � � .._ License as published by the Free Software +�- . � .-<_> � � .<> Foundation; either version 2 of the License, +� � �._= =} � � � : or (at your option) any later version. +� � .%`+i> � � � _;_. +� � .i_,=:_. � � �-<s. This program is distributed in the hope that +� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY; +� � : .. � �.:, � � . . . without even the implied warranty of +� � =_ � � � �+ � � =;=|` MERCHANTABILITY or FITNESS FOR A +� _.=:. � � � : � �:=>`: PARTICULAR PURPOSE. See the GNU +..}^=.= � � � = � � � ; Library General Public License for more +++= � -. � � .` � � .: details. +�: � � = �...= . :.=- +�-. � .:....=;==+<; You should have received a copy of the GNU +� -_. . . � )=. �= Library General Public License along with +� � -- � � � �:-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, |