| -rw-r--r-- | library/opie-common.control | 4 | ||||
| -rw-r--r-- | library/qpeapplication.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/library/opie-common.control b/library/opie-common.control index 52048a3..1cdd465 100644 --- a/library/opie-common.control +++ b/library/opie-common.control @@ -1,10 +1,10 @@ Package: opie-common Files: etc/colors bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/* Priority: required Section: opie/system Maintainer: Project Opie <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION.2 -Depends: libqpe1, qte-fonts, qpf-helvetica +Version: $QPE_VERSION-$SUB_VERSION.3 +Depends: libqpe1, qte-fonts, qpf-bitstream-vera Replaces: opie-base Description: Core opie files diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 7f8299a..f4bfda9 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -505,43 +505,43 @@ static void setTreble( int t = 0, int percent = -1 ) /*! 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( argc, argv, t ) { d = new QPEApplicationData; d->loadTextCodecs(); d->loadImageCodecs(); int dw = desktop() ->width(); if ( dw < 200 ) { - setFont( QFont( "helvetica", 8 ) ); + setFont( QFont( "vera", 8 ) ); AppLnk::setSmallIconSize( 10 ); AppLnk::setBigIconSize( 28 ); } else if ( dw > 600 ) { - setFont( QFont( "helvetica", 18 ) ); + setFont( QFont( "vera", 18 ) ); AppLnk::setSmallIconSize( 24 ); AppLnk::setBigIconSize( 48 ); } else if ( dw > 200 ) { - setFont( QFont( "helvetica", 10 ) ); + setFont( QFont( "vera", 10 ) ); AppLnk::setSmallIconSize( 14 ); AppLnk::setBigIconSize( 32 ); } QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory ); connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) ); #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 ); @@ -1023,33 +1023,33 @@ void QPEApplication::applyStyle() if ( nostyle & Opie::Force_Decoration ) dec = ""; //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle); if ( dec != d->decorationName ) { qwsSetDecoration( new QPEDecoration( dec ) ); d->decorationName = dec; } // Font QString ff = config.readEntry( "FontFamily", font().family() ); int fs = config.readNumEntry( "FontSize", font().pointSize() ); // don't set a custom font if ( nostyle & Opie::Force_Font ) { - ff = "Helvetica"; + ff = "Vera"; fs = 10; } setFont ( QFont ( ff, fs ), true ); // revert to global blocking policy ... Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; Opie::force_appearance &= ~nostyle; } void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) { #ifdef Q_WS_QWS QDataStream stream( data, IO_ReadOnly ); if ( msg == "applyStyle()" ) { applyStyle(); |