summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_sys_well.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_avatar_list_item.xml152
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_roles.xml38
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml17
-rw-r--r--indra/newview/skins/default/xui/en/panel_places.xml15
-rw-r--r--indra/newview/skins/default/xui/en/panel_toast.xml4
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml1
-rw-r--r--indra/newview/skins/default/xui/en/widgets/filter_editor.xml24
-rw-r--r--indra/newview/skins/default/xui/en/widgets/flat_list_view.xml7
-rw-r--r--indra/newview/skins/default/xui/en/widgets/search_editor.xml3
11 files changed, 128 insertions, 138 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index 37c6cbf391..e94ca1b30b 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -25,6 +25,8 @@
Fetched
</floater.string>
<filter_editor
+ search_button_visible="false"
+ text_pad_left="12"
follows="left|top|right"
height="16"
label="Type here to search"
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index d76ea398d5..76b2e5c811 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater
- background_opaque="false"
- background_visible="true"
bevel_style="in"
- bg_alpha_color="0.0 0.0 0.0 0.0"
left="0"
top="0"
follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 3de3365539..f211ae0ad6 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -1,65 +1,89 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- All our XML is utf-8 encoded. -->
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
- name="avatar_list_item"
- title="avatar_list_item"
- visible="true"
- width="314"
- height="30"
- left="0"
- top="100"
- follows="bottom|right|left"
- min_width="150"
- max_height="30"
-
- background_opaque="false"
- background_visible="true"
- bevel_style="in"
- bg_alpha_color="0.3 0.3 0.3 1.0">
-
- <avatar_icon
- bottom="5" left="5" width="20" height="20" follows="top|left"
- color="1 1 1 1" enabled="true" image_name="smile.png"
- mouse_opaque="true" name="avatar_icon"
- />
-
- <text
- bottom="4" left="35" width="160" height="20" follows="right|left"
- font="SansSerifBigBold" text_color="white"
- mouse_opaque="true" name="user_name" >
- Boris Linden
- </text>
-
- <text
- bottom="3" left="190" width="40" height="20" follows="right"
- font="SansSerif" text_color="0.5 0.5 0.5 1.0"
- mouse_opaque="true" name="user_status" >
- Away
- </text>
-
- <icon
- bottom="5" left="230" width="20" height="20" follows="right"
- color="1 1 1 1" enabled="true" image_name="speaking_indicator.tga"
- mouse_opaque="true" name="locator"
- />
-
- <button
- bottom="5" left="260" width="20" height="20" follows="right"
- name="info_btn" label=""
- image_unselected="avatar_info_btn.tga" image_disabled="avatar_info_btn.tga"
- image_selected="avatar_info_btn_active.tga" image_hover_selected="avatar_info_btn_active.tga"
- image_disabled_selected="avatar_info_btn.tga" font="SansSerifBigBold"
- />
-
- <button
- bottom="5" left="290" width="20" height="20" follows="right"
- name="profile_btn" label=""
- image_unselected="profile_chevron_btn.tga" image_disabled="profile_chevron_btn.tga"
- image_selected="profile_chevron_btn_active.tga" image_hover_selected="profile_chevron_btn_active.tga"
- image_disabled_selected="profile_chevron_btn.tga" font="SansSerifBigBold"
- />
-
-
-
-</panel>
+ follows="top|right|left"
+ height="24"
+ layout="topleft"
+ left="0"
+ name="avatar_list_item"
+ top="0"
+ width="320">
+ <icon
+ follows="top|right|left"
+ height="24"
+ image_name="ListItem_Over"
+ layout="topleft"
+ left="0"
+ name="hovered_icon"
+ top="0"
+ visible="false"
+ width="320" />
+ <icon
+ height="24"
+ follows="top|right|left"
+ image_name="ListItem_Select"
+ layout="topleft"
+ left="0"
+ name="selected_icon"
+ top="0"
+ visible="false"
+ width="320" />
+ <avatar_icon
+ follows="top|left"
+ height="20"
+ image_name="smile.png"
+ layout="topleft"
+ left="5"
+ mouse_opaque="true"
+ top="2"
+ width="20" />
+ <text
+ follows="left|right"
+ font="SansSerifBigBold"
+ height="20"
+ layout="topleft"
+ left_pad="5"
+ name="avatar_name"
+ text_color="white"
+ top="4"
+ use_ellipses="true"
+ value="Unknown"
+ width="180" />
+ <text
+ follows="right"
+ font="SansSerif"
+ height="20"
+ layout="topleft"
+ left_pad="10"
+ name="avatar_status"
+ text_color="0.5 0.5 0.5 1"
+ value="Away"
+ width="50" />
+ <output_monitor
+ auto_update="true"
+ follows="right"
+ draw_border="false"
+ halign="left"
+ height="16"
+ layout="topleft"
+ left_pad="3"
+ mouse_opaque="true"
+ name="speaking_indicator"
+ top="4"
+ visible="true"
+ width="20" />
+ <button
+ follows="right"
+ font="SansSerifBigBold"
+ height="18"
+ image_disabled="Info"
+ image_disabled_selected="Info"
+ image_hover_selected="Info"
+ image_selected="Info"
+ image_unselected="Info"
+ layout="topleft"
+ left_pad="2"
+ name="info_btn"
+ picture_style="true"
+ top="2"
+ width="18" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 9ae165cbb9..7b8bd8b337 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -185,7 +185,7 @@
Select multiple Members by holding the Ctrl key and
clicking on their names.
</panel.string>
- <search_editor
+ <filter_editor
layout="topleft"
top="10"
left="4"
@@ -193,17 +193,9 @@ clicking on their names.
height="20"
follows="left|top|right"
max_length="250"
- label="Filter People"
+ label="Filter Members"
name="filter_input"
- font="SansSerif"
- background_image="TextField_Search_Off"
- text_pad_left="10"
- text_color="black">
- <search_button label=""
- top_pad="4"
- left_pad="6"
- />
- </search_editor>
+ font="SansSerif" />
<!--<line_editor
border_style="line"
border_thickness="1"
@@ -318,7 +310,7 @@ including the Everyone and Owner Roles.
name="power_partial_icon">
checkbox_enabled_false.tga
</panel.string>
- <search_editor
+ <filter_editor
layout="topleft"
top="10"
left="4"
@@ -328,15 +320,7 @@ including the Everyone and Owner Roles.
max_length="250"
label="Filter Roles"
name="filter_input"
- font="SansSerif"
- background_image="TextField_Search_Off"
- text_pad_left="10"
- text_color="black">
- <search_button label=""
- top_pad="4"
- left_pad="6"
- />
- </search_editor>
+ font="SansSerif" />
<!--<line_editor
border_style="line"
border_thickness="1"
@@ -426,7 +410,7 @@ including the Everyone and Owner Roles.
Abilities allow Members in Roles to do specific
things in this group. There&apos;s a broad variety of Abilities.
</panel.string>
- <search_editor
+ <filter_editor
layout="topleft"
top="10"
left="4"
@@ -436,15 +420,7 @@ things in this group. There&apos;s a broad variety of Abilities.
max_length="250"
label="Filter Abilities"
name="filter_input"
- font="SansSerif"
- background_image="TextField_Search_Off"
- text_pad_left="10"
- text_color="black">
- <search_button label=""
- top_pad="4"
- left_pad="6"
- />
- </search_editor>
+ font="SansSerif" />
<!--<line_editor
border_style="line"
border_thickness="1"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 0af42bfc74..3642b0fec1 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -31,7 +31,6 @@
name="groups_filter_label"
value="Filter Groups" />
<filter_editor
- background_image="TextField_Search_Off"
follows="left|top|right"
font="SansSerif"
height="23"
@@ -40,21 +39,8 @@
max_length="270"
name="filter_input"
text_color="black"
- text_pad_left="26"
top="3"
width="256" />
- <button
- follows="left|top|right"
- height="13"
- image_selected="Search"
- image_unselected="Search"
- layout="topleft"
- left="20"
- name="people_search"
- picture_style="true"
- scale_image="false"
- top="8"
- width="13" />
<tab_container
follows="left|top|right|bottom"
height="326"
@@ -303,7 +289,8 @@
layout="topleft"
name="recent_panel"
width="285">
- <avatar_list
+ <avatar_list_tmp
+ color="DkGray2"
follows="left|top|right|bottom"
height="357"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index bff28718a7..b379ad2276 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -16,7 +16,6 @@
name="teleport_history_tab_title"
value="Teleport History" />
<filter_editor
- background_image="TextField_Search_Off"
follows="left|top|right"
font="SansSerif"
height="23"
@@ -24,22 +23,8 @@
layout="topleft"
left="15"
name="Filter"
- text_color="black"
- text_pad_left="26"
top="3"
width="256" />
- <button
- follows="left|top|right"
- height="13"
- image_selected="Search"
- image_unselected="Search"
- layout="topleft"
- left="20"
- name="landmark_search"
- picture_style="true"
- scale_image="false"
- top="8"
- width="13" />
<tab_container
follows="all"
height="326"
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 441caffa28..01fd84e09d 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -11,8 +11,6 @@
left="100"
top="500"
follows="right|bottom"
- background_opaque="true"
- background_visible="true"
bevel_style="in"
can_minimize="false"
can_tear_off="false"
@@ -20,7 +18,7 @@
can_drag_on_left="false"
can_close="false"
can_dock="false"
- bg_alpha_color="0.3 0.3 0.3 1.0">
+ >
<text
visible="false"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index faed615bdd..4206b87c2b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1818,6 +1818,7 @@ this texture in your inventory
<string name="AnimFlagStart" value=" Start Animation : " />
<string name="Wave" value=" Wave " />
<string name="HelloAvatar" value=" Hello, avatar! " />
+ <string name="ViewAllGestures" value=" View All >>" />
<!-- inventory filter -->
<!-- use value="" because they have preceding spaces -->
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index a34b005448..ada258fbec 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -1,8 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<filter_editor select_on_focus="true"
- background_image_disabled="TextField_Search_Disabled"
- background_image_focused="TextField_Search_Active">
- <clear_filter_button label=""
- image_unselected="Icon_Close_Foreground"
- image_selected="Icon_Close_Press" />
+<filter_editor
+ clear_button_visible="true"
+ search_button_visible="true"
+ text_pad_left="4"
+ select_on_focus="true"
+ background_image="TextField_Search_Off"
+ background_image_disabled="TextField_Search_Disabled"
+ background_image_focused="TextField_Search_Active" >
+ <search_button label=""
+ top_pad="4"
+ left_pad="4"
+ width="13"
+ height="13"
+ image_unselected="Search"
+ image_selected="Search" />
+ <clear_button label=""
+ image_unselected="Icon_Close_Foreground"
+ image_selected="Icon_Close_Press" />
</filter_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
new file mode 100644
index 0000000000..24d072a573
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<flat_list_view
+ allow_select="true"
+ item_pad="5"
+ keep_one_selected="true"
+ multi_select="false"
+ opaque="true" /> \ No newline at end of file
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 8643f919ec..f482ff3b89 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
clear_button_visible="false"
+ search_button_visible="true"
text_pad_left="4"
select_on_focus="true"
background_image="TextField_Search_Off"
@@ -13,7 +14,7 @@
height="13"
image_unselected="Search"
image_selected="Search" />
- <clear_button label=""
+ <clear_button label=""
image_unselected="Icon_Close_Foreground"
image_selected="Icon_Close_Press" />
</search_editor>