summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-23 19:08:19 (UTC)
committer kergoth <kergoth>2003-04-23 19:08:19 (UTC)
commitf99c8e576030a7e8e83aa850b09ec69cc6217bb1 (patch) (side-by-side diff)
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) (show 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 @@
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
@@ -515,23 +515,23 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type 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 );
@@ -1033,13 +1033,13 @@ void QPEApplication::applyStyle()
// 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 ...