summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-05-22 13:41:36 (UTC)
committer mickeyl <mickeyl>2003-05-22 13:41:36 (UTC)
commitac74e73175ef4fecbcb77cd23b792983ca6ea06b (patch) (side-by-side diff)
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
@@ -140,27 +140,32 @@ public:
#ifndef QT_NO_COP
for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it )
QCopChannel::sendLocally( r->channel, r->message, r->data );
#endif
qcopq.clear();
}
static void show_mx(QWidget* mw, bool nomaximize)
{
// ugly hack, remove that later after finding a sane solution
+ // Addendum: Only Sharp currently has models with high resolution but (physically) small displays,
+ // so this is only useful if QT_QWS_SHARP is defined. E.g. SIMpad has 800x600 but has
+ // a (physically) large enough display to use the small icons
+ #ifdef QT_QWS_SHARP
if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) {
( ( QMainWindow* ) mw )->setUsesBigPixmaps( true );
}
+ #endif
if ( mw->layout() && mw->inherits("QDialog") ) {
QPEApplication::showDialog((QDialog*)mw, nomaximize);
}
else {
#ifdef Q_WS_QWS
if ( !nomaximize )
mw->showMaximized();
else
#endif
mw->show();
@@ -513,36 +518,37 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
: QApplication( argc, argv, t )
{
d = new QPEApplicationData;
d->loadTextCodecs();
d->loadImageCodecs();
int dw = desktop() ->width();
if ( dw < 200 ) {
setFont( QFont( "vera", 8 ) );
AppLnk::setSmallIconSize( 10 );
AppLnk::setBigIconSize( 28 );
}
+ #ifdef QT_QWS_SHARP
else if ( dw > 600 ) {
setFont( QFont( "vera", 16 ) );
AppLnk::setSmallIconSize( 24 );
AppLnk::setBigIconSize( 48 );
}
+ #endif
else if ( dw > 200 ) {
setFont( QFont( "vera", 10 ) );
AppLnk::setSmallIconSize( 14 );
AppLnk::setBigIconSize( 32 );
}
-
QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
QString qcopfn( "/tmp/qcop-msg-" );
qcopfn += QString( argv[ 0 ] ); // append command name
QFile f( qcopfn );
if ( f.open( IO_ReadOnly ) ) {
flock( f.handle(), LOCK_EX );
}