summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-07-22 22:56:18 (UTC)
committer mickeyl <mickeyl>2005-07-22 22:56:18 (UTC)
commitb74ea9f8de39d355e2d16b4b685e9de54e2f0b0d (patch) (unidiff)
treea52111e0b1dccdd97d03ea1fe79d6ca14459a3a2
parent312b42400a1ea39f3537664fe610e2f42f3097d1 (diff)
downloadopie-b74ea9f8de39d355e2d16b4b685e9de54e2f0b0d.zip
opie-b74ea9f8de39d355e2d16b4b685e9de54e2f0b0d.tar.gz
opie-b74ea9f8de39d355e2d16b4b685e9de54e2f0b0d.tar.bz2
odevice: fix SL6000 rotation + record button mapping
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp39
1 files changed, 37 insertions, 2 deletions
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 8369f54..7302d2c 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -111,12 +111,43 @@ struct z_button z_buttons_c700 [] = {
111 "QPE/Rotation", "rotateDefault()",0}, 111 "QPE/Rotation", "rotateDefault()",0},
112 { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), 112 { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"),
113 "devicebuttons/z_hinge3", 113 "devicebuttons/z_hinge3",
114 "QPE/Rotation", "rotateDefault()",0}, 114 "QPE/Rotation", "rotateDefault()",0},
115}; 115};
116 116
117struct z_button z_buttons_6000 [] = {
118 { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
119 "devicebuttons/z_calendar",
120 "datebook", "nextView()",
121 "today", "raise()" },
122 { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
123 "devicebuttons/z_contact",
124 "addressbook", "raise()",
125 "addressbook", "beamBusinessCard()" },
126 { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
127 "devicebuttons/z_home",
128 "QPE/Launcher", "home()",
129 "buttonsettings", "raise()" },
130 { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
131 "devicebuttons/z_menu",
132 "QPE/TaskBar", "toggleMenu()",
133 "QPE/TaskBar", "toggleStartMenu()" },
134 { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
135 "devicebuttons/z_mail",
136 "opiemail", "raise()",
137 "opiemail", "newMail()" },
138 { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Rotate Button"),
139 "devicebuttons/z_rotate",
140 0,
141 "QPE/Rotation", "rotateDefault()" },
142 { Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"),
143 "devicebuttons/z_hinge3",
144 "QPE/VMemo", "toggleRecord()",
145 "sound", "raise()" },
146};
147
117// FIXME This gets unnecessary complicated. We should think about splitting the Zaurus 148// FIXME This gets unnecessary complicated. We should think about splitting the Zaurus
118// class up into individual classes. We would need three classes 149// class up into individual classes. We would need three classes
119// 150//
120// Zaurus-Collie (SA-model w/ 320x240 lcd, for SL5500 and SL5000) 151// Zaurus-Collie (SA-model w/ 320x240 lcd, for SL5500 and SL5000)
121// Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600) 152// Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600)
122// Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000, C1000, C3100) 153// Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000, C1000, C3100)
@@ -252,18 +283,22 @@ void Zaurus::init(const QString& cpu_info)
252 283
253void Zaurus::initButtons() 284void Zaurus::initButtons()
254{ 285{
255 if ( d->m_buttons ) 286 if ( d->m_buttons )
256 return; 287 return;
257 288
258
259 d->m_buttons = new QValueList <ODeviceButton>; 289 d->m_buttons = new QValueList <ODeviceButton>;
260 290
261 struct z_button * pz_buttons; 291 struct z_button * pz_buttons;
262 int buttoncount; 292 int buttoncount;
263 switch ( d->m_model ) { 293 switch ( d->m_model )
294 {
295 case Model_Zaurus_SL6000:
296 pz_buttons = z_buttons_6000;
297 buttoncount = ARRAY_SIZE(z_buttons_6000);
298 break;
264 case Model_Zaurus_SLC3000: // fallthrough 299 case Model_Zaurus_SLC3000: // fallthrough
265 case Model_Zaurus_SLC1000: // fallthrough 300 case Model_Zaurus_SLC1000: // fallthrough
266 case Model_Zaurus_SLC7x0: 301 case Model_Zaurus_SLC7x0:
267 if ( isQWS( ) ) { 302 if ( isQWS( ) ) {
268 addPreHandler(this); // hinge-sensor-handler 303 addPreHandler(this); // hinge-sensor-handler
269 } 304 }