Diffstat (limited to 'core/applets/rotateapplet/rotate.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/rotateapplet/rotate.cpp | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp index e236cd1..4743388 100644 --- a/core/applets/rotateapplet/rotate.cpp +++ b/core/applets/rotateapplet/rotate.cpp @@ -22,34 +22,35 @@ -- :-= 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 <qpe/resource.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qpeapplication.h> +#include <qpe/config.h> #include <qiconset.h> #include <qpopupmenu.h> #include "rotate.h" RotateApplet::RotateApplet ( ) : QObject ( 0, "RotateApplet" ), ref ( 0 ) { - m_native = true; + m_flipped = false; } RotateApplet::~RotateApplet ( ) { } int RotateApplet::position ( ) const { return 2; } QString RotateApplet::name ( ) const @@ -83,43 +84,60 @@ QIconSet RotateApplet::icon ( ) const } QPopupMenu *RotateApplet::popup ( QWidget * ) const { return 0; } void RotateApplet::activated ( ) { int currentRotation = QPEApplication::defaultRotation(); int newRotation; - if ( m_native == true ) { - newRotation = currentRotation + 90; - if(newRotation >= 360) newRotation = 0; //ipaqs like the 36xx have the display - //rotated to 270 as default, so 360 does nothing => handle this here + Config cfg( "qpe" ); + cfg.setGroup( "Appearance" ); - } else { - newRotation = currentRotation - 90; - if (newRotation <=0) newRotation = 270; + // 0 -> 90° clockwise, 1 -> 90° counterclockwise + bool rotDirection = cfg.readBoolEntry( "rotatedir" ); + + // hide inputs methods before rotation + QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" ); + + if ( m_flipped ) { + if ( rotDirection ) { + newRotation = currentRotation - 90; + if (newRotation <=0) newRotation = 270; //ipaqs like the 36xx have the display rotated // to 270 as default, and -90 is invalid => handle this here + } else { + newRotation = currentRotation + 90; + if(newRotation >= 360) newRotation = 0; //ipaqs like the 36xx have the display + //rotated to 270 as default, so 360 does nothing => handle this here + } + } else { + if ( rotDirection ) { + newRotation = currentRotation + 90; + if(newRotation >= 360) newRotation = 0; + } else { + newRotation = currentRotation - 90; + if (newRotation <=0) newRotation = 270; + } } QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" ); env << newRotation; QCopEnvelope env2( "QPE/System", "setDefaultRotation(int)" ); env2 << newRotation; - m_native = !m_native; - + m_flipped = !m_flipped; } 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 ) |