summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-05-22 13:41:36 (UTC)
committer mickeyl <mickeyl>2003-05-22 13:41:36 (UTC)
commitac74e73175ef4fecbcb77cd23b792983ca6ea06b (patch) (unidiff)
treeca2ec6c86b8a566a39308c63dcf44b1b2e9f85f6
parent6041221c6d2892c6e7a61570c524fd090f447739 (diff)
downloadopie-ac74e73175ef4fecbcb77cd23b792983ca6ea06b.zip
opie-ac74e73175ef4fecbcb77cd23b792983ca6ea06b.tar.gz
opie-ac74e73175ef4fecbcb77cd23b792983ca6ea06b.tar.bz2
guard ugly c700-only hacks with #ifdef QT_QWS_SHARP
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 19adb00..22d222a 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -149,9 +149,14 @@ public:
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,
153 // so this is only useful if QT_QWS_SHARP is defined. E.g. SIMpad has 800x600 but has
154 // a (physically) large enough display to use the small icons
155 #ifdef QT_QWS_SHARP
152 if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { 156 if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) {
153 ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); 157 ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true );
154 } 158 }
159 #endif
155 160
156 if ( mw->layout() && mw->inherits("QDialog") ) { 161 if ( mw->layout() && mw->inherits("QDialog") ) {
157 QPEApplication::showDialog((QDialog*)mw, nomaximize); 162 QPEApplication::showDialog((QDialog*)mw, nomaximize);
@@ -522,18 +527,19 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
522 AppLnk::setSmallIconSize( 10 ); 527 AppLnk::setSmallIconSize( 10 );
523 AppLnk::setBigIconSize( 28 ); 528 AppLnk::setBigIconSize( 28 );
524 } 529 }
530 #ifdef QT_QWS_SHARP
525 else if ( dw > 600 ) { 531 else if ( dw > 600 ) {
526 setFont( QFont( "vera", 16 ) ); 532 setFont( QFont( "vera", 16 ) );
527 AppLnk::setSmallIconSize( 24 ); 533 AppLnk::setSmallIconSize( 24 );
528 AppLnk::setBigIconSize( 48 ); 534 AppLnk::setBigIconSize( 48 );
529 } 535 }
536 #endif
530 else if ( dw > 200 ) { 537 else if ( dw > 200 ) {
531 setFont( QFont( "vera", 10 ) ); 538 setFont( QFont( "vera", 10 ) );
532 AppLnk::setSmallIconSize( 14 ); 539 AppLnk::setSmallIconSize( 14 );
533 AppLnk::setBigIconSize( 32 ); 540 AppLnk::setBigIconSize( 32 );
534 } 541 }
535 542
536
537 QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory ); 543 QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
538 544
539 connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) ); 545 connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );