summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/qpeapplication.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 3ef8b46..a884046 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -119,12 +119,13 @@ public:
119 static InputMethodHint inputMethodHint( QWidget * ); 119 static InputMethodHint inputMethodHint( QWidget * );
120 120
121 void showMainWidget( QWidget*, bool nomax=FALSE ); 121 void showMainWidget( QWidget*, bool nomax=FALSE );
122 void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); 122 void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
123 static void showDialog( QDialog*, bool nomax=FALSE ); 123 static void showDialog( QDialog*, bool nomax=FALSE );
124 static int execDialog( QDialog*, bool nomax=FALSE ); 124 static int execDialog( QDialog*, bool nomax=FALSE );
125 static int showWidget( QWidget*, bool nomax=FALSE );
125 /* Merge setTempScreenSaverMode */ 126 /* Merge setTempScreenSaverMode */
126#ifdef QTOPIA_INTERNAL_INITAPP 127#ifdef QTOPIA_INTERNAL_INITAPP
127 void initApp( int argv, char **argv ); 128 void initApp( int argv, char **argv );
128#endif 129#endif
129 130
130 static void setKeepRunning(); 131 static void setKeepRunning();
@@ -204,12 +205,28 @@ inline void QPEApplication::showDialog( QDialog* d, bool nomax )
204inline int QPEApplication::execDialog( QDialog* d, bool nomax ) 205inline int QPEApplication::execDialog( QDialog* d, bool nomax )
205{ 206{
206 showDialog(d,nomax); 207 showDialog(d,nomax);
207 return d->exec(); 208 return d->exec();
208} 209}
209 210
211inline int QPEApplication::showWidget( QWidget* wg, bool nomax )
212{
213 QSize sh = wg->sizeHint();
214 int w = QMAX(sh.width(),wg->width());
215 int h = QMAX(sh.height(),wg->height());
216 if ( !nomax
217 && ( w > qApp->desktop()->width()*3/4
218 || h > qApp->desktop()->height()*3/4 ) )
219 {
220 wg->showMaximized();
221 } else {
222 wg->resize(w,h);
223 wg->show();
224 }
225}
226
210enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ 227enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
211 228
212inline int TransToDeg ( Transformation t ) 229inline int TransToDeg ( Transformation t )
213{ 230{
214 int d = static_cast<int>( t ); 231 int d = static_cast<int>( t );
215 return d * 90; 232 return d * 90;