summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/rotateapplet/rotate.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index 0da2f0c..dd71cad 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -93,99 +93,99 @@ QString RotateApplet::text ( ) const
93} 93}
94 94
95QString RotateApplet::tr( const char* s, const char* p ) const 95QString RotateApplet::tr( const char* s, const char* p ) const
96{ 96{
97 return qApp->translate( "RotateApplet", s, p ); 97 return qApp->translate( "RotateApplet", s, p );
98} 98}
99*/ 99*/
100 100
101QIconSet RotateApplet::icon ( ) const 101QIconSet RotateApplet::icon ( ) const
102{ 102{
103 QPixmap pix; 103 QPixmap pix;
104 QImage img = Resource::loadImage ( "Rotation" ); 104 QImage img = Resource::loadImage ( "Rotation" );
105 105
106 if ( !img. isNull ( )) 106 if ( !img. isNull ( ))
107 pix. convertFromImage ( img. smoothScale ( 14, 14 )); 107 pix. convertFromImage ( img. smoothScale ( 14, 14 ));
108 return pix; 108 return pix;
109} 109}
110 110
111QPopupMenu *RotateApplet::popup ( QWidget * ) const 111QPopupMenu *RotateApplet::popup ( QWidget * ) const
112{ 112{
113 return 0; 113 return 0;
114} 114}
115 115
116void RotateApplet::rotateDefault ( ) 116void RotateApplet::rotateDefault ( )
117{ 117{
118 118
119 int rot = ODevice::inst()->rotation(); 119 int rot = ODevice::inst()->rotation();
120 120
121 switch (rot) { 121 switch (rot) {
122 case Rot0: 122 case Rot0:
123 rot=0; 123 rot=0;
124 break; 124 break;
125 case Rot90: 125 case Rot90:
126 rot=90; 126 rot=90;
127 break; 127 break;
128 case Rot180: 128 case Rot180:
129 rot=180; 129 rot=180;
130 break; 130 break;
131 case Rot270: 131 case Rot270:
132 rot=270; 132 rot=270;
133 break; 133 break;
134 default: 134 default:
135 rot=0; 135 rot=0;
136 break; 136 break;
137 } 137 }
138 Config cfg( "qpe" ); 138 Config cfg( "qpe" );
139 cfg.setGroup( "Appearance" ); 139 cfg.setGroup( "Appearance" );
140 140
141 bool rotateDisabled = cfg.readBoolEntry( "rotateEnabled",false ); 141 bool rotateEnabled = cfg.readBoolEntry( "rotateEnabled",true );
142 142
143 if (rotateDisabled == true) 143 if (rotateEnabled == false)
144 return; 144 return;
145 145
146 // hide inputs methods before rotation 146 // hide inputs methods before rotation
147 QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" ); 147 QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
148 148
149 QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" ); 149 QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
150 env << rot; 150 env << rot;
151 151
152 m_flipped = false; 152 m_flipped = false;
153 153
154} 154}
155void RotateApplet::activated ( ) 155void RotateApplet::activated ( )
156{ 156{
157 157
158 int defaultRotation = QPEApplication::defaultRotation(); 158 int defaultRotation = QPEApplication::defaultRotation();
159 int newRotation = defaultRotation; 159 int newRotation = defaultRotation;
160 160
161 Config cfg( "qpe" ); 161 Config cfg( "qpe" );
162 cfg.setGroup( "Appearance" ); 162 cfg.setGroup( "Appearance" );
163 163
164 int rotDirection = cfg.readNumEntry( "rotatedir" ); 164 int rotDirection = cfg.readNumEntry( "rotatedir" );
165 ODirection rot = CW; 165 ODirection rot = CW;
166 166
167 if (rotDirection == -1) { 167 if (rotDirection == -1) {
168 rot = ODevice::inst ( )-> direction ( ); 168 rot = ODevice::inst ( )-> direction ( );
169 } else { 169 } else {
170 rot = (ODirection)rotDirection; 170 rot = (ODirection)rotDirection;
171 } 171 }
172 172
173 // hide inputs methods before rotation 173 // hide inputs methods before rotation
174 QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" ); 174 QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
175 175
176 if ( m_flipped ) { 176 if ( m_flipped ) {
177 // if flipped, flip back to the original state, 177 // if flipped, flip back to the original state,
178 // regardless of rotation direction 178 // regardless of rotation direction
179 newRotation = defaultRotation; 179 newRotation = defaultRotation;
180 } else { 180 } else {
181 if ( rot == CCW ) { 181 if ( rot == CCW ) {
182 newRotation = ( defaultRotation + 90 ) % 360; 182 newRotation = ( defaultRotation + 90 ) % 360;
183 } else if ( rot == CW ) { 183 } else if ( rot == CW ) {
184 newRotation = ( defaultRotation + 270 ) % 360; 184 newRotation = ( defaultRotation + 270 ) % 360;
185 } else if ( rot == Flip ) { 185 } else if ( rot == Flip ) {
186 newRotation = ( defaultRotation + 180 ) % 360; 186 newRotation = ( defaultRotation + 180 ) % 360;
187 } 187 }
188 } 188 }
189 189
190 QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" ); 190 QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
191 env << newRotation; 191 env << newRotation;