From ca4d3f5c76aaa244770a30129a9de94bebc9b9ac Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 30 Aug 2010 18:57:23 -0500
Subject: Switched main viewer font to DejaVu Sans Condensed.

Tweaked a few parts of the UI layout to fit the font better.
Still no easy way to switch fonts yet.
---
 linden/indra/newview/app_settings/settings.xml           |  4 ++--
 .../skins/default/xui/en-us/floater_chat_history.xml     |  9 ++++-----
 .../default/xui/en-us/floater_instant_message_group.xml  |  9 ++++-----
 .../skins/default/xui/en-us/floater_preview_gesture.xml  |  8 ++++----
 linden/indra/newview/skins/default/xui/en-us/fonts.xml   | 16 ++++++++--------
 .../skins/default/xui/en-us/panel_preferences_web.xml    |  4 ++--
 .../newview/skins/default/xui/en-us/panel_toolbar.xml    |  4 ++--
 linden/indra/newview/viewer_manifest.py                  |  4 ++++
 8 files changed, 30 insertions(+), 28 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index bcf9ef6..2aec96f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -6131,7 +6131,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>LiberationSans-Regular.ttf</string>
+    <string>DejaVuSansCondensed.ttf</string>
   </map>
   <key>FontSansSerifBundledFallback</key>
   <map>
@@ -6153,7 +6153,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>LiberationSans-Bold.ttf</string>
+    <string>DejaVuSansCondensed-Bold.ttf</string>
   </map>
   <key>FontSansSerifFallback</key>
   <map>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 87e1dae..74fe708 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -81,11 +81,10 @@
 			<check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall"
 			     height="20" initial_value="false" label="Translate chat (powered by Google)" left_delta="0"
 			     name="translate chat" radio_style="false" width="100" />
-			<button bottom_delta="7" follows="right|top" height="20" label="&lt; &lt;"
-			     label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn"
-			     right="305"
-			     tool_tip="Click here to show list of active participants in this IM session."
-			     width="70" />
+			<button name="toggle_active_speakers_btn"
+			     label="&lt;&lt;" label_selected="&gt;&gt;" follows="right|top"
+			     bottom_delta="0" left="262" right="305" height="20"
+			     tool_tip="Toggle list of active participants in this IM session." />
 			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
 			     bottom="28" embedded_items="false" enabled="false"
 			     follows="left|top|right|bottom" font="SansSerif" height="74" left="5"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 4c9ba2a..072ac14 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -58,11 +58,10 @@
 			     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
 			     label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
 			     visible="false" width="92" />
-			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
-			     label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
-			     right="176"
-			     tool_tip="Click here to toggle a list of active participants in this IM session."
-			     visible="true" width="30" />
+			<button name="toggle_active_speakers_btn"
+			     label="&lt;&lt;" label_selected="&gt;&gt;" follows="right|top"
+			     bottom_delta="0" left="133" right="176" height="20"
+			     tool_tip="Toggle list of active participants in this IM session." />	
 			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
 			     bottom="30" embedded_items="false" enabled="false"
 			     follows="left|top|right|bottom" font="SansSerif" left="4"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
index 25121ff..09fe2c0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
@@ -57,13 +57,13 @@ Chat
 Wait
 	</scroll_list>
 	<button bottom_delta="90" follows="top|left" height="20" label="Add &gt;&gt;"
-	     left="130" name="add_btn" width="80" />
+	     left="125" name="add_btn" width="90" />
 	<button bottom_delta="-30" follows="top|left" height="20" label="Move Up"
-	     left_delta="0" name="up_btn" width="80" />
+	     left_delta="0" name="up_btn" width="90" />
 	<button bottom_delta="-30" follows="top|left" height="20" label="Move Down"
-	     left_delta="0" name="down_btn" width="80" />
+	     left_delta="0" name="down_btn" width="90" />
 	<button bottom_delta="-30" follows="top|left" height="20" label="Remove" left_delta="0"
-	     name="delete_btn" width="80" />
+	     name="delete_btn" width="90" />
 	<scroll_list bottom_delta="0" draw_border="true" follows="top|left" height="110" left="220"
 	     multi_select="false" name="step_list" width="210" />
 	<text bottom_delta="-70" follows="top|left" font="SansSerif" height="60" left="16"
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 a450bb6..95070ed 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -10,8 +10,8 @@
       <file>ArialUni.ttf</file>
     </os>
     <os name="Mac">
-      <file>ヒラギノ角ゴ Pro W3.otf</file>
-      <file>ヒラギノ角ゴ ProN W3.otf</file>
+      <file>ヒラギノ角ゴ Pro W3.otf</file>
+      <file>ヒラギノ角ゴ ProN W3.otf</file>
       <file>AppleGothic.dfont</file>
       <file>AppleGothic.ttf</file>
       <file>华文细黑.ttf</file>
@@ -19,13 +19,13 @@
   </font>
 
   <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
-    <file>LiberationSans-Regular.ttf</file>
+    <file>DejaVuSansCondensed.ttf</file>
   </font>
 
   <font name="SansSerifBold" 
 	comment="Name of bold sans-serif font" 
 	font_style="Bold">
-    <file>LiberationSans-Bold.ttf</file>
+    <file>DejaVuSansCondensed-Bold.ttf</file>
   </font>
 
   <font name="Monospace"
@@ -35,25 +35,25 @@
 
   <font name="DejaVu"
 	comment="Name of DejaVu font">
-    <file>DejaVuSans.ttf</file>
+    <file>DejaVuSansCondensed.ttf</file>
   </font>
 
   <font name="DejaVu"
 	comment="Name of DejaVu font (bold)"
 	font_style="BOLD">
-    <file>DejaVuSansBold.ttf</file>
+    <file>DejaVuSansCondensed-Bold.ttf</file>
   </font>
 
   <font name="DejaVu"
 	comment="Name of DejaVu font (italic)"
 	font_style="ITALIC">
-    <file>DejaVuSansOblique.ttf</file>
+    <file>DejaVuSansCondensed-Oblique.ttf</file>
   </font>
 
   <font name="DejaVu"
 	comment="Name of DejaVu font (bold italic)"
 	font_style="BOLD|ITALIC">
-    <file>DejaVuSansBoldOblique.ttf</file>
+    <file>DejaVuSansCondensed-BoldOblique.ttf</file>
   </font>
 
   <font name="Helvetica"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index 83facb4..46283bb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -68,8 +68,8 @@
 	     v_pad="0" width="128">
 		World search:
 	</text>
-	<line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-	     height="18" left="100" name="world_search_editor"
+	<line_editor bottom_delta="-8" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="18" left="100" name="world_search_editor"
 	     tool_tip="Address of the world search engine you would like to use"
 	     width="355" />
 	<button bottom_delta="-22" enabled="true" follows="left|top" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
index 9c57be0..7a82674 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -16,7 +16,7 @@
      <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
 	       name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
 	       list_position="above"
-	       width="50" follows="left|right" user_resize="false"/>
+	       width="60" follows="left|right" user_resize="false"/>
     <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
     <button bottom="0" font="SansSerif" height="24" label="Fly"
         image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
@@ -25,7 +25,7 @@
              image_disabled="toolbar_btn_disabled.tga" scale_image="true"
 	       label_selected="Stop Flying" left="0" name="fly_btn"
 	       tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
-	       width="50" follows="left|right" user_resize="false"/>
+	       width="40" follows="left|right" user_resize="false"/>
     <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
              image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
                         image_selected="toolbar_btn_selected.tga"
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index d34e9ae..15172f2 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -78,6 +78,10 @@ class ViewerManifest(LLManifest):
             self.path("LiberationSans-Bold.ttf")
             self.path("LiberationSans-Regular.ttf")
             self.path("VeraMono.ttf")
+            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")
-- 
cgit v1.1