Diffstat (limited to 'libopie2/opiecore/device/odevice_zaurus.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 7377965..82e127e 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -93,36 +93,36 @@ struct z_button z_buttons_c700 [] = { | |||
93 | "devicebuttons/z_home", | 93 | "devicebuttons/z_home", |
94 | "QPE/Launcher", "home()", | 94 | "QPE/Launcher", "home()", |
95 | "buttonsettings", "raise()" }, | 95 | "buttonsettings", "raise()" }, |
96 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), | 96 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), |
97 | "devicebuttons/z_menu", | 97 | "devicebuttons/z_menu", |
98 | "QPE/TaskBar", "toggleMenu()", | 98 | "QPE/TaskBar", "toggleMenu()", |
99 | "QPE/TaskBar", "toggleStartMenu()" }, | 99 | "QPE/TaskBar", "toggleStartMenu()" }, |
100 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), | 100 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), |
101 | "devicebuttons/z_mail", | 101 | "devicebuttons/z_mail", |
102 | "opiemail", "raise()", | 102 | "opiemail", "raise()", |
103 | "opiemail", "newMail()" }, | 103 | "opiemail", "newMail()" }, |
104 | 104 | ||
105 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Display Rotate"), | 105 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"), |
106 | "devicebuttons/z_hinge", | 106 | "devicebuttons/z_hinge1", |
107 | "QPE/Rotation", "rotateDefault()", | 107 | "QPE/Rotation", "rotateDefault()", |
108 | "QPE/Dummy", "doNothing()" }, | 108 | "QPE/Rotation", "rotateDefault()" }, |
109 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Display Rotate"), | 109 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), |
110 | "devicebuttons/z_hinge", | 110 | "devicebuttons/z_hinge2", |
111 | "QPE/Rotation", "rotateDefault()", | 111 | "QPE/Rotation", "rotateDefault()", |
112 | "QPE/Dummy", "doNothing()" }, | 112 | "QPE/Rotation", "rotateDefault()" }, |
113 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Display Rotate"), | 113 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), |
114 | "devicebuttons/z_hinge", | 114 | "devicebuttons/z_hinge3", |
115 | "QPE/Rotation", "rotateDefault()", | 115 | "QPE/Rotation", "rotateDefault()", |
116 | "QPE/Dummy", "doNothing()" }, | 116 | "QPE/Rotation", "rotateDefault()" }, |
117 | }; | 117 | }; |
118 | 118 | ||
119 | // FIXME This gets unnecessary complicated. We should think about splitting the Zaurus | 119 | // FIXME This gets unnecessary complicated. We should think about splitting the Zaurus |
120 | // class up into individual classes. We need three classes | 120 | // class up into individual classes. We need three classes |
121 | // | 121 | // |
122 | // Zaurus-Collie (SA-model w/ 320x240 lcd, for SL5500 and SL5000) | 122 | // Zaurus-Collie (SA-model w/ 320x240 lcd, for SL5500 and SL5000) |
123 | // Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600) | 123 | // Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600) |
124 | // Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000) | 124 | // Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000) |
125 | // Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000) | 125 | // Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000) |
126 | // | 126 | // |
127 | // Only question right now is: Do we really need to do it? Because as soon | 127 | // Only question right now is: Do we really need to do it? Because as soon |
128 | // as the OpenZaurus kernel is ready, there will be a unified interface for all | 128 | // as the OpenZaurus kernel is ready, there will be a unified interface for all |
@@ -479,25 +479,25 @@ bool Zaurus::setDisplayStatus( bool on ) | |||
479 | ::close( fd ); | 479 | ::close( fd ); |
480 | } | 480 | } |
481 | } | 481 | } |
482 | return res; | 482 | return res; |
483 | } | 483 | } |
484 | 484 | ||
485 | bool Zaurus::suspend() | 485 | bool Zaurus::suspend() |
486 | { | 486 | { |
487 | qDebug("ODevice::suspend"); | 487 | qDebug("ODevice::suspend"); |
488 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend | 488 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend |
489 | return false; | 489 | return false; |
490 | 490 | ||
491 | if ( d->m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices | 491 | if ( d->m_model == Model_Unknown ) // better don't suspend on unknown devices |
492 | return false; | 492 | return false; |
493 | 493 | ||
494 | bool res = false; | 494 | bool res = false; |
495 | ODevice::sendSuspendmsg(); | 495 | ODevice::sendSuspendmsg(); |
496 | 496 | ||
497 | struct timeval tvs, tvn; | 497 | struct timeval tvs, tvn; |
498 | ::gettimeofday ( &tvs, 0 ); | 498 | ::gettimeofday ( &tvs, 0 ); |
499 | 499 | ||
500 | ::sync(); // flush fs caches | 500 | ::sync(); // flush fs caches |
501 | res = ( ::system ( "apm --suspend" ) == 0 ); | 501 | res = ( ::system ( "apm --suspend" ) == 0 ); |
502 | 502 | ||
503 | // This is needed because the apm implementation is asynchronous and we | 503 | // This is needed because the apm implementation is asynchronous and we |
@@ -525,25 +525,25 @@ Transformation Zaurus::rotation() const | |||
525 | { | 525 | { |
526 | OHingeStatus hs = readHingeSensor(); | 526 | OHingeStatus hs = readHingeSensor(); |
527 | qDebug( "Zaurus::rotation() - hinge sensor = %d", (int) hs ); | 527 | qDebug( "Zaurus::rotation() - hinge sensor = %d", (int) hs ); |
528 | 528 | ||
529 | if ( m_embedix ) | 529 | if ( m_embedix ) |
530 | { | 530 | { |
531 | if ( hs == CASE_PORTRAIT ) rot = Rot0; | 531 | if ( hs == CASE_PORTRAIT ) rot = Rot0; |
532 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; | 532 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; |
533 | else rot = Rot270; | 533 | else rot = Rot270; |
534 | } | 534 | } |
535 | else | 535 | else |
536 | { | 536 | { |
537 | if ( hs == CASE_PORTRAIT ) rot = Rot270; | 537 | if ( hs == CASE_PORTRAIT ) rot = Rot90; |
538 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; | 538 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; |
539 | else rot = Rot0; | 539 | else rot = Rot0; |
540 | } | 540 | } |
541 | } | 541 | } |
542 | break; | 542 | break; |
543 | case Model_Zaurus_SL6000: | 543 | case Model_Zaurus_SL6000: |
544 | case Model_Zaurus_SLB600: | 544 | case Model_Zaurus_SLB600: |
545 | case Model_Zaurus_SLA300: | 545 | case Model_Zaurus_SLA300: |
546 | case Model_Zaurus_SL5500: | 546 | case Model_Zaurus_SL5500: |
547 | case Model_Zaurus_SL5000: | 547 | case Model_Zaurus_SL5000: |
548 | default: | 548 | default: |
549 | rot = d->m_rotation; | 549 | rot = d->m_rotation; |