From 0374e0e52e9b754ae48ada631cad2b397feabb21 Mon Sep 17 00:00:00 2001 From: harlekin Date: Sat, 19 Apr 2003 22:19:11 +0000 Subject: big toolbar icons for screenwidths > 600 --- diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 2ef60d5..7f8299a 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -50,6 +50,7 @@ #include #include #include +#include #include "qpeapplication.h" #include "qpestyle.h" #include "styleinterface.h" @@ -146,6 +147,12 @@ public: } static void show_mx(QWidget* mw, bool nomaximize) { + + // ugly hack, remove that later after finding a sane solution + if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { + ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); + } + if ( mw->layout() && mw->inherits("QDialog") ) { QPEApplication::showDialog((QDialog*)mw, nomaximize); } @@ -508,7 +515,7 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) d = new QPEApplicationData; d->loadTextCodecs(); d->loadImageCodecs(); - int dw = desktop() ->width(); + int dw = desktop() ->width(); if ( dw < 200 ) { setFont( QFont( "helvetica", 8 ) ); @@ -516,8 +523,8 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) AppLnk::setBigIconSize( 28 ); } else if ( dw > 600 ) { - setFont( QFont( "helvetica", 18 ) ); - AppLnk::setSmallIconSize( 24 ); + setFont( QFont( "helvetica", 18 ) ); + AppLnk::setSmallIconSize( 24 ); AppLnk::setBigIconSize( 48 ); } else if ( dw > 200 ) { @@ -863,6 +870,8 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e ) Global::showInputMethod(); } } + + return QApplication::qwsEventFilter( e ); } #endif @@ -1317,7 +1326,7 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data) */ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize ) { - d->show(mw, nomaximize ); + d->show(mw, nomaximize ); } /*! @@ -1336,6 +1345,7 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize ) if ( mw && argc() == 2 ) Global::setDocument( mw, QString::fromUtf8(argv()[1]) ); + d->show(mw, nomaximize ); } -- cgit v0.9.0.2