diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
31 files changed, 504 insertions, 193 deletions
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index e2f81168fa..dcd85e1f58 100644 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -6,9 +6,13 @@ halign="center" height="23" image_disabled="transparent.j2c" - image_disabled_selected="PushButton_Selected" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" + image_disabled_selected="transparent.j2c" + image_selected="transparent.j2c" + image_unselected="transparent.j2c" + image_hover_selected="PushButton_Selected" + image_hover_unselected="PushButton_Off" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" hover_glow_amount="0.15" layout="topleft" left="2" diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 1592ed4aa4..0784b88944 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + can_dock="true" can_minimize="false" can_close="false" center_horiz="true" @@ -29,6 +30,7 @@ layout="topleft" left="0" top="0" + mouse_opaque="false" name="controls" width="105"> <joystick_rotate @@ -67,7 +69,7 @@ height="64" image_unselected="cam_zoom_out.tga" layout="topleft" - left_delta="74" + left_delta="70" minus_image="cam_zoom_minus_in.tga" name="zoom" picture_style="true" diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index a5d76821a8..be1278e8cc 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -9,7 +9,7 @@ help_topic="panel_im" top="0" can_dock="true" - can_minimize="false" + can_minimize="true" visible="true" width="315"> <layout_stack follows="left|top|right|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index dc0ff7ac4c..82acea47be 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + can_dock="true" can_close="false" can_minimize="false" center_horiz="true" @@ -41,6 +42,7 @@ follows="left|top" layout="topleft" left="0" + mouse_opaque="false" name="panel_actions" top="0" width="115"> @@ -95,7 +97,7 @@ scale_image="false" tool_tip="Fly Down, Press "C"" top_delta="0" - width="25" /> + width="20" /> <joystick_turn follows="left|bottom" height="25" 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 3f31641cac..30406cad63 100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -11,7 +11,7 @@ title="NOTIFICATIONS" width="320" min_width="320" - height="60" + height="23" can_minimize="false" can_tear_off="false" can_resize="false" @@ -19,36 +19,13 @@ can_close="false" can_dock="true" > - <scroll_container - follows="top|bottom" + <flat_list_view + color="FloaterDefaultBackgroundColor" + follows="all" layout="topleft" - name="notification_list_container" - left="0" - top="18" - width="320" - height="42"> - <panel - layout="topleft" - name="twin_list_panel" - left="1" - top="0" - width="318" - height="32" - bg_alpha_color="1.0 1.0 1.0 1.0"> - <scrolling_panel_list - layout="topleft" name="notification_list" left="1" - top="0" + top="20" height="0" width="318"/> - <scrolling_panel_list - layout="topleft" - name="im_row_panel_list" - left="1" - top="2" - height="0" - width="318"/> - </panel> -</scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml new file mode 100644 index 0000000000..e98920f8c2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="201" + layout="topleft" + left="100" + mouse_opaque="false" + name="hide_camera_move_controls_menu" + top="624" + visible="false" + width="128"> + <menu_item_check + label="Gesture button" + layout="topleft" + name="ShowGestureButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowGestureButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowGestureButton" /> + </menu_item_check> + <menu_item_check + label="Move button" + layout="topleft" + name="ShowMoveButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowMoveButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowMoveButton" /> + </menu_item_check> + <menu_item_check + label="Camera button" + layout="topleft" + name="ShowCameraButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowCameraButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowCameraButton" /> + </menu_item_check> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml index 1ad10abbeb..a175b3103f 100644 --- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml @@ -11,23 +11,23 @@ <menu_item_check label="Show Navigation Bar" layout="topleft" - name="Show Navigation Bar"> + name="ShowNavbarNavigationPanel"> <menu_item_check.on_click - function="HideNavbarMenu.Action" - parameter="show_navbar_navigation_panel" /> + function="ToggleControl" + parameter="ShowNavbarNavigationPanel" /> <menu_item_check.on_check - function="HideNavbarMenu.EnableMenuItem" - parameter="show_navbar_navigation_panel" /> + function="CheckControl" + parameter="ShowNavbarNavigationPanel" /> </menu_item_check> <menu_item_check label="Show Favorites Bar" layout="topleft" - name="Show Favorites Bar"> + name="ShowNavbarFavoritesPanel"> <menu_item_check.on_click - function="HideNavbarMenu.Action" - parameter="show_navbar_favorites_panel" /> + function="ToggleControl" + parameter="ShowNavbarFavoritesPanel" /> <menu_item_check.on_check - function="HideNavbarMenu.EnableMenuItem" - parameter="show_navbar_favorites_panel" /> + function="CheckControl" + parameter="ShowNavbarFavoritesPanel" /> </menu_item_check> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml new file mode 100644 index 0000000000..ec8582f5b5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + <menu_item_check + label="Display Group Icons" + layout="topleft" + name="Display Group Icons"> + <menu_item_check.on_click + function="People.Groups.ViewSort.Action" + parameter="show_icons" /> + <menu_item_check.on_check + function="CheckControl" + parameter="GroupListShowIcons" /> + </menu_item_check> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml new file mode 100644 index 0000000000..643336cf6c --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Avatar Context Menu"> + <menu_item_call + label="View Profile" + layout="topleft" + name="View Profile"> + <menu_item_call.on_click + function="Avatar.Profile" /> + </menu_item_call> + <menu_item_call + label="Add Friend" + layout="topleft" + name="Add Friend"> + <menu_item_call.on_click + function="Avatar.AddFriend" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_add" /> + </menu_item_call> + <menu_item_call + label="IM" + layout="topleft" + name="IM"> + <menu_item_call.on_click + function="Avatar.IM" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Call" + layout="topleft" + name="Call"> + <menu_item_call.on_click + function="Avatar.Call" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Share" + layout="topleft" + name="Share"> + <menu_item_call.on_click + function="Avatar.Share" /> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="Pay"> + <menu_item_call.on_click + function="Avatar.Pay" /> + </menu_item_call> + <menu_item_check + label="Block/Unblock" + layout="topleft" + name="Block/Unblock"> + <menu_item_check.on_click + function="Avatar.BlockUnblock" /> + <menu_item_check.on_check + function="Avatar.CheckItem" + parameter="is_blocked" /> + <menu_item_check.on_enable + function="Avatar.EnableItem" + parameter="can_block" /> + </menu_item_check> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml index 88b0528e53..d9606de90d 100644 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -2,8 +2,8 @@ <menu name="menu_group_plus" left="0" bottom="0" visible="false" mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> - <menu_item_call name="sort_most" label="Sort by Most Speakers"> - <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_most" /> + <menu_item_call name="sort_most" label="Sort by Most Recent"> + <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_recent" /> </menu_item_call> <menu_item_call name="sort_name" label="Sort by Name"> <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_name" /> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index b430de2b7b..bc51ba5e6a 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -127,12 +127,14 @@ <menu_item_call.on_click function="World.SetAway" /> </menu_item_call> + <menu_item_separator + layout="topleft"/> <menu_item_call label="Set Busy" layout="topleft" name="Set Busy"> <menu_item_call.on_click - function="World.SetBusy" /> + function="World.SetBusy"/> </menu_item_call> </menu> <menu_item_separator @@ -381,7 +383,7 @@ <menu_item_check.on_click function="Floater.Toggle" parameter="world_map" /> - </menu_item_check> + </menu_item_check> <menu_item_check label="Mini-Map" layout="topleft" @@ -395,7 +397,31 @@ parameter="mini_map" /> </menu_item_check> <menu_item_separator - layout="topleft" /> + layout="topleft" /> + <menu_item_check + label="Show Navigation Bar" + layout="topleft" + name="ShowNavbarNavigationPanel"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowNavbarNavigationPanel" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowNavbarNavigationPanel" /> + </menu_item_check> + <menu_item_check + label="Show Favorites Bar" + layout="topleft" + name="ShowNavbarFavoritesPanel"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowNavbarFavoritesPanel" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowNavbarFavoritesPanel" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> <menu_item_call label="Take Snapshot" layout="topleft" @@ -466,8 +492,6 @@ parameter="editor" /> </menu_item_call> </menu> - <menu_item_separator - layout="topleft" /> </menu> <menu create_jump_keys="true" 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 f211ae0ad6..d5ed0c986d 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 @@ -38,7 +38,7 @@ width="20" /> <text follows="left|right" - font="SansSerifBigBold" + font="SansSerifSmallBold" height="20" layout="topleft" left_pad="5" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 6449059ef0..90b331a39f 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - mouse_opaque="false" + mouse_opaque="true" background_visible="true" bg_alpha_color="0.25 0.25 0.25 1" bg_opaque_color="0.25 0.25 0.25 1" @@ -36,13 +36,13 @@ width="5"/> <layout_panel mouse_opaque="false" - auto_resize="false" + auto_resize="true" follows="left|right" height="28" layout="topleft" left="5" min_height="28" - width="600" + width="450" top="0" min_width="305" name="chat_bar" @@ -110,46 +110,13 @@ name="cam_panel" top_delta="-10" width="150"> - <split_button - follows="right" - height="18" - name="presets" - top="6" - width="35"> - <split_button.arrow_button - image_selected="camera_presets/camera_presets_arrow.png" - image_unselected="camera_presets/camera_presets_arrow.png" - image_disabled_selected="camera_presets/camera_presets_arrow.png" - image_disabled="camera_presets/camera_presets_arrow.png" - name="camera_presets" - tool_tip="Camera Presets" - /> - <split_button.item - image_selected="camera_presets/camera_presets_rear_view.png" - image_unselected="camera_presets/camera_presets_rear_view.png" - name="rear_view" - tool_tip="Rear View" - /> - <split_button.item - image_selected="camera_presets/camera_presets_34_view.png" - image_unselected="camera_presets/camera_presets_34_view.png" - name="group_view" - tool_tip="Group View" - /> - <split_button.item - image_selected="camera_presets/camera_presets_fron_view.png" - image_unselected="camera_presets/camera_presets_fron_view.png" - name="front_view" - tool_tip="Front View" - /> - </split_button> <button follows="right" height="20" is_toggle="true" - label="Camera" + label="View" layout="topleft" - left_pad="0" + left="0" tab_stop="false" tool_tip="Shows/Hide Camera controls" top="6" @@ -159,11 +126,28 @@ function="Button.SetFloaterToggle" parameter="camera" /> </button> + <button + follows="right" + name="camera_presets_btn" + top="6" + height="20" + width="20" + left_pad="0" + tab_stop="false" + is_toggle="true" + picture_style="true" + image_selected="toggle_button_selected" + image_unselected="toggle_button_off"> + <button.init_callback + function="Button.SetFloaterToggle" + parameter="camera_presets" + /> + </button> <split_button arrow_position="right" follows="right" height="18" - left_pad="0" + left_pad="4" name="snapshots" top="6" width="35"> diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 311caa4866..c4c8aa24c4 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -16,7 +16,10 @@ name="want_apply_text"> Do you want to apply these changes? </panel.string> - + <panel.string + name="group_join_btn"> + Join (L$[AMOUNT]) + </panel.string> <button layout="topleft" name="back" @@ -39,6 +42,18 @@ follows="top|left|right" mouse_opaque="true" name="group_name">(Loading...)</text> + <line_editor + follows="left|top" + font="SansSerif" + label="Type your new group name here" + layout="topleft" + left_delta="0" + max_length="35" + name="group_name_editor" + top_delta="5" + width="250" + height="20" + visible="true" /> <texture_picker follows="left|top" height="113" @@ -47,7 +62,7 @@ left="10" name="insignia" tool_tip="Click to choose a picture" - top_pad="15" + top_pad="5" width="100" /> <text type="string" @@ -72,11 +87,21 @@ use_ellipses="true" width="140" /> <button + follows="left|top" + left_delta="0" + top_pad="10" + height="20" + label="Join" + label_selected="Join" + name="btn_join" + visible="true" + width="65" /> + <button top="632" height="20" font="SansSerifSmall" - label="Apply" - label_selected="Apply" + label="Save" + label_selected="Save" name="btn_apply" left="5" width="65" /> @@ -93,13 +118,21 @@ <button top="632" height="20" - font="SansSerifSmall" label="Create" label_selected="Create" name="btn_create" left="5" visible="false" width="65" /> + <button + top="632" + left="75" + height="20" + label="Cancel" + label_selected="Cancel" + name="btn_cancel" + visible="false" + width="65" /> <accordion layout="topleft" left="2" width="296" top="135" height="500" follows="all" name="group_accordion"> <accordion_tab min_height="445" title="Group General" name="group_general_tab"> <panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/> diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml new file mode 100644 index 0000000000..3f49bfad36 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="24" + layout="topleft" + left="0" + name="group_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" /> + <icon + follows="top|left" + height="18" + image_name="icon_group.tga" + layout="topleft" + left="5" + mouse_opaque="true" + name="group_icon" + top="4" + width="18" /> + <text + follows="left|right" + font="SansSerifSmall" + height="17" + layout="topleft" + left_pad="5" + name="group_name" + text_color="white" + top="7" + use_ellipses="true" + value="Unknown" + width="263" /> + <button + follows="right" + height="18" + image_disabled="Info" + image_disabled_selected="Info" + image_hover_selected="Info" + image_selected="Info" + image_unselected="Info" + layout="topleft" + name="info_btn" + picture_style="true" + right="-5" + top="4" + width="18" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml index ace456918c..7db1b9e916 100644 --- a/indra/newview/skins/default/xui/en/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml @@ -33,7 +33,17 @@ layout="topleft" left="5" mouse_opaque="true" - name="avatar" + name="avatar_icon" + top="5" + width="20" /> + <icon + follows="right" + height="20" + image_name="icon_top_pick.tga" + layout="topleft" + left="5" + mouse_opaque="true" + name="sys_msg_icon" top="5" width="20" /> <text diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 13ceab7604..1178d75b2c 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -135,6 +135,7 @@ layout="topleft" left="5" name="favorite" + image_drag_indication="Arrow_Down" chevron_button_tool_tip="Show more of My Favorites" top="32" width="590" /> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 132a2d1dc5..786c39c5e9 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -127,7 +127,6 @@ color="DkGray" name="tab_online" title="Online"> <avatar_list - draw_heading="false" follows="all" height="150" layout="topleft" @@ -143,7 +142,6 @@ color="DkGray" name="tab_all" title="All"> <avatar_list - draw_heading="false" follows="all" height="230" layout="topleft" @@ -219,7 +217,6 @@ color="DkGray" name="groups_panel" width="313"> <group_list - draw_heading="false" follows="left|top|right|bottom" height="357" layout="topleft" @@ -240,7 +237,6 @@ color="DkGray" name="bottom_panel" width="313"> <button - enabled="false" follows="bottom|left" font="SansSerifBigBold" tool_tip="Change sort and view of Groups list" @@ -250,7 +246,7 @@ color="DkGray" image_unselected="OptionsMenu_Off" layout="topleft" left="10" - name="gear_btn" + name="groups_viewsort_btn" picture_style="true" top="5" width="18" /> @@ -307,7 +303,7 @@ color="DkGray" layout="topleft" name="recent_panel" width="313"> - <avatar_list_tmp + <avatar_list color="DkGray2" follows="left|top|right|bottom" height="357" diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 37e873b6a8..686faab8eb 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -9,6 +9,7 @@ top="0" width="305"> <icon + follows="top|bottom|left|right" height="120" image_name="ListItem_Over" left="0" @@ -19,6 +20,7 @@ visible="false" width="305"/> <icon + follows="top|bottom|left|right" height="120" image_name="ListItem_Select" left="0" diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index bceaedcdb4..d0bde77cf2 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -8,24 +8,16 @@ name="panel_picks" top="0" width="313"> - <scroll_container + <flat_list_view color="DkGray2" follows="left|top|right|bottom" height="495" layout="topleft" left="0" - name="profile_scroll" + name="picks_list" opaque="true" top="0" - width="313"> - <list - height="120" - layout="topleft" - left="0" - name="picks_list" - top="0" - width="305" /> - </scroll_container> + width="313" /> <panel background_visible="true" bevel_style="none" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 7f72c7b0e9..56ba5970f2 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -72,15 +72,16 @@ top_delta="0" value="[SECOND_LIFE]:" width="170" /> - <text + <expandable_text follows="left|top|right" height="90" layout="topleft" name="sl_description_edit" width="170" - word_wrap="true"> + expanded_bg_visible="true" + expanded_bg_color="black"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </text> + </expandable_text> </panel> <panel follows="left|top" @@ -112,15 +113,16 @@ top_delta="0" value="Real World:" width="175" /> - <text + <expandable_text follows="left|top|right" height="90" layout="topleft" name="fl_description_edit" width="180" - word_wrap="true"> + expanded_bg_visible="true" + expanded_bg_color="black"> Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </text> + </expandable_text> </panel> <text type="string" diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml index a5c3be3349..f25c4bfbba 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml @@ -4,6 +4,7 @@ bottom="0" follows="left|top|right" height="30" + width="305" layout="topleft" left="0" name="sidetray_tab_panel"> diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml index 3ac15fe550..53ee0d159d 100644 --- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml @@ -4,7 +4,7 @@ <panel name="sys_well_item" title="sys_well_item" - visible="false" + visible="true" top="0" left="0" width="318" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index 70198dc626..a0fc986423 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -13,10 +13,9 @@ <accordion_tab can_resize="false" layout="topleft" - min_height="100" name="today" title="Today"> - <scroll_list + <flat_list_view draw_heading="false" follows="all" height="150" @@ -24,20 +23,16 @@ left="0" name="today_items" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> <accordion_tab can_resize="false" layout="topleft" - min_height="100" name="yesterday" title="Yesterday"> - <scroll_list + <flat_list_view draw_heading="false" follows="all" height="150" @@ -45,20 +40,33 @@ left="0" name="yesterday_items" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> + </accordion_tab> + + <accordion_tab + can_resize="false" + layout="topleft" + name="2_days_ago" + title="2 days ago"> + <flat_list_view + draw_heading="false" + follows="all" + height="150" + layout="topleft" + left="0" + name="2_days_ago" + top="0" + width="380"> + </flat_list_view> </accordion_tab> <accordion_tab can_resize="false" layout="topleft" - min_height="100" name="3_days_ago" title="3 days ago"> - <scroll_list + <flat_list_view draw_heading="false" follows="all" height="150" @@ -66,20 +74,16 @@ left="0" name="3_days_ago" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> <accordion_tab can_resize="false" layout="topleft" - min_height="100" name="4_days_ago" title="4 days ago"> - <scroll_list + <flat_list_view draw_heading="false" follows="all" height="150" @@ -87,20 +91,16 @@ left="0" name="4_days_ago" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> <accordion_tab can_resize="false" layout="topleft" - min_height="100" name="5_days_ago" title="5 days ago"> - <scroll_list + <flat_list_view draw_heading="false" follows="all" height="150" @@ -108,55 +108,59 @@ left="0" name="5_days_ago_items" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> <accordion_tab can_resize="false" layout="topleft" - min_height="100" - name="6_days_ago" - title="6 days ago"> - <scroll_list + name="6_days_and_older" + title="6 days and older"> + <flat_list_view draw_heading="false" follows="all" height="150" layout="topleft" left="0" - name="6_days_ago" + name="6_days_and_older_items" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> - + <accordion_tab can_resize="false" layout="topleft" - min_height="100" - name="older_than_6_days" - title="Older than 6 days"> - <scroll_list + name="1_month_and_older" + title="1 month and older"> + <flat_list_view draw_heading="false" follows="all" height="150" layout="topleft" left="0" - name="older_than_6_days_items" + name="1_month_and_older_items" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> - + + <accordion_tab + can_resize="false" + layout="topleft" + name="6_months_and_older" + title="6 months and older"> + <flat_list_view + draw_heading="false" + follows="all" + height="150" + layout="topleft" + left="0" + name="6_months_and_older_items" + top="0" + width="380"> + </flat_list_view> + </accordion_tab> </accordion> - </panel> diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml new file mode 100644 index 0000000000..bb37f43220 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="20" + layout="topleft" + left="0" + name="teleport_history_item" + top="0" + width="380"> + <icon + follows="top|right|left" + height="20" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="0" + visible="false" + width="380" /> + <icon + height="20" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="0" + visible="false" + width="380" /> + <icon + height="20" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="landmark_icon" + top="0" + visible="false" + width="20" /> + <text + follows="left|right" + height="20" + layout="topleft" + left_pad="5" + name="region" + text_color="white" + top="4" + value="Unknown" + width="380" /> + <button + follows="right" + height="18" + image_disabled="Info" + image_disabled_selected="Info" + image_hover_selected="Info" + image_selected="Info" + image_unselected="Info" + layout="topleft" + name="info_btn" + picture_style="true" + visible="false" + right="-5" + top="2" + width="18" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2eb9ba6d07..13a53a4ce3 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1819,7 +1819,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 >>" /> + <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/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml new file mode 100644 index 0000000000..bcfc2f6472 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<expandable_text + max_height="300" > + <textbox + follows="left|top" + name="text" + use_ellipses="true" + word_wrap="true" + tab_stop="true" + v_pad="2" + h_pad="3" > + <expand_textbox + name="expand" + follows="bottom|right" + visible="false" + bg_visible="false" + tab_stop="false" + v_pad="0" + h_pad="0" + text="[http://www.DUMMY.com More]" + tool_tip="Click to expand text"/> + </textbox> + <scroll + name="scroll" + follows="all" + /> +</expandable_text>
\ No newline at end of file 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 index 24d072a573..8078579806 100644 --- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml +++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <flat_list_view allow_select="true" - item_pad="5" + color="DkGray2" + item_pad="0" 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/list.xml b/indra/newview/skins/default/xui/en/widgets/list.xml deleted file mode 100644 index 4a59716464..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/list.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<list - allow_select="true" - bg_opaque_color="PanelFocusBackgroundColor" - bg_alpha_color="PanelDefaultBackgroundColor" - background_visible="false" - background_opaque="false" - item_pad="5" - keep_one_selected="true" - multi_select="false" />
\ No newline at end of file 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 a37ed76c51..df8a9431d7 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -44,7 +44,8 @@ label="" pad_right="0" tool_tip="My Location History"/> - <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"/> + <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10" + scroll_bar_bg_visible="true" /> <combo_editor name="Combo Text Entry" text_pad_left="20" select_on_focus="false" diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index a037d4904b..cb876da8d8 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml @@ -13,4 +13,6 @@ background_visible="false" heading_height="23" draw_border="false" - draw_heading="false" /> + draw_heading="false" + scroll_bar_bg_visible="false" + scroll_bar_bg_color="black" /> |