From 032e049ff5106c50224d2cdf5f2719c24102e91a Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 10 Sep 2010 20:03:45 -0500 Subject: Added Delicious and DroidSans fonts to package and preferences. --- linden/indra/newview/app_settings/settings.xml | 2 +- .../newview/skins/default/xui/en-us/fonts.xml | 42 ++++++++++++++++++++++ .../default/xui/en-us/panel_preferences_fonts.xml | 16 +++++++++ linden/indra/newview/viewer_manifest.py | 19 ++++++++-- linden/install.xml | 16 ++++----- 5 files changed, 83 insertions(+), 12 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index cf5f33f..cbc5887 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -258,7 +258,7 @@ FontChoice Comment - User's font choice (Liberation or DejaVu) + User's font choice (DejaVu, Delicious, DroidSans, or Liberation) Persist 1 Type diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml index 1aa44fb..15a8254 100644 --- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml +++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml @@ -53,6 +53,34 @@ + + Delicious-Roman.otf + + + + Delicious-Bold.otf + + + + Delicious-Italic.otf + + + + Delicious-BoldItalic.otf + + + LiberationSans-Regular.ttf @@ -65,6 +93,20 @@ + + DroidSans.ttf + + + + DroidSans-Bold.ttf + + + arial.ttf diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml index e55981b..869063f 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml @@ -20,6 +20,14 @@ Liberation Sans (classic Imprudence font) + + Delicious + + + + Droid Sans + + @@ -30,4 +38,12 @@ Preview: The quick brown fox jumped over the lazy dog. :) + + Preview: The quick brown fox jumped over the lazy dog. :) + + + + Preview: The quick brown fox jumped over the lazy dog. :) + + diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 5faa55e..2285b58 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -75,16 +75,29 @@ class ViewerManifest(LLManifest): # Include our fonts if self.prefix(src="fonts"): + self.path("GPL.txt") + self.path("Liberation-License.txt") self.path("LiberationSans-Bold.ttf") self.path("LiberationSans-Regular.ttf") - self.path("VeraMono.ttf") + + self.path("Delicious-License.txt") + self.path("Delicious-BoldItalic.otf") + self.path("Delicious-Bold.otf") + self.path("Delicious-Italic.otf") + self.path("Delicious-Roman.otf") + + self.path("Droid-License.txt") + self.path("DroidSans-Bold.ttf") + self.path("DroidSans.ttf") + + self.path("DejaVu-License.txt") self.path("DejaVuSansCondensed-BoldOblique.ttf") self.path("DejaVuSansCondensed-Bold.ttf") self.path("DejaVuSansCondensed-Oblique.ttf") self.path("DejaVuSansCondensed.ttf") - self.path("GPL.txt") - self.path("Liberation-License.txt") + self.path("Vera-License.txt") + self.path("VeraMono.ttf") self.end_prefix("fonts") # skins diff --git a/linden/install.xml b/linden/install.xml index f7a95b7..e78e498 100755 --- a/linden/install.xml +++ b/linden/install.xml @@ -489,30 +489,30 @@ darwin md5sum - e613a485c3f15009b24accb84ad790a4 + d6368fb96e6dd653d6ccc7d18502184e url - http://imprudenceviewer.org/download/extras/imprudence-fonts-20100830.tar.bz2 + http://imprudenceviewer.org/download/extras/imprudence-fonts-20100910.tar.bz2 linux md5sum - e613a485c3f15009b24accb84ad790a4 + d6368fb96e6dd653d6ccc7d18502184e url - http://imprudenceviewer.org/download/extras/imprudence-fonts-20100830.tar.bz2 + http://imprudenceviewer.org/download/extras/imprudence-fonts-20100910.tar.bz2 linux64 md5sum - e613a485c3f15009b24accb84ad790a4 + d6368fb96e6dd653d6ccc7d18502184e url - http://imprudenceviewer.org/download/extras/imprudence-fonts-20100830.tar.bz2 + http://imprudenceviewer.org/download/extras/imprudence-fonts-20100910.tar.bz2 windows md5sum - e613a485c3f15009b24accb84ad790a4 + d6368fb96e6dd653d6ccc7d18502184e url - http://imprudenceviewer.org/download/extras/imprudence-fonts-20100830.tar.bz2 + http://imprudenceviewer.org/download/extras/imprudence-fonts-20100910.tar.bz2 -- cgit v1.1