summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/rotateapplet/rotate.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index 653c61f..e236cd1 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -69,53 +69,61 @@ QString RotateApplet::tr( const char* s ) const
69 69
70QString RotateApplet::tr( const char* s, const char* p ) const 70QString RotateApplet::tr( const char* s, const char* p ) const
71{ 71{
72 return qApp->translate( "RotateApplet", s, p ); 72 return qApp->translate( "RotateApplet", s, p );
73} 73}
74 74
75QIconSet RotateApplet::icon ( ) const 75QIconSet RotateApplet::icon ( ) const
76{ 76{
77 QPixmap pix; 77 QPixmap pix;
78 QImage img = Resource::loadImage ( "Rotation" ); 78 QImage img = Resource::loadImage ( "Rotation" );
79 79
80 if ( !img. isNull ( )) 80 if ( !img. isNull ( ))
81 pix. convertFromImage ( img. smoothScale ( 14, 14 )); 81 pix. convertFromImage ( img. smoothScale ( 14, 14 ));
82 return pix; 82 return pix;
83} 83}
84 84
85QPopupMenu *RotateApplet::popup ( QWidget * ) const 85QPopupMenu *RotateApplet::popup ( QWidget * ) const
86{ 86{
87 return 0; 87 return 0;
88} 88}
89 89
90void RotateApplet::activated ( ) 90void RotateApplet::activated ( )
91{ 91{
92 int currentRotation = QPEApplication::defaultRotation(); 92 int currentRotation = QPEApplication::defaultRotation();
93
93 int newRotation; 94 int newRotation;
94 if ( m_native == true ) { 95 if ( m_native == true ) {
96
95 newRotation = currentRotation + 90; 97 newRotation = currentRotation + 90;
98 if(newRotation >= 360) newRotation = 0;//ipaqs like the 36xx have the display
99 //rotated to 270 as default, so 360 does nothing => handle this here
100
96 } else { 101 } else {
97 newRotation = currentRotation - 90; 102 newRotation = currentRotation - 90;
103 if (newRotation <=0) newRotation = 270;
104 //ipaqs like the 36xx have the display rotated
105 // to 270 as default, and -90 is invalid => handle this here
98 } 106 }
99 QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" ); 107 QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
100 env << newRotation; 108 env << newRotation;
101 QCopEnvelope env2( "QPE/System", "setDefaultRotation(int)" ); 109 QCopEnvelope env2( "QPE/System", "setDefaultRotation(int)" );
102 env2 << newRotation; 110 env2 << newRotation;
103 111
104 m_native = !m_native; 112 m_native = !m_native;
105 113
106} 114}
107 115
108 116
109QRESULT RotateApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) 117QRESULT RotateApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
110{ 118{
111 *iface = 0; 119 *iface = 0;
112 if ( uuid == IID_QUnknown ) 120 if ( uuid == IID_QUnknown )
113 *iface = this; 121 *iface = this;
114 else if ( uuid == IID_MenuApplet ) 122 else if ( uuid == IID_MenuApplet )
115 *iface = this; 123 *iface = this;
116 124
117 if ( *iface ) 125 if ( *iface )
118 (*iface)-> addRef ( ); 126 (*iface)-> addRef ( );
119 return QS_OK; 127 return QS_OK;
120} 128}
121 129