author | kergoth <kergoth> | 2003-04-23 19:08:19 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-23 19:08:19 (UTC) |
commit | f99c8e576030a7e8e83aa850b09ec69cc6217bb1 (patch) (unidiff) | |
tree | c2b4f3cf2c5858bc14c5a72be71f1b4b4e276aad /library/qpeapplication.cpp | |
parent | 3d0eacfe335f073b2ece67d762e8d182a6329303 (diff) | |
download | opie-f99c8e576030a7e8e83aa850b09ec69cc6217bb1.zip opie-f99c8e576030a7e8e83aa850b09ec69cc6217bb1.tar.gz opie-f99c8e576030a7e8e83aa850b09ec69cc6217bb1.tar.bz2 |
Change the default font to Bitstream Vera rather than Helvetica. See http://openzaurus.org/mirror/ for the qpfs in tar.gz and ipk format.
-rw-r--r-- | library/qpeapplication.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 7f8299a..f4bfda9 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -497,59 +497,59 @@ static void setTreble( int t = 0, int percent = -1 ) | |||
497 | } | 497 | } |
498 | \endcode | 498 | \endcode |
499 | 499 | ||
500 | \sa qcop.html | 500 | \sa qcop.html |
501 | Note that messages received here may be processed by qpe application | 501 | Note that messages received here may be processed by qpe application |
502 | and emitted as signals, such as flush() and reload(). | 502 | and emitted as signals, such as flush() and reload(). |
503 | */ | 503 | */ |
504 | 504 | ||
505 | /*! | 505 | /*! |
506 | Constructs a QPEApplication just as you would construct | 506 | Constructs a QPEApplication just as you would construct |
507 | a QApplication, passing \a argc, \a argv, and \a t. | 507 | a QApplication, passing \a argc, \a argv, and \a t. |
508 | 508 | ||
509 | For applications, \a t should be the default, GuiClient. Only | 509 | For applications, \a t should be the default, GuiClient. Only |
510 | the Qtopia server passes GuiServer. | 510 | the Qtopia server passes GuiServer. |
511 | */ | 511 | */ |
512 | QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | 512 | QPEApplication::QPEApplication( int & argc, char **argv, Type t ) |
513 | : QApplication( argc, argv, t ) | 513 | : QApplication( argc, argv, t ) |
514 | { | 514 | { |
515 | d = new QPEApplicationData; | 515 | d = new QPEApplicationData; |
516 | d->loadTextCodecs(); | 516 | d->loadTextCodecs(); |
517 | d->loadImageCodecs(); | 517 | d->loadImageCodecs(); |
518 | int dw = desktop() ->width(); | 518 | int dw = desktop() ->width(); |
519 | 519 | ||
520 | if ( dw < 200 ) { | 520 | if ( dw < 200 ) { |
521 | setFont( QFont( "helvetica", 8 ) ); | 521 | setFont( QFont( "vera", 8 ) ); |
522 | AppLnk::setSmallIconSize( 10 ); | 522 | AppLnk::setSmallIconSize( 10 ); |
523 | AppLnk::setBigIconSize( 28 ); | 523 | AppLnk::setBigIconSize( 28 ); |
524 | } | 524 | } |
525 | else if ( dw > 600 ) { | 525 | else if ( dw > 600 ) { |
526 | setFont( QFont( "helvetica", 18 ) ); | 526 | setFont( QFont( "vera", 18 ) ); |
527 | AppLnk::setSmallIconSize( 24 ); | 527 | AppLnk::setSmallIconSize( 24 ); |
528 | AppLnk::setBigIconSize( 48 ); | 528 | AppLnk::setBigIconSize( 48 ); |
529 | } | 529 | } |
530 | else if ( dw > 200 ) { | 530 | else if ( dw > 200 ) { |
531 | setFont( QFont( "helvetica", 10 ) ); | 531 | setFont( QFont( "vera", 10 ) ); |
532 | AppLnk::setSmallIconSize( 14 ); | 532 | AppLnk::setSmallIconSize( 14 ); |
533 | AppLnk::setBigIconSize( 32 ); | 533 | AppLnk::setBigIconSize( 32 ); |
534 | } | 534 | } |
535 | 535 | ||
536 | 536 | ||
537 | QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory ); | 537 | QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory ); |
538 | 538 | ||
539 | connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) ); | 539 | connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) ); |
540 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 540 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
541 | 541 | ||
542 | QString qcopfn( "/tmp/qcop-msg-" ); | 542 | QString qcopfn( "/tmp/qcop-msg-" ); |
543 | qcopfn += QString( argv[ 0 ] ); // append command name | 543 | qcopfn += QString( argv[ 0 ] ); // append command name |
544 | 544 | ||
545 | QFile f( qcopfn ); | 545 | QFile f( qcopfn ); |
546 | if ( f.open( IO_ReadOnly ) ) { | 546 | if ( f.open( IO_ReadOnly ) ) { |
547 | flock( f.handle(), LOCK_EX ); | 547 | flock( f.handle(), LOCK_EX ); |
548 | } | 548 | } |
549 | 549 | ||
550 | sysChannel = new QCopChannel( "QPE/System", this ); | 550 | sysChannel = new QCopChannel( "QPE/System", this ); |
551 | connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ), | 551 | connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ), |
552 | this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) ); | 552 | this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) ); |
553 | 553 | ||
554 | QCString channel = QCString( argv[ 0 ] ); | 554 | QCString channel = QCString( argv[ 0 ] ); |
555 | channel.replace( QRegExp( ".*/" ), "" ); | 555 | channel.replace( QRegExp( ".*/" ), "" ); |
@@ -1015,49 +1015,49 @@ void QPEApplication::applyStyle() | |||
1015 | pal.color( QPalette::Active, QColorGroup::Background ).dark() ); | 1015 | pal.color( QPalette::Active, QColorGroup::Background ).dark() ); |
1016 | 1016 | ||
1017 | setPalette( pal, TRUE ); | 1017 | setPalette( pal, TRUE ); |
1018 | 1018 | ||
1019 | // Window Decoration | 1019 | // Window Decoration |
1020 | QString dec = config.readEntry( "Decoration", "Qtopia" ); | 1020 | QString dec = config.readEntry( "Decoration", "Qtopia" ); |
1021 | 1021 | ||
1022 | // don't set a custom deco | 1022 | // don't set a custom deco |
1023 | if ( nostyle & Opie::Force_Decoration ) | 1023 | if ( nostyle & Opie::Force_Decoration ) |
1024 | dec = ""; | 1024 | dec = ""; |
1025 | 1025 | ||
1026 | //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle); | 1026 | //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle); |
1027 | 1027 | ||
1028 | if ( dec != d->decorationName ) { | 1028 | if ( dec != d->decorationName ) { |
1029 | qwsSetDecoration( new QPEDecoration( dec ) ); | 1029 | qwsSetDecoration( new QPEDecoration( dec ) ); |
1030 | d->decorationName = dec; | 1030 | d->decorationName = dec; |
1031 | } | 1031 | } |
1032 | 1032 | ||
1033 | // Font | 1033 | // Font |
1034 | QString ff = config.readEntry( "FontFamily", font().family() ); | 1034 | QString ff = config.readEntry( "FontFamily", font().family() ); |
1035 | int fs = config.readNumEntry( "FontSize", font().pointSize() ); | 1035 | int fs = config.readNumEntry( "FontSize", font().pointSize() ); |
1036 | 1036 | ||
1037 | // don't set a custom font | 1037 | // don't set a custom font |
1038 | if ( nostyle & Opie::Force_Font ) { | 1038 | if ( nostyle & Opie::Force_Font ) { |
1039 | ff = "Helvetica"; | 1039 | ff = "Vera"; |
1040 | fs = 10; | 1040 | fs = 10; |
1041 | } | 1041 | } |
1042 | 1042 | ||
1043 | setFont ( QFont ( ff, fs ), true ); | 1043 | setFont ( QFont ( ff, fs ), true ); |
1044 | 1044 | ||
1045 | // revert to global blocking policy ... | 1045 | // revert to global blocking policy ... |
1046 | Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; | 1046 | Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; |
1047 | Opie::force_appearance &= ~nostyle; | 1047 | Opie::force_appearance &= ~nostyle; |
1048 | } | 1048 | } |
1049 | 1049 | ||
1050 | void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) | 1050 | void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) |
1051 | { | 1051 | { |
1052 | #ifdef Q_WS_QWS | 1052 | #ifdef Q_WS_QWS |
1053 | QDataStream stream( data, IO_ReadOnly ); | 1053 | QDataStream stream( data, IO_ReadOnly ); |
1054 | if ( msg == "applyStyle()" ) { | 1054 | if ( msg == "applyStyle()" ) { |
1055 | applyStyle(); | 1055 | applyStyle(); |
1056 | } | 1056 | } |
1057 | else if ( msg == "toggleApplicationMenu()" ) { | 1057 | else if ( msg == "toggleApplicationMenu()" ) { |
1058 | QWidget *active = activeWindow ( ); | 1058 | QWidget *active = activeWindow ( ); |
1059 | 1059 | ||
1060 | if ( active ) { | 1060 | if ( active ) { |
1061 | QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( ); | 1061 | QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( ); |
1062 | bool oldactive = man-> isActive ( ); | 1062 | bool oldactive = man-> isActive ( ); |
1063 | 1063 | ||