Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.

svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5

18 files changed, 131 insertions, 136 deletions

diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index a1e074fae2..3e7e07749a 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<button image_unselected="button_enabled_32x128.tga"
-        image_selected="button_enabled_selected_32x128.tga"
-        image_disabled_selected="button_disabled_32x128.tga"
-        image_disabled="button_disabled_32x128.tga"
+<button image_unselected="PushButton_Off"
+        image_selected="PushButton_Selected"
+        image_disabled_selected="PushButton_Selected_Disabled"
+        image_disabled="PushButton_Disabled"
         label_color="ButtonLabelColor"
         label_color_selected="ButtonLabelSelectedColor"
         label_color_disabled="ButtonLabelDisabledColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
index ff01dcebd8..97060fb161 100644
--- a/indra/newview/skins/default/xui/en/widgets/check_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml
@@ -3,16 +3,15 @@
            text_disabled_color="LabelDisabledColor"
            font="SansSerifSmall"
            follows="left|top">
-  <check_box.label_text name="checkbox label"/>
+  <check_box.label_text name="checkbox label" />
   <check_box.check_button name="CheckboxCtrl Button"
-                          commit_on_return="false" 
+                          commit_on_return="false"
                           label=""
                           is_toggle="true"
-                          hover_glow_amount="0.35"
                           font="SansSerif"
                           scale_image="false"
-                          image_unselected="checkbox_enabled_false.tga"
-                          image_selected="checkbox_enabled_true.tga"
-                          image_disabled="checkbox_disabled_false.tga"
-                          image_disabled_selected="checkbox_disabled_true.tga"/>
+                          image_unselected="Checkbox_Off"
+                          image_selected="Checkbox_On"
+                          image_disabled="Checkbox_Off_Disabled"
+                          image_disabled_selected="Checkbox_On_Disabled" />
 </check_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index 304eda2d97..178c890c61 100644
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
@@ -5,6 +5,4 @@
   <color_swatch.caption_text name="caption"
                              font="SansSerifSmall"
                              follows="left|right|bottom"/>
-  <color_swatch.border name="border"
-                       bevel_type="in"/>
 </color_swatch>
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index 8a8f3f7f2c..45b1e1eb9f 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <combo_box font="SansSerifSmall"
-           arrow_image="combobox_arrow.tga" 
-           list_position="below" 
-           max_chars="20" 
-           follows="left|top">
+           list_position="below"
+           max_chars="20"
+           follows="right|top">
   <combo_box.combo_button name="Combobox Button"
+                          label=""
                           hover_glow_amount="0.15"
                           font="SansSerifSmall"
-                          halign="left" 
                           scale_image="true"
-                          image_unselected="square_btn_32x128.tga"
-                          image_selected="square_btn_selected_32x128.tga"
-                          image_disabled="square_btn_32x128.tga"
-                          image_disabled_selected="square_btn_selected_32x128.tga"
-                          image_overlay="combobox_arrow.tga"
-                          image_overlay_alignment="right"/>
-  <combo_box.combo_list bg_writeable_color="white"/>
+                          image_unselected="ComboButton_Off"
+                          image_selected="ComboButton_Selected"
+                          image_disabled="ComboButton_Disabled"
+                          image_disabled_selected="ComboButton_Disabled_Selected" />
+  <combo_box.drop_down_button name="Drop Down Button"
+                              label=""
+                              hover_glow_amount="0.15"
+                              font="SansSerifSmall"
+                              scale_image="true"
+                              pad_right="24"
+                              image_unselected="DropDown_Off"
+                              image_selected="DropDown_Selected"
+                              image_disabled="DropDown_Disabled"
+                              image_disabled_selected="DropDown_Disabled_Selected" />
+  <combo_box.combo_list bg_writeable_color="white" />
   <combo_box.combo_editor name="Combo Text Entry"
                           select_on_focus="true"
-                          font="SansSerifSmall"/>
+                          font="SansSerifSmall" />
 </combo_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
index c35d15ec92..602250ace6 100644
--- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml
+++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
@@ -2,19 +2,19 @@
 <drop_down text_enabled_color="LabelTextColor"
            text_disabled_color="LabelDisabledColor"
            font="SansSerifSmall"
-           allow_text_entry="false" 
+           allow_text_entry="false"
            follows="left|top">
   <drop_down.combo_button name="Combobox Button"
                           hover_glow_amount="0.15"
                           font="SansSerifSmall"
                           halign="left"
                           scale_image="true"
-                          image_unselected="square_btn_32x128.tga"
-                          image_selected="square_btn_selected_32x128.tga"
-                          image_disabled="square_btn_32x128.tga"
-                          image_disabled_selected="square_btn_selected_32x128.tga"
-                          image_overlay="combobox_arrow.tga"
-                          image_overlay_alignment="right"/>
-  <drop_down.combo_list bg_writeable_color="white"/>
-  <drop_down.combo_editor name="Combo Text Entry" visible="false" select_on_focus="true"/>
+                          image_unselected="PushButton_Off"
+                          image_selected="PushButton_Selected"
+                          image_disabled="PushButton_Disabled"
+                          image_disabled_selected="PushButton_Disabled_Selected"
+                          image_overlay="Combobox_Over"
+                          image_overlay_alignment="right" />
+  <drop_down.combo_list bg_writeable_color="white" />
+  <drop_down.combo_editor name="Combo Text Entry" visible="false" select_on_focus="true" />
 </drop_down>
diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
index e0033058c8..a5043c5c14 100644
--- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <flyout_button list_position="below">
   <action_button scale_image="true"
-                image_selected="flyout_btn_left_selected.tga"
-                image_unselected="flyout_btn_left.tga"
-                image_disabled="flyout_btn_left_disabled.tga"/>
-  <combo_button image_selected="flyout_btn_right_selected.tga"
-                image_unselected="flyout_btn_right.tga"
-                image_disabled="flyout_btn_right_disabled.tga"
+                image_selected="SegmentedBtn_Left_Selected"
+                image_unselected="SegmentedBtn_Left_Off"
+                image_disabled="SegmentedBtn_Left_Disabled"/>
+  <combo_button image_selected="ComboButton_Selected"
+                image_unselected="ComboButton_Off"
+                image_disabled="ComboButton_Disabled"
                 pad_right="6"
                 tab_stop="false"/>
-</flyout_button>
-
+</flyout_button>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index 11081ae308..3ab9379705 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<line_editor background_image="sm_rounded_corners_simple.tga"
+<line_editor background_image="TextField_Off"
              select_on_focus="false"
              handle_edit_keys_directly="false"
              commit_on_focus_lost="true"
@@ -14,5 +14,4 @@
              mouse_opaque="true"
              name="line_editor"
              font="SansSerifSmall">
-  <line_editor.border bevel_style="in"/>
 </line_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 32f5a18d1c..07980a9d09 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -3,64 +3,50 @@
 *TODO: Replace hardcoded buttons width/height with getting this info from the button images.
        Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
 -->
+
+
+
 <location_input font="SansSerifSmall"
-           add_landmark_image_enabled="icon_event_adult.tga"
-           add_landmark_image_disabled="icon_event.tga"
-           add_landmark_hpad="4"
-           allow_text_entry="true"
-           arrow_image="combobox_arrow.tga"
-           list_position="below"
-           show_text_as_tentative="false"
-           max_chars="20"
-           follows="left|top">
-  <location_input.background name="Background"
-                          visible="true"
-                          label=""
-                          follows="left|top|right"
-                          image_unselected="navbar_bg_center.tga"
-                          image_selected="navbar_bg_center.tga"
-                          image_disabled="navbar_bg_center.tga"
-                          image_disabled_selected="navbar_bg_center.tga"
-                          image_hover_selected="navbar_bg_center.tga"
-                          image_hover_unselected="navbar_bg_center.tga" />
-  <location_input.info_button name="Place Information"
+                add_landmark_image_enabled="icon_event_adult.tga"
+                add_landmark_image_disabled="icon_event.tga"
+                add_landmark_width="20"
+                add_landmark_height="20"
+                add_landmark_hpad="2"
+                allow_text_entry="true"
+                arrow_image="Combobox_Selected"
+                list_position="below"
+      	        show_text_as_tentative="false"
+                max_chars="20"
+                follows="left|top"
+                background="TextField_Off">
+  <info_button name="Place Information"
                           label=""
                           tool_tip="About current location"
-                          width="20"
-                          height="20"
+                          width="16"
+                          height="16"
                           follows="left|top"
-                          image_overlay="map_infohub.tga"
-                          image_unselected="navbar_bg_left.tga"
-                          image_selected="navbar_bg_left.tga"
-                          image_hover_selected="navbar_bg_left.tga"
-                          image_hover_unselected="navbar_bg_left.tga"
-                          image_disabled_selected="navbar_bg_left.tga"
-                          image_disabled="navbar_bg_left.tga" />
-  <location_input.add_landmark_button name="Add Landmark"
+                          hover_glow_amount="0.15"
+                          image_unselected="Info_Off"
+                          image_selected="Info_Off"
+                          image_disabled_selected="Info_Off"
+                          image_disabled="Info_Off" />
+  <add_landmark_button name="Add Landmark"
                           label=""
                           width="16"
                           height="16"
                           tool_tip="Add to My Landmarks"
                           follows="right|top"
                           scale_image="false" />
-  <location_input.combo_button name="Location History"
+  <combo_button name="Location History"
                           label=""
-                          tool_tip="My Location History"
-                          width="20"
-                          height="20"
-                          image_overlay="navbar_history.tga"
-                          image_overlay_alignment="center"
-                          image_unselected="navbar_bg_right.tga"
-                          image_selected="navbar_bg_right.tga"
-                          image_disabled="navbar_bg_right.tga"
-                          image_disabled_selected="navbar_bg_right.tga"
-                          image_hover_selected="navbar_bg_right.tga"
-                          image_hover_unselected="navbar_bg_right.tga" />
-  <location_input.combo_list bg_writeable_color="white"/>
-  <location_input.combo_editor name="Combo Text Entry"
-                          select_on_focus="true"
-                          font="SansSerifSmall"
-                          bevel_style="none"
-                          border_style="line"
-                          border_thickness="0" />
+                          pad_right="0"
+                          tool_tip="My Location History"/>
+  <combo_list bg_writeable_color="white"/>
+  <combo_editor name="Combo Text Entry"
+                text_pad_left="20"
+                select_on_focus="true"
+                font="SansSerifSmall"
+                bevel_style="none"
+                border_style="line"
+                border.border_thickness="0"/>
 </location_input>
diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
index 3344de06b0..39cd464872 100644
--- a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<progress_bar image_bar="rounded_square.tga"
-              image_fill="progressbar_fill.tga"
+<progress_bar image_bar="ProgressTrack"
+              image_fill="ProgressBar"
               image_shadow="rounded_square_soft.tga"
               color_bar.red="0.5764"
               color_bar.green="0.6627"
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
index 2d851042a5..ad7ef5bffc 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<radio_group draw_border="true"
+<radio_group draw_border="false"
              name="radio_group"
-             mouse_opaque="true"
+             mouse_opaque="false"
              follows="left|top"
              font="SansSerifSmall"/>
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 0a27ca509b..281a55d5e2 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
@@ -2,8 +2,9 @@
 <radio_item follows="left|top">
   <radio_item.label_text name="Radio Item label"/>
   <radio_item.check_button name="Radio control button"
-                          image_unselected="radio_active_false.tga"
-                          image_selected="radio_active_true.tga"
-                          image_disabled="radio_inactive_false.tga"
-                          image_disabled_selected="radio_inactive_true.tga"/>
+                          image_unselected="RadioButton_Off"
+                          image_selected="RadioButton_On"
+                          image_disabled="RadioButton_Disabled"
+                          image_disabled_selected="RadioButton_On_Disabled"/>
 </radio_item>
+
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
index a6c9a56dfd..3b195c6b33 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<scroll_bar thumb_image="rounded_square.tga"
-            track_image="rounded_square.tga"
-            track_color="ScrollbarTrackColor"
+<scroll_bar thumb_image="ScrollThumb_Vert"
+            track_image="ScrollTrack_Vert"
+	    track_color="ScrollbarTrackColor"
             thumb_color="ScrollbarThumbColor"
-            thickness="16">
-  <up_button image_unselected="scrollbutton_up_out_blue.tga"
-             image_selected="scrollbutton_up_in_blue.tga"
-             scale_image="true"/>
-  <down_button image_unselected="scrollbutton_down_out_blue.tga"
-               image_selected="scrollbutton_down_in_blue.tga"
-               scale_image="true"/>
-  <left_button image_unselected="scrollbutton_left_out_blue.tga"
-               image_selected="scrollbutton_left_in_blue.tga"
-               scale_image="true"/>
-  <right_button image_unselected="scrollbutton_right_out_blue.tga"
-               image_selected="scrollbutton_right_in_blue.tga"
-               scale_image="true"/>
+            thickness="15">
+  <up_button image_unselected="ScrollArrow_Up"
+             image_selected="ScrollArrow_Up"
+             scale_image="true" thickness="15"
+             hover_glow_amount="0.15"/>
+  <down_button image_unselected="ScrollArrow_Down"
+               image_selected="ScrollArrow_Down"
+               scale_image="true" thickness="15"
+               hover_glow_amount="0.15"/>
+  <left_button image_unselected="ScrollArrow_Left"
+               image_selected="ScrollArrow_Left"
+               scale_image="true" thickness="15"
+               hover_glow_amount="0.15"/>
+  <right_button image_unselected="ScrollArrow_Right"
+               image_selected="ScrollArrow_Right"
+               scale_image="true" thickness="15"
+               hover_glow_amount="0.15"/>
 </scroll_bar>
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index 10080e5e39..67588d76ca 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <search_editor select_on_focus="true">
-  <clear_search_button image_unselected="icn_clear_lineeditor.tga"
-                       image_selected="close_inactive_blue.tga"
+  <clear_search_button image_unselected="TextField_Search_Off"
+                       image_selected="TextField_Search_Active"
+                       image_disabled="TextField_Search_Disabled"
                        image_color="TextFgTentativeColor"/>
 </search_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
index 55ec18f292..8b4a5afbe9 100644
--- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml
+++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<side_tray tab_btn_image="sidebar_tab_left.tga"
-        tab_btn_image_selected="sidebar_tab_left_selected.tga"
-		tab_btn_width = "32"
-		tab_btn_height = "32"
-		tab_btn_margin = "0"
+<side_tray tab_btn_image="TaskPanel_Tab_Off"
+        tab_btn_image_selected="TaskPanel_Tab_Selected"
+		tab_btn_width="32"
+		tab_btn_height="40"
+		tab_btn_margin="1"
         >
 </side_tray>
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index 20af3bb58f..b39c2991a0 100644
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
@@ -6,6 +6,6 @@
                     bg_readonly_color="TextBgReadOnlyColor"
                     bg_writeable_color="TextBgWriteableColor"
                     bg_focus_color="TextBgFocusColor"
-                    hide_border="false" 
-                    hide_scrollbar="false" 
+                    hide_border="true"
+                    hide_scrollbar="false"
                     font="SansSerif"/>
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 ba9ad21cc0..7004de8475 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -2,6 +2,7 @@
 <slider_bar track_color="SliderTrackColor"
             thumb_outline_color="SliderThumbOutlineColor"
             thumb_center_color="SliderThumbCenterColor"
-            thumb_image="icn_slide-thumb_dark.tga"
-            track_image="icn_slide-groove_dark.tga"
-            track_highlight_image="icn_slide-highlight.tga"/>
+            thumb_image="SliderThumb_Off"
+            hover_glow_amount="0.15"
+            track_image="SliderTrack_Horiz"
+            track_highlight_image="SliderTrack_Horiz" />
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 8245e5ff23..7aad55fb37 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <tab_container tab_min_width="60"
                tab_max_width="150"
-               tab_top_image_unselected="tab_top_blue.tga"
-               tab_top_image_selected="tab_top_selected_blue.tga"
+               tab_top_image_unselected="TabTop_Middle_Off"
+               tab_top_image_selected="TabTop_Middle_Selected"
                tab_bottom_image_unselected="tab_bottom_blue.tga"
                tab_bottom_image_selected="tab_bottom_selected_blue.tga"
-               tab_left_image_unselected="tab_left.tga"
-               tab_left_image_selected="tab_left_selected.tga"/>
\ No newline at end of file
+               tab_left_image_unselected="TabTop_Left_Off"
+               tab_left_image_selected="TabTop_Left_Selected"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
index dc4c430546..a613c43f90 100644
--- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<line_editor background_image="sm_rounded_corners_simple.tga"
+<line_editor background_image="TextField_Off"
              select_on_focus="false"
              handle_edit_keys_directly="false"
              commit_on_focus_lost="true"
@@ -15,5 +15,5 @@
              name="line_editor"
              font="SansSerifSmall">
   <line_editor.border bevel_style="in"
-                      follows="all"/>
+                      follows="all" />
 </line_editor>