summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index c0f0bfc..8deca21 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -163,88 +163,86 @@ protected:
163 bool eventFilter( QObject *, QEvent * ); 163 bool eventFilter( QObject *, QEvent * );
164 void timerEvent( QTimerEvent * ); 164 void timerEvent( QTimerEvent * );
165 bool raiseAppropriateWindow(); 165 bool raiseAppropriateWindow();
166 virtual void tryQuit(); 166 virtual void tryQuit();
167#if QT_VERSION > 233 167#if QT_VERSION > 233
168 virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) 168 virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!)
169#endif 169#endif
170private: 170private:
171#ifndef QT_NO_TRANSLATION 171#ifndef QT_NO_TRANSLATION
172 void installTranslation( const QString& baseName ); 172 void installTranslation( const QString& baseName );
173#endif 173#endif
174 void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); 174 void mapToDefaultAction( QWSKeyEvent *ke, int defKey );
175 void processQCopFile(); 175 void processQCopFile();
176 176
177#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 177#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
178 QCopChannel *sysChannel; 178 QCopChannel *sysChannel;
179 QCopChannel *pidChannel; 179 QCopChannel *pidChannel;
180#endif 180#endif
181 QPEApplicationData *d; 181 QPEApplicationData *d;
182 182
183 bool reserved_sh; 183 bool reserved_sh;
184 184
185 185
186 186
187}; 187};
188 188
189inline void QPEApplication::showDialog( QDialog* d, bool nomax ) 189inline void QPEApplication::showDialog( QDialog* d, bool nomax )
190{ 190{
191 QSize sh = d->sizeHint(); 191 QSize sh = d->sizeHint();
192 int w = QMAX(sh.width(),d->width()); 192 int w = QMAX(sh.width(),d->width());
193 int h = QMAX(sh.height(),d->height()); 193 int h = QMAX(sh.height(),d->height());
194 if ( !nomax 194 if ( !nomax
195 && ( w > qApp->desktop()->width()*3/4 195 && ( qApp->desktop()->width() <= 320 ) )
196 || h > qApp->desktop()->height()*3/4 ) )
197 { 196 {
198 d->showMaximized(); 197 d->showMaximized();
199 } else { 198 } else {
200 d->resize(w,h); 199 d->resize(w,h);
201 d->show(); 200 d->show();
202 } 201 }
203} 202}
204 203
205inline int QPEApplication::execDialog( QDialog* d, bool nomax ) 204inline int QPEApplication::execDialog( QDialog* d, bool nomax )
206{ 205{
207 showDialog(d,nomax); 206 showDialog(d,nomax);
208 return d->exec(); 207 return d->exec();
209} 208}
210 209
211inline void QPEApplication::showWidget( QWidget* wg, bool nomax ) 210inline void QPEApplication::showWidget( QWidget* wg, bool nomax )
212{ 211{
213 QSize sh = wg->sizeHint(); 212 QSize sh = wg->sizeHint();
214 int w = QMAX(sh.width(),wg->width()); 213 int w = QMAX(sh.width(),wg->width());
215 int h = QMAX(sh.height(),wg->height()); 214 int h = QMAX(sh.height(),wg->height());
216 if ( !nomax 215 if ( !nomax
217 && ( w > qApp->desktop()->width()*3/4 216 && ( qApp->desktop()->width() <= 320 ) )
218 || h > qApp->desktop()->height()*3/4 ) )
219 { 217 {
220 wg->showMaximized(); 218 wg->showMaximized();
221 } else { 219 } else {
222 wg->resize(w,h); 220 wg->resize(w,h);
223 wg->show(); 221 wg->show();
224 } 222 }
225} 223}
226 224
227enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ 225enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
228 226
229inline int TransToDeg ( Transformation t ) 227inline int TransToDeg ( Transformation t )
230{ 228{
231 int d = static_cast<int>( t ); 229 int d = static_cast<int>( t );
232 return d * 90; 230 return d * 90;
233} 231}
234 232
235inline Transformation DegToTrans ( int d ) 233inline Transformation DegToTrans ( int d )
236{ 234{
237 Transformation t = static_cast<Transformation>( d / 90 ); 235 Transformation t = static_cast<Transformation>( d / 90 );
238 return t; 236 return t;
239} 237}
240 238
241/* 239/*
242 * Set current rotation of Opie, and rotation for newly started apps. 240 * Set current rotation of Opie, and rotation for newly started apps.
243 * Differs from setDefaultRotation in that 1) it rotates currently running apps, 241 * Differs from setDefaultRotation in that 1) it rotates currently running apps,
244 * and 2) does not set deforient or save orientation to qpe.conf. 242 * and 2) does not set deforient or save orientation to qpe.conf.
245 */ 243 */
246 244
247inline void QPEApplication::setCurrentRotation( int r ) 245inline void QPEApplication::setCurrentRotation( int r )
248{ 246{
249 // setTransformation has been introduced in Qt/Embedded 2.3.4 snapshots 247 // setTransformation has been introduced in Qt/Embedded 2.3.4 snapshots
250 // for compatibility with the SharpROM use fallback to setDefaultTransformation() 248 // for compatibility with the SharpROM use fallback to setDefaultTransformation()