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

- first batch of minor code cleanup

1 files changed, 114 insertions, 90 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,8 +1,11 @@
 /*
-               =.            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.
            .>+-=
  _;:,     .>    :=|.         This library is free software; you can
-.> <,   >  .   <=          redistribute it and/or  modify it under
-:=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.> <,   >  .   <=           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
@@ -14,6 +17,6 @@
     : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>:     PARTICULAR PURPOSE. See the GNU
+    =_        +     =;=|     MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>:      PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
-++=   -.     .     .:       details.
+++=   -.     .     .:        details.
  :     =  ...= . :.=-
@@ -21,3 +24,3 @@
   -_. . .   )=.  =           Library General Public License along with
-    --        :-=           this library; see the file COPYING.LIB.
+    --        :-=            this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
@@ -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,11 +45,6 @@
 
-#include <opie/odevice.h>
-
-#include "rotate.h"
-
 using namespace Opie;
 
-
-RotateApplet::RotateApplet ( )
-	: QObject ( 0, "RotateApplet" ), ref ( 0 ), m_flipped( false )
+RotateApplet::RotateApplet()
+             :QObject( 0, "RotateApplet" ), ref( 0 ), m_flipped( false )
 {
@@ -57,5 +60,3 @@ RotateApplet::RotateApplet ( )
 RotateApplet::~RotateApplet ( )
-{
-}
-
+{}
 
@@ -64,13 +65,37 @@ 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()") {
-		rotateDefault();
-	}
+    }
+    else if ( msg == "rotateDefault()")
+    {
+        rotateDefault();
+    }
 }
 
-
-int RotateApplet::position ( ) const
+int RotateApplet::position() const
 {
@@ -79,10 +104,10 @@ int RotateApplet::position ( ) const
 
-QString RotateApplet::name ( ) const
+QString RotateApplet::name() const
 {
-	return tr( "Rotate shortcut" );
+    return tr( "Rotate shortcut" );
 }
 
-QString RotateApplet::text ( ) const
+QString RotateApplet::text() const
 {
-	return tr( "Rotate" );
+    return tr( "Rotate" );
 }
@@ -100,39 +125,29 @@ QString RotateApplet::tr( const char* s, const char* p ) const
 
-QIconSet RotateApplet::icon ( ) const
+QIconSet RotateApplet::icon() const
 {
-	QPixmap pix;
-	QImage img = Resource::loadImage ( "Rotation" );
-
-	if ( !img. isNull ( ))
-		pix. convertFromImage ( img. smoothScale ( 14, 14 ));
-	return pix;
+    QPixmap pix;
+    QImage img = Resource::loadImage( "Rotation" );
+    if ( !img.isNull() )
+        pix.convertFromImage( img.smoothScale( 14, 14 ) );
+    return pix;
 }
 
-QPopupMenu *RotateApplet::popup ( QWidget * ) const
+QPopupMenu* RotateApplet::popup(QWidget*) const
 {
-	return 0;
+    return 0;
 }
 
-void RotateApplet::rotateDefault ( )
+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;
+    }
 
-	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;
-	}
     Config cfg( "qpe" );
@@ -142,4 +157,3 @@ void RotateApplet::rotateDefault ( )
 
-    if (rotateEnabled == false)
-		return;
+    if ( !rotateEnabled) return;
 
@@ -154,5 +168,4 @@ void RotateApplet::rotateDefault ( )
 }
-void RotateApplet::activated ( )
+void RotateApplet::activated()
 {
-
     int defaultRotation = QPEApplication::defaultRotation();
@@ -166,6 +179,9 @@ void RotateApplet::activated ( )
 
-    if (rotDirection == -1) {
-    	rot = ODevice::inst ( )-> direction ( );
-    } else {
-	rot = (ODirection)rotDirection;
+    if (rotDirection == -1)
+    {
+        rot = ODevice::inst()->direction();
+    }
+    else
+    {
+        rot = (ODirection) rotDirection;
     }
@@ -175,14 +191,22 @@ void RotateApplet::activated ( )
 
-    if ( m_flipped )  {
-	// if flipped, flip back to the original state,
-	// regardless of rotation direction
+    if ( m_flipped )
+    {
+        // if flipped, flip back to the original state,
+        // regardless of rotation direction
         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;
-	}
+        }
     }
@@ -196,18 +220,18 @@ void RotateApplet::activated ( )
 
-QRESULT RotateApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
+QRESULT RotateApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
-	*iface = 0;
-	if ( uuid == IID_QUnknown )
-		*iface = this;
-	else if ( uuid == IID_MenuApplet )
-		*iface = this;
-
-	if ( *iface )
-		(*iface)-> addRef ( );
-	return QS_OK;
+    *iface = 0;
+    if ( uuid == IID_QUnknown )
+        *iface = this;
+    else if ( uuid == IID_MenuApplet )
+        *iface = this;
+
+    if ( *iface )
+        (*iface)->addRef();
+    return QS_OK;
 }
 
-Q_EXPORT_INTERFACE( )
+Q_EXPORT_INTERFACE()
 {
-	Q_CREATE_INSTANCE( RotateApplet )
+    Q_CREATE_INSTANCE( RotateApplet )
 }