author | kergoth <kergoth> | 2003-04-26 15:26:36 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-26 15:26:36 (UTC) |
commit | e434f5a8dacef2d86b37d44b9ba7ffa713abaae7 (patch) (unidiff) | |
tree | 7053cd94210f6410b247cac42bb1c0c895a3a09d | |
parent | dd4f6b36681a28f785cf0923b0f9fc58ebe9a3bf (diff) | |
download | opie-e434f5a8dacef2d86b37d44b9ba7ffa713abaae7.zip opie-e434f5a8dacef2d86b37d44b9ba7ffa713abaae7.tar.gz opie-e434f5a8dacef2d86b37d44b9ba7ffa713abaae7.tar.bz2 |
Change default font for large screen sizes to vera/16 rather than vera/18.
-rw-r--r-- | library/qpeapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index f4bfda9..e5da48c 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -430,193 +430,193 @@ static void setTreble( int t = 0, int percent = -1 ) | |||
430 | \fn void QPEApplication::timeChanged(); | 430 | \fn void QPEApplication::timeChanged(); |
431 | This signal is emitted when the time changes outside the normal | 431 | This signal is emitted when the time changes outside the normal |
432 | passage of time, i.e. if the time is set backwards or forwards. | 432 | passage of time, i.e. if the time is set backwards or forwards. |
433 | */ | 433 | */ |
434 | 434 | ||
435 | /*! | 435 | /*! |
436 | \fn void QPEApplication::clockChanged( bool ampm ); | 436 | \fn void QPEApplication::clockChanged( bool ampm ); |
437 | 437 | ||
438 | This signal is emitted when the user changes the clock's style. If | 438 | This signal is emitted when the user changes the clock's style. If |
439 | \a ampm is TRUE, the user wants a 12-hour AM/PM clock, otherwise, | 439 | \a ampm is TRUE, the user wants a 12-hour AM/PM clock, otherwise, |
440 | they want a 24-hour clock. | 440 | they want a 24-hour clock. |
441 | */ | 441 | */ |
442 | 442 | ||
443 | /*! | 443 | /*! |
444 | \fn void QPEApplication::volumeChanged( bool muted ) | 444 | \fn void QPEApplication::volumeChanged( bool muted ) |
445 | 445 | ||
446 | This signal is emitted whenever the mute state is changed. If \a | 446 | This signal is emitted whenever the mute state is changed. If \a |
447 | muted is TRUE, then sound output has been muted. | 447 | muted is TRUE, then sound output has been muted. |
448 | */ | 448 | */ |
449 | 449 | ||
450 | /*! | 450 | /*! |
451 | \fn void QPEApplication::weekChanged( bool startOnMonday ) | 451 | \fn void QPEApplication::weekChanged( bool startOnMonday ) |
452 | 452 | ||
453 | This signal is emitted if the week start day is changed. If \a | 453 | This signal is emitted if the week start day is changed. If \a |
454 | startOnMonday is TRUE then the first day of the week is Monday; if | 454 | startOnMonday is TRUE then the first day of the week is Monday; if |
455 | \a startOnMonday is FALSE then the first day of the week is | 455 | \a startOnMonday is FALSE then the first day of the week is |
456 | Sunday. | 456 | Sunday. |
457 | */ | 457 | */ |
458 | 458 | ||
459 | /*! | 459 | /*! |
460 | \fn void QPEApplication::dateFormatChanged(DateFormat) | 460 | \fn void QPEApplication::dateFormatChanged(DateFormat) |
461 | 461 | ||
462 | This signal is emitted whenever the date format is changed. | 462 | This signal is emitted whenever the date format is changed. |
463 | */ | 463 | */ |
464 | 464 | ||
465 | /*! | 465 | /*! |
466 | \fn void QPEApplication::flush() | 466 | \fn void QPEApplication::flush() |
467 | 467 | ||
468 | ### | 468 | ### |
469 | */ | 469 | */ |
470 | 470 | ||
471 | /*! | 471 | /*! |
472 | \fn void QPEApplication::reload() | 472 | \fn void QPEApplication::reload() |
473 | 473 | ||
474 | */ | 474 | */ |
475 | 475 | ||
476 | /*! | 476 | /*! |
477 | \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data ) | 477 | \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data ) |
478 | 478 | ||
479 | This signal is emitted when a message is received on this | 479 | This signal is emitted when a message is received on this |
480 | application's QPE/Application/<i>appname</i> \link qcop.html | 480 | application's QPE/Application/<i>appname</i> \link qcop.html |
481 | QCop\endlink channel. | 481 | QCop\endlink channel. |
482 | 482 | ||
483 | The slot to which you connect this signal uses \a msg and \a data | 483 | The slot to which you connect this signal uses \a msg and \a data |
484 | in the following way: | 484 | in the following way: |
485 | 485 | ||
486 | \code | 486 | \code |
487 | void MyWidget::receive( const QCString& msg, const QByteArray& data ) | 487 | void MyWidget::receive( const QCString& msg, const QByteArray& data ) |
488 | { | 488 | { |
489 | QDataStream stream( data, IO_ReadOnly ); | 489 | QDataStream stream( data, IO_ReadOnly ); |
490 | if ( msg == "someMessage(int,int,int)" ) { | 490 | if ( msg == "someMessage(int,int,int)" ) { |
491 | int a,b,c; | 491 | int a,b,c; |
492 | stream >> a >> b >> c; | 492 | stream >> a >> b >> c; |
493 | ... | 493 | ... |
494 | } else if ( msg == "otherMessage(QString)" ) { | 494 | } else if ( msg == "otherMessage(QString)" ) { |
495 | ... | 495 | ... |
496 | } | 496 | } |
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( "vera", 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( "vera", 18 ) ); | 526 | setFont( QFont( "vera", 16 ) ); |
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( "vera", 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( ".*/" ), "" ); |
556 | d->appName = channel; | 556 | d->appName = channel; |
557 | channel = "QPE/Application/" + channel; | 557 | channel = "QPE/Application/" + channel; |
558 | pidChannel = new QCopChannel( channel, this ); | 558 | pidChannel = new QCopChannel( channel, this ); |
559 | connect( pidChannel, SIGNAL( received( const QCString &, const QByteArray & ) ), | 559 | connect( pidChannel, SIGNAL( received( const QCString &, const QByteArray & ) ), |
560 | this, SLOT( pidMessage( const QCString &, const QByteArray & ) ) ); | 560 | this, SLOT( pidMessage( const QCString &, const QByteArray & ) ) ); |
561 | 561 | ||
562 | if ( f.isOpen() ) { | 562 | if ( f.isOpen() ) { |
563 | d->keep_running = FALSE; | 563 | d->keep_running = FALSE; |
564 | QDataStream ds( &f ); | 564 | QDataStream ds( &f ); |
565 | QCString channel, message; | 565 | QCString channel, message; |
566 | QByteArray data; | 566 | QByteArray data; |
567 | while ( !ds.atEnd() ) { | 567 | while ( !ds.atEnd() ) { |
568 | ds >> channel >> message >> data; | 568 | ds >> channel >> message >> data; |
569 | d->enqueueQCop( channel, message, data ); | 569 | d->enqueueQCop( channel, message, data ); |
570 | } | 570 | } |
571 | 571 | ||
572 | flock( f.handle(), LOCK_UN ); | 572 | flock( f.handle(), LOCK_UN ); |
573 | f.close(); | 573 | f.close(); |
574 | f.remove(); | 574 | f.remove(); |
575 | } | 575 | } |
576 | 576 | ||
577 | for ( int a = 0; a < argc; a++ ) { | 577 | for ( int a = 0; a < argc; a++ ) { |
578 | if ( qstrcmp( argv[ a ], "-preload" ) == 0 ) { | 578 | if ( qstrcmp( argv[ a ], "-preload" ) == 0 ) { |
579 | argv[ a ] = argv[ a + 1 ]; | 579 | argv[ a ] = argv[ a + 1 ]; |
580 | a++; | 580 | a++; |
581 | d->preloaded = TRUE; | 581 | d->preloaded = TRUE; |
582 | argc -= 1; | 582 | argc -= 1; |
583 | } | 583 | } |
584 | else if ( qstrcmp( argv[ a ], "-preload-show" ) == 0 ) { | 584 | else if ( qstrcmp( argv[ a ], "-preload-show" ) == 0 ) { |
585 | argv[ a ] = argv[ a + 1 ]; | 585 | argv[ a ] = argv[ a + 1 ]; |
586 | a++; | 586 | a++; |
587 | d->preloaded = TRUE; | 587 | d->preloaded = TRUE; |
588 | d->forceshow = TRUE; | 588 | d->forceshow = TRUE; |
589 | argc -= 1; | 589 | argc -= 1; |
590 | } | 590 | } |
591 | } | 591 | } |
592 | 592 | ||
593 | /* overide stored arguments */ | 593 | /* overide stored arguments */ |
594 | setArgs( argc, argv ); | 594 | setArgs( argc, argv ); |
595 | 595 | ||
596 | #endif | 596 | #endif |
597 | 597 | ||
598 | // qwsSetDecoration( new QPEDecoration() ); | 598 | // qwsSetDecoration( new QPEDecoration() ); |
599 | 599 | ||
600 | #ifndef QT_NO_TRANSLATION | 600 | #ifndef QT_NO_TRANSLATION |
601 | 601 | ||
602 | QStringList langs = Global::languageList(); | 602 | QStringList langs = Global::languageList(); |
603 | for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) { | 603 | for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) { |
604 | QString lang = *it; | 604 | QString lang = *it; |
605 | 605 | ||
606 | QTranslator * trans; | 606 | QTranslator * trans; |
607 | QString tfn; | 607 | QString tfn; |
608 | 608 | ||
609 | trans = new QTranslator( this ); | 609 | trans = new QTranslator( this ); |
610 | tfn = qpeDir() + "/i18n/" + lang + "/libqpe.qm"; | 610 | tfn = qpeDir() + "/i18n/" + lang + "/libqpe.qm"; |
611 | if ( trans->load( tfn ) ) | 611 | if ( trans->load( tfn ) ) |
612 | installTranslator( trans ); | 612 | installTranslator( trans ); |
613 | else | 613 | else |
614 | delete trans; | 614 | delete trans; |
615 | 615 | ||
616 | trans = new QTranslator( this ); | 616 | trans = new QTranslator( this ); |
617 | tfn = qpeDir() + "/i18n/" + lang + "/" + d->appName + ".qm"; | 617 | tfn = qpeDir() + "/i18n/" + lang + "/" + d->appName + ".qm"; |
618 | if ( trans->load( tfn ) ) | 618 | if ( trans->load( tfn ) ) |
619 | installTranslator( trans ); | 619 | installTranslator( trans ); |
620 | else | 620 | else |
621 | delete trans; | 621 | delete trans; |
622 | 622 | ||