summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-23 19:08:19 (UTC)
committer kergoth <kergoth>2003-04-23 19:08:19 (UTC)
commitf99c8e576030a7e8e83aa850b09ec69cc6217bb1 (patch) (unidiff)
treec2b4f3cf2c5858bc14c5a72be71f1b4b4e276aad
parent3d0eacfe335f073b2ece67d762e8d182a6329303 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/opie-common.control4
-rw-r--r--library/qpeapplication.cpp8
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 @@
1Package: opie-common 1Package: opie-common
2Files: etc/colors bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/* 2Files: etc/colors bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/*
3Priority: required 3Priority: required
4Section: opie/system 4Section: opie/system
5Maintainer: Project Opie <opie@handhelds.org> 5Maintainer: Project Opie <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: $QPE_VERSION-$SUB_VERSION.2 7Version: $QPE_VERSION-$SUB_VERSION.3
8Depends: libqpe1, qte-fonts, qpf-helvetica 8Depends: libqpe1, qte-fonts, qpf-bitstream-vera
9Replaces: opie-base 9Replaces: opie-base
10Description: Core opie files 10Description: 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
@@ -515,23 +515,23 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
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 );
@@ -1033,13 +1033,13 @@ void QPEApplication::applyStyle()
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 ...