- implement action on closing the hinge for devices with hinge sensors

- first batch of minor code cleanup

1 files changed, 70 insertions, 46 deletions

diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index dd71cad..ea114bb 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -1,4 +1,7 @@
 /*
-               =.            This file is part of the OPIE Project
-             .=l.            Copyright (c)  2003 Maximilian Reiss <harlekin@handhelds.org>
+                             This file is part of the OPIE Project
+                             Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org>
+                             Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net>
+               =.            Copyright (C) 2004 Michael Lauer <mickey@Vanille.de>
+             .=l.
            .>+-=
@@ -25,11 +28,16 @@
                              Boston, MA 02111-1307, USA.
-
 */
 
+#include "rotate.h"
 
-#include <qpe/resource.h>
+/* OPIE */
+#include <opie/odevice.h>
+#include <qpe/applnk.h>
+#include <qpe/config.h>
+#include <qpe/power.h>
+#include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/resource.h>
 
-#include <qpe/qpeapplication.h>
-#include <qpe/config.h>
+/* QT */
 #include <qiconset.h>
@@ -37,9 +45,4 @@
 
-#include <opie/odevice.h>
-
-#include "rotate.h"
-
 using namespace Opie;
 
-
 RotateApplet::RotateApplet ( )
@@ -57,5 +60,3 @@ RotateApplet::RotateApplet ( )
 RotateApplet::~RotateApplet ( )
-{
-}
-
+{}
 
@@ -64,7 +65,32 @@ RotateApplet::~RotateApplet ( )
  */
-void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data ) {
+void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data )
+{
+    qDebug( "RotateApplet::channelReceived( '%s' )", (const char*) msg );
+
+    if ( ODevice::inst()->hasHingeSensor() )
+    {
+        OHingeStatus status = ODevice::inst()->readHingeSensor();
+        qDebug( "RotateApplet::readHingeSensor = %d", (int) status );
+        if ( status == CASE_CLOSED )
+        {
+            Config cfg( "apm" );
+            cfg.setGroup( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ? "AC" : "Battery" );
+            int action = cfg.readNumEntry( "CloseHingeAction", 0 );
+            switch ( action )
+            {
+                case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayStatus( false ); ODevice::inst()->setDisplayBrightness( 0 ); break;
+                case 2: /* SUSPEND */ ODevice::inst()->suspend(); break;
+                default: /* IGNORE */ break;
+            }
+            qDebug( "RotateApplet::switchAction %d performed.", cfg.readNumEntry( "CloseHingeAction", 0 ) );
+        }
+    }
+
     QDataStream stream( data, IO_ReadOnly );
-    if ( msg == "flip()" ) {
+    if ( msg == "flip()" )
+    {
         activated ( );
-    } else if ( msg == "rotateDefault()") {
+    }
+    else if ( msg == "rotateDefault()")
+    {
                 rotateDefault();
@@ -73,3 +99,2 @@ void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data
 
-
 int RotateApplet::position ( ) const
@@ -104,3 +129,2 @@ QIconSet RotateApplet::icon ( ) const
         QImage img = Resource::loadImage ( "Rotation" );
-
         if ( !img. isNull ( ))
@@ -117,22 +141,13 @@ void RotateApplet::rotateDefault ( )
 {
-
         int rot = ODevice::inst()->rotation();
 
-        switch (rot) {
-                case Rot0:
-                        rot=0;
-                        break;
-                case Rot90:
-                        rot=90;
-                        break;
-                case Rot180:
-                        rot=180;
-                        break;
-                case Rot270:
-                        rot=270;
-                        break;
-                default:
-                        rot=0;
-                        break;
+    switch (rot)
+    {
+        case Rot0:   rot=0;   break;
+        case Rot90:  rot=90;  break;
+        case Rot180: rot=180; break;
+        case Rot270: rot=270; break;
+        default:     rot=0;   break;
         }
+
     Config cfg( "qpe" );
@@ -142,4 +157,3 @@ void RotateApplet::rotateDefault ( )
 
-    if (rotateEnabled == false)
-                return;
+    if ( !rotateEnabled) return;
 
@@ -156,3 +170,2 @@ void RotateApplet::activated ( )
 {
-
     int defaultRotation = QPEApplication::defaultRotation();
@@ -166,5 +179,8 @@ void RotateApplet::activated ( )
 
-    if (rotDirection == -1) {
+    if (rotDirection == -1)
+    {
             rot = ODevice::inst ( )-> direction ( );
-    } else {
+    }
+    else
+    {
         rot = (ODirection)rotDirection;
@@ -175,3 +191,4 @@ void RotateApplet::activated ( )
 
-    if ( m_flipped )  {
+    if ( m_flipped )
+    {
         // if flipped, flip back to the original state,
@@ -179,8 +196,15 @@ void RotateApplet::activated ( )
         newRotation = defaultRotation;
-    } else {
-        if ( rot == CCW )  {
+    }
+    else
+    {
+        if ( rot == CCW )
+        {
             newRotation = ( defaultRotation + 90 ) % 360;
-        } else if ( rot == CW ) {
+        }
+        else if ( rot == CW )
+        {
             newRotation = ( defaultRotation + 270 ) % 360;
-        } else if ( rot == Flip ) {
+        }
+        else if ( rot == Flip )
+        {
             newRotation = ( defaultRotation + 180 ) % 360;