summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-03-26 23:19:41 (UTC)
committer harlekin <harlekin>2003-03-26 23:19:41 (UTC)
commiteda6fffbe8ad7e3635985d9b2a8f7b46964aa271 (patch) (side-by-side diff)
tree828bdf054c6f3932c4ac01e5609ee432a0b5b530
parenta99096fa8b72704bcec0b76a6ad2107c3db70f13 (diff)
downloadopie-eda6fffbe8ad7e3635985d9b2a8f7b46964aa271.zip
opie-eda6fffbe8ad7e3635985d9b2a8f7b46964aa271.tar.gz
opie-eda6fffbe8ad7e3635985d9b2a8f7b46964aa271.tar.bz2
adapted to what was discussed today on irc. Direction of rotation is settable in appearance in future
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/rotateapplet/rotate.cpp38
-rw-r--r--core/applets/rotateapplet/rotate.h2
2 files changed, 29 insertions, 11 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
@@ -18,42 +18,43 @@
++=   -.     .     .: 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 <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
{
return tr( "Rotate shortcut" );
}
@@ -79,51 +80,68 @@ QIconSet RotateApplet::icon ( ) const
if ( !img. isNull ( ))
pix. convertFromImage ( img. smoothScale ( 14, 14 ));
return pix;
}
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 )
(*iface)-> addRef ( );
return QS_OK;
}
diff --git a/core/applets/rotateapplet/rotate.h b/core/applets/rotateapplet/rotate.h
index c4087f9..57f9040 100644
--- a/core/applets/rotateapplet/rotate.h
+++ b/core/applets/rotateapplet/rotate.h
@@ -41,21 +41,21 @@ public:
QRESULT queryInterface( const QUuid&, QUnknownInterface** );
Q_REFCOUNT
virtual int position() const;
virtual QString name ( ) const;
virtual QIconSet icon ( ) const;
virtual QString text ( ) const;
virtual QString tr( const char* ) const;
virtual QString tr( const char*, const char* ) const;
virtual QPopupMenu *popup ( QWidget *parent ) const;
virtual void activated ( );
private:
- bool m_native;
+ bool m_flipped;
ulong ref;
};
#endif