diff options
Diffstat (limited to 'indra/newview/skins')
12 files changed, 428 insertions, 62 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index f1976afb4a..6fbfed5f60 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -30,23 +30,18 @@ color="1 1 1 1" enabled="true" image_name="closebox.tga" name="close_btn"/> </panel> - <text_editor + <chat_history allow_html="true" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" - follows="left|top|right|bottom" + follows="left|top|right" font="SansSerif" layout="topleft" - height="320" - max_length="2147483647" - name="Chat History Editor" + height="320" + name="chat_history" parse_highlights="true" - read_only="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" - bottom="0" - track_bottom="true" - width="250" - word_wrap="true" /> + width="250"/> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 6dc08ad3ef..7785492651 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -478,11 +478,12 @@ parameter="open" /> </menu_item_call> <menu_item_separator - layout="topleft" /> + layout="topleft" + name="Landmark Separator" /> <menu_item_call label="About Landmark" layout="topleft" - name="Teleport To Landmark"> + name="About Landmark"> <menu_item_call.on_click function="Inventory.DoToSelected" parameter="about" /> diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml index 64fec3ab40..54a4095967 100644 --- a/indra/newview/skins/default/xui/en/menu_landmark.xml +++ b/indra/newview/skins/default/xui/en/menu_landmark.xml @@ -29,4 +29,12 @@ function="Places.OverflowMenu.Action" parameter="pick" /> </menu_item_call> + <menu_item_call + label="Add to Favorites Bar" + layout="topleft" + name="add_to_favbar"> + <menu_item_call.on_click + function="Places.OverflowMenu.Action" + parameter="add_to_favbar" /> + </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml new file mode 100644 index 0000000000..b31a0d88a4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml @@ -0,0 +1,45 @@ +<menu name="menu_folder_gear" + left="0" bottom="0" visible="false" + mouse_opaque="false" opaque="true" + color="MenuDefaultBgColor" drop_shadow="true"> + <menu_item_call name="add_landmark" label="Add Landmark"> + <menu_item_call.on_click function="Places.LandmarksGear.Add.Action" userdata="add_landmark" /> + </menu_item_call> + <menu_item_call name="add_folder" label="Add Folder"> + <menu_item_call.on_click function="Places.LandmarksGear.Add.Action" userdata="category" /> + <menu_item_call.on_enable function="Places.LandmarksGear.Enable" userdata="category" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call name="cut" label="Cut"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="cut" /> + </menu_item_call> + <menu_item_call name="copy_folder" label="Copy"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="copy" /> + </menu_item_call> + <menu_item_call name="paste" label="Paste"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="paste" /> + <menu_item_call.on_enable function="Places.LandmarksGear.Enable" userdata="paste" /> + </menu_item_call> + <menu_item_call name="rename" label="Rename"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="rename" /> + </menu_item_call> + <menu_item_call name="delete" label="Delete"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="delete" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call name="expand" label="Expand"> + <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="expand" /> + </menu_item_call> + <menu_item_call name="collapse" label="Collapse"> + <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="collapse" /> + </menu_item_call> + <menu_item_call name="expand_all" label="Expand all folders"> + <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="expand_all" /> + </menu_item_call> + <menu_item_call name="collapse_all" label="Collapse all folders"> + <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="collapse_all" /> + </menu_item_call> + <menu_item_call name="sort_by_date" label="Sort by Date"> + <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="sort_by_date" /> + </menu_item_call> +</menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml new file mode 100644 index 0000000000..2d8bb0dcb9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml @@ -0,0 +1,56 @@ +<menu name="menu_ladmark_gear" + left="0" bottom="0" visible="false" + mouse_opaque="false" opaque="true" + color="MenuDefaultBgColor" drop_shadow="true"> + <menu_item_call name="teleport" label="Teleport"> + <menu_item_call.on_click function="Places.LandmarksGear.Custom.Action" userdata="teleport" /> + </menu_item_call> + <menu_item_call name="more_info" label="More Information"> + <menu_item_call.on_click function="Places.LandmarksGear.Custom.Action" userdata="more_info" /> + </menu_item_call> + <menu_item_call name="show_on_map" label="Show on Map"> + <menu_item_call.on_click function="Places.LandmarksGear.Custom.Action" userdata="show_on_map" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call name="add_landmark" label="Add Landmark"> + <menu_item_call.on_click function="Places.LandmarksGear.Add.Action" userdata="add_landmark" /> + </menu_item_call> + <menu_item_call name="add_folder" label="Add Folder"> + <menu_item_call.on_click function="Places.LandmarksGear.Add.Action" userdata="category" /> + <menu_item_call.on_enable function="Places.LandmarksGear.Enable" userdata="category" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call name="cut" label="Cut"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="cut" /> + </menu_item_call> + <menu_item_call name="copy_landmark" label="Copy Landmark"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="copy" /> + </menu_item_call> + <menu_item_call name="copy_slurl" label="Copy SLURL"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="copy_slurl" /> + </menu_item_call> + <menu_item_call name="paste" label="Paste"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="paste" /> + <menu_item_call.on_enable function="Places.LandmarksGear.Enable" userdata="paste" /> + </menu_item_call> + <menu_item_call name="rename" label="Rename"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="rename" /> + </menu_item_call> + <menu_item_call name="delete" label="Delete"> + <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="delete" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call name="expand_all" label="Expand all folders"> + <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="expand_all" /> + </menu_item_call> + <menu_item_call name="collapse_all" label="Collapse all folders"> + <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="collapse_all" /> + </menu_item_call> + <menu_item_call name="sort_by_date" label="Sort by Date"> + <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="sort_by_date" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call name="create_pick" label="Create Pick"> + <menu_item_call.on_click function="Places.LandmarksGear.Custom.Action" userdata="create_pick" /> + </menu_item_call> +</menu> 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 f7f08b9b6a..69d90e4c7d 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,12 +38,13 @@ width="20" /> <text follows="left|right" - font="SansSerifSmallBold" + font="SansSerifSmall" + font.style="BOLD" height="20" layout="topleft" left_pad="5" name="avatar_name" - text_color="white" + text_color="grey" top="4" use_ellipses="true" value="Unknown" diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml new file mode 100644 index 0000000000..a9f622e018 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|top|right" + height="57" + label="im_header_container" + layout="topleft" + left="8" + name="im_header_container"> + <panel + background_visible="true" + bevel_style="in" + bg_alpha_color="black" + follows="left|top|right" + height="30" + label="im_header" + layout="topleft" + name="im_header" + top_pad="17"> + <avatar_icon + follows="left" + height="20" + image_name="icon_avatar_online.tga" + layout="topleft" + left="5" + mouse_opaque="true" + name="avatar_icon" + top="5" + width="20" /> + <text + follows="left|right" + font="SansSerifBigBold" + height="20" + layout="topleft" + left_pad="10" + right="-50" + name="user_name" + text_color="white" + top="5" + value="Darth Vader" + use_ellipses="true" /> + <text + follows="right" + font="SansSerifBig" + height="20" + layout="topleft" + name="time_box" + right="0" + text_color="white" + top="5" + value="23:30" + width="50" /> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml new file mode 100644 index 0000000000..dd27595cdb --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|right|top" + height="10" + layout="topleft" + left="8" + name="chat_separator_container"> + <panel + background_visible="true" + bg_alpha_color="black" + follows="left|right|top" + height="1" + layout="topleft" + name="chat_separator_panel" + top_pad="5" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index ae33d6da3e..7c7561f922 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -1,35 +1,143 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="Landmarks" - bottom="0" - height="326" + top="0" + height="400" + layout="topleft" left="0" width="380" border="true" background_visible="true" bg_alpha_color="DkGray2" follows="left|top|right|bottom"> - <inventory_panel - allow_multi_select="true" - border="true" - bottom="0" - follows="left|top|right|bottom" - height="326" - left="0" - mouse_opaque="true" - name="landmarks_list" - start_folder="landmark" - width="380"/> - <button - bottom="0" - halign="center" - height="16" - label=">" - enabled="false" - mouse_opaque="false" - name="selector" - width="20" - left="0" - follows="right|bottom" - tool_tip="View landmark properties"/> + <accordion + follows="left|top|right|bottom" + height="368" + layout="topleft" + left="0" + name="landmarks_accordion" + top="2" + width="380"> + <accordion_tab + layout="topleft" + name="tab_favorites" + title="Favorites bar"> + <inventory_subtree_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="126" + left="0" + mouse_opaque="true" + name="favorites_list" + width="380"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_landmarks" + title="Landmarks"> + <inventory_subtree_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="126" + left="0" + mouse_opaque="true" + name="landmarks_list" + start_folder="landmark" + width="380"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_inventory" + title="My Inventory"> + <inventory_subtree_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="126" + left="0" + mouse_opaque="true" + name="my_inventory_list" + width="380"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_library" + title="Library"> + <inventory_subtree_panel + allow_multi_select="true" + border="true" + bottom="0" + follows="left|top|right|bottom" + height="120" + left="0" + mouse_opaque="true" + name="library_list" + width="380"/> + </accordion_tab> + </accordion> + <panel + background_visible="true" + bevel_style="none" + bottom="0" + follows="left|right|bottom" + height="30" + layout="bottomleft" + left="0" + name="bottom_panel" + width="380"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="10" + name="options_gear_btn" + picture_style="true" + top="6" + width="18" /> + <button + follows="bottom|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="5" + name="add_landmark_btn" + picture_style="true" + tool_tip="Add New Landmark" + width="18" /> + <button + follows="bottom|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="5" + name="add_folder_btn" + picture_style="true" + tool_tip="Add New Folder" + width="18" /> + <button + follows="bottom|right" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + right="-5" + name="trash_btn" + picture_style="true" + tool_tip="Remove selected Landmark" + top="6" + width="18" /> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml new file mode 100644 index 0000000000..4d890b1d46 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_opaque="true" + background_visible="false" + bg_alpha_color="0.3 0.3 0.3 0" + height="140" + label="notification_panel" + layout="topleft" + left="0" + name="notification_panel" + top="0" + width="350"> + <panel + background_visible="true" + follows="left|right|top" + height="100" + label="info_panel" + layout="topleft" + left="0" + name="info_panel" + top="0" + width="350"> + <text + border_visible="false" + follows="left|right|top|bottom" + font="SansSerif" + height="90" + layout="topleft" + left="45" + name="text_box" + read_only="true" + text_color="white" + top="5" + visible="false" + width="300" + wrap="true"/> + <text + border_visible="false" + follows="left|right|top|bottom" + font="SansSerifBold" + height="90" + layout="topleft" + left="45" + name="caution_text_box" + text_color="1 0.82 0.46 1" + top="5" + visible="false" + width="300" + wrap="true"/> + <text_editor + bg_readonly_color="0.0 0.0 0.0 0" + border_visible="false" + embedded_items="false" + enabled="false" + follows="left|right|top|bottom" + font="SansSerif" + height="90" + layout="topleft" + left="45" + mouse_opaque="false" + name="text_editor_box" + read_only="true" + tab_stop="false" + text_color="white" + text_readonly_color="white" + top="5" + visible="false" + width="300" + wrap="true"/> + </panel> + <panel + background_visible="true" + follows="left|right|bottom" + height="40" + label="control_panel" + layout="topleft" + left="0" + name="control_panel" + top_pad="0" + width="350"> + </panel> + <icon + follows="left|top" + height="32" + image_name="notify_tip_icon.tga" + layout="topleft" + left="8" + mouse_opaque="false" + name="info_icon" + top="20" + width="32" /> +</panel> 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 b0cd75117f..4169c6245b 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,15 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="Teleport History" bottom="0" height="326" left="0" width="380" border="true" follows="left|top|right|bottom"> - <string - name="cant_create_lm_here" - value="Please teleport to selected location before creating Landmark. " /> - <string - name="create_landmark" - value="Create Landmark" /> - <string - name="open_landmark" - value="Open Landmark panel" /> <accordion follows="left|top|right|bottom" height="300" @@ -188,19 +179,5 @@ picture_style="true" top="5" width="18" /> - <button - follows="bottom|left" - font="SansSerifBigBold" - height="18" - image_selected="Favorite_Star_Active" - image_disabled="Favorite_Star_Off" - image_unselected="Favorite_Star_Press" - layout="topleft" - left_pad="5" - name="star_btn" - picture_style="true" - tool_tip="" - top_delta="0" - width="18" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml new file mode 100644 index 0000000000..b72d59524e --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<chat_history + message_header="panel_chat_header.xml" + message_separator="panel_chat_separator.xml" + left_text_pad="10" + right_text_pad="15" + left_widget_pad="5" + rigth_widget_pad="10" + max_length="2147483647" + enabled="false" + track_bottom="true" + name="chat_history" + type="string" + word_wrap="true" />
\ No newline at end of file |