- get rid of HIGH_RES_LOW_PHYS to allow shipping one libqpe for all devices

- honor FontFamily and FontSize as set in qpe/Appearance
- NOTE to packagers: Remember to ship appropriate qpe.conf files for the different devices!

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
@@ -68,11 +68,8 @@ ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y)
 endif
 ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
 	echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
 endif
-ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y)
-	echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@
-endif
 ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
 	echo DEFINES += OPIE_NEW_MALLOC >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
diff --git a/config.in b/config.in
index 60ebd65..9586a33 100644
--- a/config.in
+++ b/config.in
@@ -137,13 +137,8 @@ config QT_QWS_ALLOW_OVERCLOCK
   boolean "Allow the user to overclock the device"
   depends TARGET_RAMSES
   default n
 
-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
   boolean "Substitute (some) polling interfaces with OFileNotifier"
   default y
 
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 26e310a..4bc0c5f 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -95,8 +95,10 @@
 #include <sys/soundcard.h>
 #endif
 #include "qt_override_p.h"
 
+static bool useBigPixmaps = 0;
+
 class HackWidget : public QWidget
 {
 public:
     bool needsOk()
@@ -111,11 +113,20 @@ class QPEApplicationData
 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;
 	QPoint presspos;
@@ -128,8 +139,12 @@ public:
 	bool nomaximize   : 1;
 	bool keep_running : 1;
   bool qcopQok      : 1;
 
+    QCString fontFamily;
+    int fontSize;
+    int smallIconSize;
+    int bigIconSize;
 
   QStringList langs;
 	QString appName;
 	struct QCopRec
@@ -172,20 +187,14 @@ public:
 	       delete r;
            }
 	}
 
-	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;
 	if ( mw->isVisible() ) {
@@ -795,25 +804,11 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 	d->loadTextCodecs();
 	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 );
 
 	connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );