summaryrefslogtreecommitdiff
path: root/library
Side-by-side diff
Diffstat (limited to 'library') (more/less context) (show whitespace changes)
-rw-r--r--library/qpeapplication.cpp55
1 files changed, 25 insertions, 30 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 26e310a..4bc0c5f 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -96,6 +96,8 @@
#endif
#include "qt_override_p.h"
+static bool useBigPixmaps = 0;
+
class HackWidget : public QWidget
{
public:
@@ -112,9 +114,18 @@ public:
QPEApplicationData ( )
: presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ),
notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ),
- keep_running( true ), qcopQok( false ), qpe_main_widget( 0 )
-
- {}
+ keep_running( true ), qcopQok( false ),
+ fontFamily( "Vera" ), fontSize( 10 ), smallIconSize( 14 ),
+ bigIconSize( 32 ), qpe_main_widget( 0 )
+ {
+ Config cfg( "qpe" );
+ cfg.setGroup( "Appearance" );
+ useBigPixmaps = cfg.readBoolEntry( "useBigPixmaps", false );
+ fontFamily = cfg.readEntry( "FontFamily", "Vera" );
+ fontSize = cfg.readNumEntry( "FontSize", 10 );
+ smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 );
+ bigIconSize = cfg.readNumEntry( "BigIconSize", 32 );
+ }
int presstimer;
QWidget* presswidget;
@@ -129,6 +140,10 @@ public:
bool keep_running : 1;
bool qcopQok : 1;
+ QCString fontFamily;
+ int fontSize;
+ int smallIconSize;
+ int bigIconSize;
QStringList langs;
QString appName;
@@ -173,18 +188,12 @@ public:
}
}
- static void show_mx(QWidget* mw, bool nomaximize, QString &strName/* = QString::null */)
+ static void show_mx(QWidget* mw, bool nomaximize, QString &strName)
+ {
+ if ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") )
{
- // 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_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has
- // a (physically) large enough display to use the small icons
-#if defined(OPIE_HIGH_RES_SMALL_PHY)
- if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) {
- ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true );
+ ( ( QMainWindow* ) mw )->setUsesBigPixmaps( useBigPixmaps );
}
-#endif
-
QPoint p;
QSize s;
bool max;
@@ -796,23 +805,9 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
d->loadImageCodecs();
int dw = desktop() ->width();
- if ( dw < 200 ) {
- setFont( QFont( "vera", 8 ) );
- AppLnk::setSmallIconSize( 10 );
- AppLnk::setBigIconSize( 28 );
- }
-#if defined(OPIE_HIGH_RES_SMALL_PHY)
- 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 );
- }
+ setFont( QFont( d->fontFamily, d->fontSize ) );
+ AppLnk::setSmallIconSize( d->smallIconSize );
+ AppLnk::setBigIconSize( d->bigIconSize );
QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );