- 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
@@ -24,99 +24,96 @@ else
 endif
 ifeq ($(CONFIG_STATIC),y)
 	echo CONFIG += staticlib >> $@
 endif
 ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
 	echo CONFIG -= qt3 >> $@
 else
 	echo CONFIG += qt3 >> $@
 endif
 ifneq ($(CONFIG_QUICK_LAUNCH),)
 	echo contains\( CONFIG, quick-app \) \{ >> $@
 	echo CONFIG -= staticlib >> $@
 	echo CONFIG -= quick-app >> $@
 	echo CONFIG += quick-app-lib >> $@
 	echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
 	echo \} >> $@
 else
 	echo contains\( CONFIG, quick-app \) \{ >> $@
 	echo CONFIG -= quick-app >> $@
 	echo CONFIG += quick-app-bin >> $@
 	echo \} >> $@
 endif
 ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
 	echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
 else
 	echo ENABLE_SQL_PIM_BACKEND=n >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
 	echo CONFIG += no-override >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y)
 	echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
 	echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
 	echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
 endif
 ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
 	echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
 endif
 ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y)
 	echo DEFINES += USE_FILE_NOTIFICATION >> $@
 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)
 	echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
 endif
 	echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
 ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
 	echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
 endif
 # Write LIB dirs and INC dirs...
 ifeq ($(CONFIG_LIBETPAN_DEP),y)
 	echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@
 	echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBPCAP_DEP),y)
 	echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@
 	echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBSQLITE_DEP),y)
 	echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@
 	echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBXINE_DEP),y)
 	echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@
 	echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBIPK_DEP),y)
 	echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@
 	echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBSDK_DEP),y)
 	echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@
 	echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBSWORD_DEP),y)
 	echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@
 	echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@
 endif
 $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
 	@echo Generating dependency information...
 # add to subdir-y, and add descend rules
 	@cat $(TOPDIR)/packages | grep -v '^#' | \
 		awk '{print \
 			".PHONY : " $$2 "\n" \
 			"subdir-$$(" $$1 ") += " $$2 "\n\n"; \
 			print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
 	cat $(TOPDIR)/packages | grep -v '^#' | \
diff --git a/config.in b/config.in
index 60ebd65..9586a33 100644
--- a/config.in
+++ b/config.in
@@ -93,101 +93,96 @@ config OPTIMIZATIONS
   string "Optimization flags"
   depends OPTIMIZE
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD
   default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700
 
 config EXPERIMENTAL
   bool "Prompt for development and/or incomplete items"
   default y
 
 endmenu
 
 menu "Configuration"
 config OPIE_NO_OVERRIDE_QT
   boolean "Build Opie against an unpatched version of Qt"
   default n
 
 config OPIE_NO_ERASERECT_FIX
   boolean "Disable Fixup eraseRect for HancomMobileWord,neocal.. to make libopiecore work on Sharps libqpe"
   default n
 
 config OPIE_NO_BUILTIN_SHUTDOWN
   boolean "Disable the built in shutdown application"
   default y
 
 config OPIE_NO_BUILTIN_CALIBRATE
   boolean "Disable the built in calibrate application"
   default y if TARGET_YOPY
   default n if ! TARGET_YOPY
 
 config OPIE_SOUND_FRAGMENT_SHIFT
   string  "The sound fragment used in Opie Player I"
   default "14" if TARGET_IPAQ
   default "16" if ! TARGET_IPAQ
 
 config USE_REALTIME_AUDIO_THREAD
   boolean "Use a realtime thread in Opie Player I"
   default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP
   default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
 
 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
 
 config OPIE_NEW_ALLOC
   boolean "Use malloc and free for the implementation"
   default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
   default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
 
 config OPIE_NO_SOUND_PCM_READ_BITS
   boolean "There is not a pcm_read_bits io control"
   default y if TARGET_SHARP
   default n if ! TARGET_SHARP
 endmenu
 
 menu "Dependencies"
     source dependencies.in
 endmenu
 
 menu "Base"
   choice
     prompt "Qpe Library Selection"
     default LIBQPE
     source library/config.in
     source x11/config.in
   endchoice
   source libopie/config.in
 
   source libopie2/config.in
   source libqtaux/config.in
   source rsync/config.in
   source core/opie-login/config.in
   source core/opiealarm/config.in
   source core/tools/quicklauncher/config.in
   source core/launcher/config.in
   source core/symlinker/config.in
 endmenu
 
 comment ""
 
 menu "Applets"
   source core/applets/config.in
   source noncore/applets/config.in
 endmenu
 
 menu "Apps"
   source core/apps/config.in
   source noncore/apps/config.in
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 26e310a..4bc0c5f 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -51,185 +51,194 @@
 #include <qevent.h>
 #include <qtooltip.h>
 #include <qsignal.h>
 #include <qmainwindow.h>
 #include <qwidgetlist.h>
 #include <qpixmapcache.h>
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 #define QTOPIA_INTERNAL_INITAPP
 #include "qpeapplication.h"
 #include "qpestyle.h"
 #include "styleinterface.h"
 #if QT_VERSION >= 300
 #include <qstylefactory.h>
 #else
 #include <qplatinumstyle.h>
 #include <qwindowsstyle.h>
 #include <qmotifstyle.h>
 #include <qmotifplusstyle.h>
 #include "lightstyle.h"
 
 #include <qpe/qlibrary.h>
 #endif
 #include "global.h"
 #include "resource.h"
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include "qutfcodec.h"
 #endif
 #include "config.h"
 #include "network.h"
 #ifdef QWS
 #include "fontmanager.h"
 #endif
 
 #include "alarmserver.h"
 #include "applnk.h"
 #include "qpemenubar.h"
 #include "textcodecinterface.h"
 #include "imagecodecinterface.h"
 
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #ifndef QT_NO_SOUND
 #include <sys/soundcard.h>
 #endif
 #include "qt_override_p.h"
 
+static bool useBigPixmaps = 0;
+
 class HackWidget : public QWidget
 {
 public:
     bool needsOk()
     { return (getWState() & WState_Reserved1 ); }
 
     QRect normalGeometry()
     { return topData()->normalGeometry; };
 };
 
 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;
 
 	bool rightpressed : 1;
 	bool kbgrabbed    : 1;
 	bool notbusysent  : 1;
 	bool preloaded    : 1;
 	bool forceshow    : 1;
 	bool nomaximize   : 1;
 	bool keep_running : 1;
   bool qcopQok      : 1;
 
+    QCString fontFamily;
+    int fontSize;
+    int smallIconSize;
+    int bigIconSize;
 
   QStringList langs;
 	QString appName;
 	struct QCopRec
 	{
 		QCopRec( const QCString &ch, const QCString &msg,
 		         const QByteArray &d ) :
 				channel( ch ), message( msg ), data( d )
 		{ }
 
 		QCString channel;
 		QCString message;
 		QByteArray data;
 	};
 	QWidget* qpe_main_widget;
         QGuardedPtr<QWidget> lastraised;
 	QQueue<QCopRec> qcopq;
         QString styleName;
 	QString decorationName;
 
 	void enqueueQCop( const QCString &ch, const QCString &msg,
 	                  const QByteArray &data )
 	{
 		qcopq.enqueue( new QCopRec( ch, msg, data ) );
 	}
 	void sendQCopQ()
 	{
             if (!qcopQok )
                 return;
 
 		QCopRec * r;
 
            while((r=qcopq.dequeue())) {
                // remove from queue before sending...
                // event loop can come around again before getting
                // back from sendLocally
 #ifndef QT_NO_COP
                QCopChannel::sendLocally( r->channel, r->message, r->data );
 #endif
 
 	       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() ) {
 		if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
 		    mw->resize(s);
 		    mw->move(p);
 		}
 		mw->raise();
 	} else {
 
 	    if ( mw->layout() && mw->inherits("QDialog") ) {
 		if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
 		    mw->resize(s);
 		    mw->move(p);
 
 		    if ( max && !nomaximize ) {
 			mw->showMaximized();
 		    } else {
 			mw->show();
 				}
 		} else {
 			qpe_show_dialog((QDialog*)mw,nomaximize);
 		}
 	    } else {
 		if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
 		    mw->resize(s);
 		    mw->move(p);
 		} else {    //no stored rectangle, make an estimation
 		    int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2;
 		    int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2;
 		    mw->move( QMAX(x,0), QMAX(y,0) );
 #ifdef Q_WS_QWS
 		    if ( !nomaximize )
 			mw->showMaximized();
 #endif
 		}
 		if ( max && !nomaximize )
 		    mw->showMaximized();
 		else
 		    mw->show();
 	    }
 	}
 	}
 
 static void qpe_show_dialog( QDialog* d, bool nomax )
 {
     QSize sh = d->sizeHint();
@@ -751,113 +760,99 @@ void QPEApplication::processQCopFile()
 
 
 /*!
   \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data )
 
   This signal is emitted when a message is received on this
   application's QPE/Application/<i>appname</i> \link qcop.html
   QCop\endlink channel.
 
   The slot to which you connect this signal uses \a msg and \a data
   in the following way:
 
 \code
      void MyWidget::receive( const QCString& msg, const QByteArray& data )
      {
        QDataStream stream( data, IO_ReadOnly );
        if ( msg == "someMessage(int,int,int)" ) {
             int a,b,c;
             stream >> a >> b >> c;
             ...
        } else if ( msg == "otherMessage(QString)" ) {
            ...
        }
     }
 \endcode
 
   \sa qcop.html
   Note that messages received here may be processed by qpe application
   and emitted as signals, such as flush() and reload().
 */
 
 /*!
   Constructs a QPEApplication just as you would construct
   a QApplication, passing \a argc, \a argv, and \a t.
 
   For applications, \a t should be the default, GuiClient. Only
   the Qtopia server passes GuiServer.
 */
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 		: QApplication( hack(argc), argv, t ), pidChannel( 0 )
 {
         QPixmapCache::setCacheLimit(256); // sensible default for smaller devices.
 
 	d = new QPEApplicationData;
 	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() ) );
 
 
 	sysChannel = new QCopChannel( "QPE/System", this );
 	connect( sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
 	         this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
 
 /* COde now in initapp */
 #if 0
 #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 );
 	}
 
 
 
 	QCString channel = QCString( argv[ 0 ] );
 	channel.replace( QRegExp( ".*/" ), "" );
 	d->appName = channel;
 	channel = "QPE/Application/" + channel;
 	pidChannel = new QCopChannel( channel, this );
 	connect( pidChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
 	         this, SLOT( pidMessage(const QCString&,const QByteArray&) ) );
 
 	if ( f.isOpen() ) {
 		d->keep_running = FALSE;
 		QDataStream ds( &f );
 		QCString channel, message;
 		QByteArray data;
 		while ( !ds.atEnd() ) {
 			ds >> channel >> message >> data;
 			d->enqueueQCop( channel, message, data );
 		}
 
 		flock( f.handle(), LOCK_UN );
 		f.close();
 		f.remove();
 	}
 
 	for ( int a = 0; a < argc; a++ ) {