-rw-r--r-- | library/qpeapplication.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 2ef60d5..7f8299a 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -49,8 +49,9 @@ | |||
49 | #include <qtextcodec.h> | 49 | #include <qtextcodec.h> |
50 | #include <qevent.h> | 50 | #include <qevent.h> |
51 | #include <qtooltip.h> | 51 | #include <qtooltip.h> |
52 | #include <qsignal.h> | 52 | #include <qsignal.h> |
53 | #include <qmainwindow.h> | ||
53 | #include "qpeapplication.h" | 54 | #include "qpeapplication.h" |
54 | #include "qpestyle.h" | 55 | #include "qpestyle.h" |
55 | #include "styleinterface.h" | 56 | #include "styleinterface.h" |
56 | #if QT_VERSION >= 300 | 57 | #if QT_VERSION >= 300 |
@@ -145,8 +146,14 @@ public: | |||
145 | qcopq.clear(); | 146 | qcopq.clear(); |
146 | } | 147 | } |
147 | static void show_mx(QWidget* mw, bool nomaximize) | 148 | static void show_mx(QWidget* mw, bool nomaximize) |
148 | { | 149 | { |
150 | |||
151 | // ugly hack, remove that later after finding a sane solution | ||
152 | if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { | ||
153 | ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); | ||
154 | } | ||
155 | |||
149 | if ( mw->layout() && mw->inherits("QDialog") ) { | 156 | if ( mw->layout() && mw->inherits("QDialog") ) { |
150 | QPEApplication::showDialog((QDialog*)mw, nomaximize); | 157 | QPEApplication::showDialog((QDialog*)mw, nomaximize); |
151 | } | 158 | } |
152 | else { | 159 | else { |
@@ -507,18 +514,18 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | |||
507 | { | 514 | { |
508 | d = new QPEApplicationData; | 515 | d = new QPEApplicationData; |
509 | d->loadTextCodecs(); | 516 | d->loadTextCodecs(); |
510 | d->loadImageCodecs(); | 517 | d->loadImageCodecs(); |
511 | int dw = desktop() ->width(); | 518 | int dw = desktop() ->width(); |
512 | 519 | ||
513 | if ( dw < 200 ) { | 520 | if ( dw < 200 ) { |
514 | setFont( QFont( "helvetica", 8 ) ); | 521 | setFont( QFont( "helvetica", 8 ) ); |
515 | AppLnk::setSmallIconSize( 10 ); | 522 | AppLnk::setSmallIconSize( 10 ); |
516 | AppLnk::setBigIconSize( 28 ); | 523 | AppLnk::setBigIconSize( 28 ); |
517 | } | 524 | } |
518 | else if ( dw > 600 ) { | 525 | else if ( dw > 600 ) { |
519 | setFont( QFont( "helvetica", 18 ) ); | 526 | setFont( QFont( "helvetica", 18 ) ); |
520 | AppLnk::setSmallIconSize( 24 ); | 527 | AppLnk::setSmallIconSize( 24 ); |
521 | AppLnk::setBigIconSize( 48 ); | 528 | AppLnk::setBigIconSize( 48 ); |
522 | } | 529 | } |
523 | else if ( dw > 200 ) { | 530 | else if ( dw > 200 ) { |
524 | setFont( QFont( "helvetica", 10 ) ); | 531 | setFont( QFont( "helvetica", 10 ) ); |
@@ -862,8 +869,10 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e ) | |||
862 | if ( m == AlwaysOn ) | 869 | if ( m == AlwaysOn ) |
863 | Global::showInputMethod(); | 870 | Global::showInputMethod(); |
864 | } | 871 | } |
865 | } | 872 | } |
873 | |||
874 | |||
866 | return QApplication::qwsEventFilter( e ); | 875 | return QApplication::qwsEventFilter( e ); |
867 | } | 876 | } |
868 | #endif | 877 | #endif |
869 | 878 | ||
@@ -1316,9 +1325,9 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data) | |||
1316 | \sa showMainDocumentWidget() | 1325 | \sa showMainDocumentWidget() |
1317 | */ | 1326 | */ |
1318 | void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize ) | 1327 | void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize ) |
1319 | { | 1328 | { |
1320 | d->show(mw, nomaximize ); | 1329 | d->show(mw, nomaximize ); |
1321 | } | 1330 | } |
1322 | 1331 | ||
1323 | /*! | 1332 | /*! |
1324 | Sets widget \a mw as the mainWidget() and shows it. For small windows, | 1333 | Sets widget \a mw as the mainWidget() and shows it. For small windows, |
@@ -1335,8 +1344,9 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize ) | |||
1335 | { | 1344 | { |
1336 | if ( mw && argc() == 2 ) | 1345 | if ( mw && argc() == 2 ) |
1337 | Global::setDocument( mw, QString::fromUtf8(argv()[1]) ); | 1346 | Global::setDocument( mw, QString::fromUtf8(argv()[1]) ); |
1338 | 1347 | ||
1348 | |||
1339 | d->show(mw, nomaximize ); | 1349 | d->show(mw, nomaximize ); |
1340 | } | 1350 | } |
1341 | 1351 | ||
1342 | 1352 | ||