summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-01-04 16:34:58 (UTC)
committer mickeyl <mickeyl>2004-01-04 16:34:58 (UTC)
commitc076942e5b0cdaa68a467354a563d1071c866d92 (patch) (side-by-side diff)
tree4da1b79ef326101b410dd85f57f25014b618c23c
parent6ee1d5d35243f611e0a848d454bfa309b8de0fc9 (diff)
downloadopie-c076942e5b0cdaa68a467354a563d1071c866d92.zip
opie-c076942e5b0cdaa68a467354a563d1071c866d92.tar.gz
opie-c076942e5b0cdaa68a467354a563d1071c866d92.tar.bz2
- implement action on closing the hinge for devices with hinge sensors
- first batch of minor code cleanup
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/rotateapplet/rotate.cpp116
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,11 +1,14 @@
/*
-               =. 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
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%+i>       _;_.
@@ -18,65 +21,87 @@
++=   -.     .     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-= this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
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>
#include <qpopupmenu.h>
-#include <opie/odevice.h>
-
-#include "rotate.h"
-
using namespace Opie;
-
RotateApplet::RotateApplet ( )
: QObject ( 0, "RotateApplet" ), ref ( 0 ), m_flipped( false )
{
#if !defined(QT_NO_COP)
QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this );
connect ( rotateChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
#endif
}
RotateApplet::~RotateApplet ( )
-{
-}
-
+{}
/**
* Qcop receive method.
*/
-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();
}
}
-
int RotateApplet::position ( ) const
{
return 3;
}
QString RotateApplet::name ( ) const
{
return tr( "Rotate shortcut" );
@@ -97,97 +122,96 @@ QString RotateApplet::tr( const char* s, const char* p ) const
return qApp->translate( "RotateApplet", s, p );
}
*/
QIconSet RotateApplet::icon ( ) const
{
QPixmap pix;
QImage img = Resource::loadImage ( "Rotation" );
-
if ( !img. isNull ( ))
pix. convertFromImage ( img. smoothScale ( 14, 14 ));
return pix;
}
QPopupMenu *RotateApplet::popup ( QWidget * ) const
{
return 0;
}
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" );
cfg.setGroup( "Appearance" );
bool rotateEnabled = cfg.readBoolEntry( "rotateEnabled",true );
- if (rotateEnabled == false)
- return;
+ if ( !rotateEnabled) return;
// hide inputs methods before rotation
QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
env << rot;
m_flipped = false;
}
void RotateApplet::activated ( )
{
-
int defaultRotation = QPEApplication::defaultRotation();
int newRotation = defaultRotation;
Config cfg( "qpe" );
cfg.setGroup( "Appearance" );
int rotDirection = cfg.readNumEntry( "rotatedir" );
ODirection rot = CW;
- if (rotDirection == -1) {
+ if (rotDirection == -1)
+ {
rot = ODevice::inst ( )-> direction ( );
- } else {
+ }
+ else
+ {
rot = (ODirection)rotDirection;
}
// hide inputs methods before rotation
QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
- if ( m_flipped ) {
+ 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;
}
}
QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
env << newRotation;
m_flipped = !m_flipped;