summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_text_editor.xml20
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_textbox.xml17
-rw-r--r--indra/newview/skins/default/xui/en/main_view.xml14
-rw-r--r--indra/newview/skins/default/xui/en/menu_login.xml41
-rw-r--r--indra/newview/skins/default/xui/en/widgets/accordion_tab.xml3
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chat_history.xml3
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_script.xml3
-rw-r--r--indra/newview/skins/default/xui/en/widgets/floater.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/menu_item.xml3
-rw-r--r--indra/newview/skins/default/xui/en/widgets/radio_item.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/slider_bar.xml3
-rw-r--r--indra/newview/skins/default/xui/en/widgets/spinner.xml1
-rw-r--r--indra/newview/skins/default/xui/en/widgets/textbase.xml3
-rw-r--r--indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml2
14 files changed, 87 insertions, 30 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
new file mode 100644
index 0000000000..b0aa5c7c4f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="600"
+ layout="topleft"
+ name="floater_test_text_editor"
+ width="800">
+ <text_editor
+ height="50"
+ follows="top|left|bottom"
+ layout="topleft"
+ left="10"
+ name="test_text_editor"
+ tool_tip="text editor"
+ top="25"
+ width="200">
+ Text Editor
+ </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 033070607b..8fc2677cbe 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -21,6 +21,21 @@ Third line of multiple lines
Fourth line of multiple lines
Fifth line of multiple lines
</text>
+ <text
+ clip_partial="true"
+ top_pad="10"
+ left="10"
+ width="267"
+ height="28"
+ layout="topleft"
+ follows="right|left"
+ text_color="white"
+ use_ellipses="true"
+ word_wrap="true"
+ mouse_opaque="false"
+ name="title" >
+ This text has word_wrap set true, use_ellipses set true, and clip_partial set true, so it should wrap around, spilling over to the last line, then clip the last partial line and show ellipses to indicate there is more text
+ </text>
<text
font="SansSerif"
@@ -28,7 +43,7 @@ Fifth line of multiple lines
height="10"
layout="topleft"
left_delta="0"
- top_pad="40"
+ top_pad="10"
width="300">
SansSerif BOLD
</text>
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index eee1134d15..a11ebf5af8 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -10,22 +10,16 @@
<layout_stack border_size="0"
follows="all"
mouse_opaque="false"
- height="768"
+ height="749"
name="menu_stack"
orientation="vertical"
- top="0">
+ top="19">
<layout_panel auto_resize="false"
- height="84"
+ height="65"
mouse_opaque="false"
- name="nav_and_status_bar_region"
+ name="nav_bar_container"
width="1024"
visible="false">
- <panel follows="left|right|bottom"
- left="0"
- name="nav_bar_container"
- right="1024"
- top="19"
- height="65"/>
</layout_panel>
<layout_panel auto_resize="true"
follows="all"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 07940e18b6..a22dc80f4e 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -185,21 +185,42 @@
<menu_item_call.on_click
function="Advanced.ShowSideTray" />
</menu_item_call>
+ <menu
+ label="UI Tests"
+ name="UI Tests"
+ tear_off="true">
+ <menu_item_call
+ label="Textbox"
+ name="Textbox"
+ shortcut="control|1">
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="test_textbox" />
+ </menu_item_call>
+ <menu_item_call
+ label="Text Editor"
+ name="Text Editor"
+ shortcut="control|2">
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="test_text_editor" />
+ </menu_item_call>
<menu_item_call
- label="Widget Test"
- name="Widget Test"
+ label="Widgets"
+ name="Widgets"
shortcut="control|shift|T">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="test_widgets" />
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="test_widgets" />
</menu_item_call>
<menu_item_call
- label="Inspectors Test"
- name="Inspectors Test">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="test_inspectors" />
+ label="Inspectors"
+ name="Inspectors">
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="test_inspectors" />
</menu_item_call>
+ </menu>
<menu_item_check
label="Reg In Client Test (restart)"
name="Reg In Client Test (restart)">
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index c0e1944f56..9990324d03 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -9,5 +9,6 @@
header_image_over="Accordion_Over"
header_image_pressed="Accordion_Press"
header_image_expanded="Accordion_Selected"
- header_text_color="LtGray"
+ header_text_color="LtGray"
+ font="SansSerif"
/>
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index 32916c0816..2be37d222a 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -15,4 +15,5 @@
track_bottom="true"
name="chat_history"
type="string"
- word_wrap="true" /> \ No newline at end of file
+ word_wrap="true"
+ font="SansSerif"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index 5011bf6a61..e5af961a56 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<chiclet_script
- name="script_chiclet">
+ name="script_chiclet"
+ font="SansSerif">
<icon
name="chiclet_icon"
follows="all"
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 1425258b2a..b2bd9c38c9 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -9,6 +9,8 @@
background_visible="true"
background_opaque="false"
header_height="25"
+ top="0"
+ left="0"
close_image="Icon_Close_Foreground"
restore_image="Icon_Restore_Foreground"
minimize_image="Icon_Minimize_Foreground"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
index 2bbaa6233f..c65244ae22 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- Use this for the top-level menu styling -->
-<menu_item>
-</menu_item>
+<menu_item font="SansSerif" />
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
index dd848f3acd..3ddf18b2cb 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<radio_item follows="left|top">
+<radio_item follows="left|top" font="SansSerif">
<radio_item.label_text name="Radio Item label"/>
<radio_item.check_button name="Radio control button"
image_unselected="RadioButton_Off"
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index 706c89f5ed..89d5950e98 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -8,4 +8,5 @@
track_image_horizontal="SliderTrack_Horiz"
track_image_vertical="SliderTrack_Vert"
track_highlight_horizontal_image="SliderTrack_Horiz"
- track_highlight_vertical_image="SliderTrack_Vert" />
+ track_highlight_vertical_image="SliderTrack_Vert"
+ font="SansSerif" />
diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml
index 7d1a5118cb..ab3f8df5f8 100644
--- a/indra/newview/skins/default/xui/en/widgets/spinner.xml
+++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<spinner text_enabled_color="LabelTextColor"
text_disabled_color="LabelDisabledColor"
+ font="SansSerif"
decimal_digits="3"
label_width="40" >
<spinner.up_button name="SpinCtrl Up"
diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml
index 166e8555fe..f4dc192bc3 100644
--- a/indra/newview/skins/default/xui/en/widgets/textbase.xml
+++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml
@@ -1,2 +1,3 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<textbase clip_partial="false"/>
+<textbase clip_partial="false"
+ font="SansSerif"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
index 2f72ad65a1..f4dbb8f404 100644
--- a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- Global settings for all widgets ("UI Controls") -->
+<!-- The params in this file aren't currently getting loaded in OSX -->
<ui_ctrl
- font="SansSerif"
/>