3 files changed, 25 insertions, 38 deletions

diff --git a/Rules.make b/Rules.make
index 779f4b1..8511422 100644
--- a/Rules.make
+++ b/Rules.make
@@ -71,5 +71,2 @@ ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
 endif
-ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y)
-        echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@
-endif
 ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
diff --git a/config.in b/config.in
index 60ebd65..9586a33 100644
--- a/config.in
+++ b/config.in
@@ -140,7 +140,2 @@ config QT_QWS_ALLOW_OVERCLOCK
 
-config OPIE_HIGH_RES_SMALL_PHY
-  boolean "Resolution is bigger than physical screen"
-  default y if TARGET_C700
-  default n if ! TARGET_C700
-
 config USE_FILE_NOTIFICATION
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 26e310a..4bc0c5f 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -98,2 +98,4 @@
 
+static bool useBigPixmaps = 0;
+
 class HackWidget : public QWidget
@@ -114,5 +116,14 @@ public:
                   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 );
+    }
 
@@ -131,2 +142,6 @@ public:
 
+    QCString fontFamily;
+    int fontSize;
+    int smallIconSize;
+    int bigIconSize;
 
@@ -175,14 +190,8 @@ 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;
@@ -798,19 +807,5 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 
-        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 );