-rw-r--r-- | library/qpeapplication.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 4bc08b3..619b4cb 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -141,27 +141,27 @@ public: | |||
141 | 141 | ||
142 | for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it ) | 142 | for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it ) |
143 | QCopChannel::sendLocally( r->channel, r->message, r->data ); | 143 | QCopChannel::sendLocally( r->channel, r->message, r->data ); |
144 | #endif | 144 | #endif |
145 | 145 | ||
146 | qcopq.clear(); | 146 | qcopq.clear(); |
147 | } | 147 | } |
148 | static void show_mx(QWidget* mw, bool nomaximize) | 148 | static void show_mx(QWidget* mw, bool nomaximize) |
149 | { | 149 | { |
150 | 150 | ||
151 | // ugly hack, remove that later after finding a sane solution | 151 | // ugly hack, remove that later after finding a sane solution |
152 | // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, | 152 | // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, |
153 | // so this is only useful if QT_QWS_SHARP is defined. E.g. SIMpad has 800x600 but has | 153 | // so this is only useful if QT_QWS_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has |
154 | // a (physically) large enough display to use the small icons | 154 | // a (physically) large enough display to use the small icons |
155 | #ifdef QT_QWS_SHARP | 155 | #ifndef QT_QWS_SIMPAD |
156 | if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { | 156 | if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { |
157 | ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); | 157 | ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); |
158 | } | 158 | } |
159 | #endif | 159 | #endif |
160 | 160 | ||
161 | if ( mw->layout() && mw->inherits("QDialog") ) { | 161 | if ( mw->layout() && mw->inherits("QDialog") ) { |
162 | QPEApplication::showDialog((QDialog*)mw, nomaximize); | 162 | QPEApplication::showDialog((QDialog*)mw, nomaximize); |
163 | } | 163 | } |
164 | else { | 164 | else { |
165 | #ifdef Q_WS_QWS | 165 | #ifdef Q_WS_QWS |
166 | if ( !nomaximize ) | 166 | if ( !nomaximize ) |
167 | mw->showMaximized(); | 167 | mw->showMaximized(); |
@@ -518,25 +518,25 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | |||
518 | : QApplication( argc, argv, t ) | 518 | : QApplication( argc, argv, t ) |
519 | { | 519 | { |
520 | d = new QPEApplicationData; | 520 | d = new QPEApplicationData; |
521 | d->loadTextCodecs(); | 521 | d->loadTextCodecs(); |
522 | d->loadImageCodecs(); | 522 | d->loadImageCodecs(); |
523 | int dw = desktop() ->width(); | 523 | int dw = desktop() ->width(); |
524 | 524 | ||
525 | if ( dw < 200 ) { | 525 | if ( dw < 200 ) { |
526 | setFont( QFont( "vera", 8 ) ); | 526 | setFont( QFont( "vera", 8 ) ); |
527 | AppLnk::setSmallIconSize( 10 ); | 527 | AppLnk::setSmallIconSize( 10 ); |
528 | AppLnk::setBigIconSize( 28 ); | 528 | AppLnk::setBigIconSize( 28 ); |
529 | } | 529 | } |
530 | #ifdef QT_QWS_SHARP | 530 | #ifndef QT_QWS_SIMPAD |
531 | else if ( dw > 600 ) { | 531 | else if ( dw > 600 ) { |
532 | setFont( QFont( "vera", 16 ) ); | 532 | setFont( QFont( "vera", 16 ) ); |
533 | AppLnk::setSmallIconSize( 24 ); | 533 | AppLnk::setSmallIconSize( 24 ); |
534 | AppLnk::setBigIconSize( 48 ); | 534 | AppLnk::setBigIconSize( 48 ); |
535 | } | 535 | } |
536 | #endif | 536 | #endif |
537 | else if ( dw > 200 ) { | 537 | else if ( dw > 200 ) { |
538 | setFont( QFont( "vera", 10 ) ); | 538 | setFont( QFont( "vera", 10 ) ); |
539 | AppLnk::setSmallIconSize( 14 ); | 539 | AppLnk::setSmallIconSize( 14 ); |
540 | AppLnk::setBigIconSize( 32 ); | 540 | AppLnk::setBigIconSize( 32 ); |
541 | } | 541 | } |
542 | 542 | ||