author | mickeyl <mickeyl> | 2003-05-30 20:05:49 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-05-30 20:05:49 (UTC) |
commit | 4e9f13ddaea55f33dc5d9de6f2bb1b64cdc3d11f (patch) (unidiff) | |
tree | d22bbfde34ba34d506083316eb10f8e1d5d1697d /libopie | |
parent | 832b2e4a824254f16e1d89f8b6f4367068719cf8 (diff) | |
download | opie-4e9f13ddaea55f33dc5d9de6f2bb1b64cdc3d11f.zip opie-4e9f13ddaea55f33dc5d9de6f2bb1b64cdc3d11f.tar.gz opie-4e9f13ddaea55f33dc5d9de6f2bb1b64cdc3d11f.tar.bz2 |
slight fix to simpad buttons. opie-button-settings really has to be adapted
to support the larger screen size
-rw-r--r-- | libopie/odevice.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 01932c9..f0429d4 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -270,67 +270,69 @@ struct s_button { | |||
270 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 270 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
271 | Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"), | 271 | Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"), |
272 | "devicebuttons/simpad_lower_up", | 272 | "devicebuttons/simpad_lower_up", |
273 | "datebook", "nextView()", | 273 | "datebook", "nextView()", |
274 | "today", "raise()" }, | 274 | "today", "raise()" }, |
275 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 275 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
276 | Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"), | 276 | Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"), |
277 | "devicebuttons/simpad_lower_down", | 277 | "devicebuttons/simpad_lower_down", |
278 | "addressbook", "raise()", | 278 | "addressbook", "raise()", |
279 | "addressbook", "beamBusinessCard()" }, | 279 | "addressbook", "beamBusinessCard()" }, |
280 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 280 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
281 | Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Lower+Right"), | 281 | Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Lower+Right"), |
282 | "devicebuttons/simpad_lower_right", | 282 | "devicebuttons/simpad_lower_right", |
283 | "QPE/TaskBar", "toggleMenu()", | 283 | "QPE/TaskBar", "toggleMenu()", |
284 | "QPE/TaskBar", "toggleStartMenu()" }, | 284 | "QPE/TaskBar", "toggleStartMenu()" }, |
285 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 285 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
286 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"), | ||
287 | "devicebuttons/simpad_lower_upper", | ||
288 | "QPE/Launcher", "home()", | ||
289 | "buttonsettings", "raise()" }, | ||
290 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | ||
291 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Lower+Left"), | 286 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Lower+Left"), |
292 | "devicebuttons/simpad_lower_left", | 287 | "devicebuttons/simpad_lower_left", |
293 | "mail", "raise()", | 288 | "mail", "raise()", |
294 | "mail", "newMail()" }, | 289 | "mail", "newMail()" }, |
295 | 290 | ||
296 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 291 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
297 | Qt::Key_F5, QT_TRANSLATE_NOOP("Button", "Upper+Up"), | 292 | Qt::Key_F5, QT_TRANSLATE_NOOP("Button", "Upper+Up"), |
298 | "devicebuttons/simpad_upper_up", | 293 | "devicebuttons/simpad_upper_up", |
299 | "datebook", "nextView()", | 294 | "QPE/Launcher", "home()", |
300 | "today", "raise()" }, | 295 | "buttonsettings", "raise()" }, |
301 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 296 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
302 | Qt::Key_F6, QT_TRANSLATE_NOOP("Button", "Upper+Down"), | 297 | Qt::Key_F6, QT_TRANSLATE_NOOP("Button", "Upper+Down"), |
303 | "devicebuttons/simpad_upper_down", | 298 | "devicebuttons/simpad_upper_down", |
304 | "addressbook", "raise()", | 299 | "addressbook", "raise()", |
305 | "addressbook", "beamBusinessCard()" }, | 300 | "addressbook", "beamBusinessCard()" }, |
306 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 301 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
307 | Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Upper+Right"), | 302 | Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Upper+Right"), |
308 | "devicebuttons/simpad_upper_right", | 303 | "devicebuttons/simpad_upper_right", |
309 | "QPE/TaskBar", "toggleMenu()", | 304 | "QPE/TaskBar", "toggleMenu()", |
310 | "QPE/TaskBar", "toggleStartMenu()" }, | 305 | "QPE/TaskBar", "toggleStartMenu()" }, |
311 | /*{ Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 306 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
307 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Upper+Left"), | ||
308 | "devicebuttons/simpad_upper_left", | ||
309 | "QPE/Rotation", "flip()", | ||
310 | "QPE/Rotation", "flip()" }, | ||
311 | /* | ||
312 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | ||
312 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"), | 313 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"), |
313 | "devicebuttons/simpad_lower_upper", | 314 | "devicebuttons/simpad_lower_upper", |
314 | "QPE/Launcher", "home()", | 315 | "QPE/Launcher", "home()", |
315 | "buttonsettings", "raise()" },*/ | 316 | "buttonsettings", "raise()" }, |
316 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 317 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
317 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Upper+Left"), | 318 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"), |
318 | "devicebuttons/simpad_upper_left", | 319 | "devicebuttons/simpad_upper_lower", |
319 | "mail", "raise()", | 320 | "QPE/Launcher", "home()", |
320 | "mail", "newMail()" }, | 321 | "buttonsettings", "raise()" }, |
322 | */ | ||
321 | }; | 323 | }; |
322 | 324 | ||
323 | static QCString makeChannel ( const char *str ) | 325 | static QCString makeChannel ( const char *str ) |
324 | { | 326 | { |
325 | if ( str && !::strchr ( str, '/' )) | 327 | if ( str && !::strchr ( str, '/' )) |
326 | return QCString ( "QPE/Application/" ) + str; | 328 | return QCString ( "QPE/Application/" ) + str; |
327 | else | 329 | else |
328 | return str; | 330 | return str; |
329 | } | 331 | } |
330 | 332 | ||
331 | static inline bool isQWS() | 333 | static inline bool isQWS() |
332 | { | 334 | { |
333 | return qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; | 335 | return qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; |
334 | } | 336 | } |
335 | 337 | ||
336 | ODevice *ODevice::inst ( ) | 338 | ODevice *ODevice::inst ( ) |