From 1bb46c7384f6532da8f0315f61b8613bd0b9b717 Mon Sep 17 00:00:00 2001 From: Richard Linden <none@none> Date: Wed, 16 Feb 2011 17:02:06 -0800 Subject: SOCIAL-544 PARTIAL move skylight skin to viewer repo --- .../skins/minimal/xui/en/inspect_object.xml | 116 +++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 indra/newview/skins/minimal/xui/en/inspect_object.xml (limited to 'indra/newview/skins/minimal/xui/en/inspect_object.xml') diff --git a/indra/newview/skins/minimal/xui/en/inspect_object.xml b/indra/newview/skins/minimal/xui/en/inspect_object.xml new file mode 100644 index 0000000000..32859690b7 --- /dev/null +++ b/indra/newview/skins/minimal/xui/en/inspect_object.xml @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater + legacy_header_height="25" + bevel_style="in" + bg_opaque_image="Inspector_Background" + can_close="false" + can_minimize="false" + height="150" + layout="topleft" + name="inspect_object" + single_instance="true" + sound_flags="0" + visible="true" + width="228"> + <string name="Creator">By [CREATOR]</string> + <string name="CreatorAndOwner"> +By [CREATOR] +Owner [OWNER] + </string> + <string name="Price">L$[AMOUNT]</string> + <string name="PriceFree">Free!</string> + <string name="Touch">Touch</string> + <string name="Sit">Sit</string> + <text + parse_urls="false" + follows="all" + font="SansSerifLarge" + height="30" + left="8" + name="object_name" + text_color="White" + top="6" + use_ellipses="true" + word_wrap="true" + width="220" /> + <text + follows="all" + height="50" + left="8" + name="object_creator" + top_pad="6" + use_ellipses="true" + width="220"> + by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about +owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about + </text> + <text + follows="all" + font="SansSerifSmall" + font.style="BOLD" + height="14" + halign="right" + right="-5" + name="price_text" + text_color="white" + top="60" + font_shadow="none" + width="60"> +L$30,000 + </text> + <text + clip_partial="true" + follows="all" + font="SansSerifSmall" + height="25" + left="8" + name="object_description" + top="76" + use_ellipses="true" + width="220" + word_wrap="true"> + </text> + <!-- Overlapping buttons for all default actions. Show "Buy" if + for sale, "Sit" if can sit, etc. --> + <text + follows="all" + font="SansSerifSmall" + height="13" + name="object_media_url" + width="220" + top_pad="0" + max_length = "50" + use_ellipses="true"> + http://www.superdupertest.com +</text> + <button + follows="top|left" + height="20" + label="Touch" + left_delta="0" + name="touch_btn" + top_delta="0" + width="80" /> + <button + follows="top|left" + height="20" + label="Sit" + left_delta="0" + name="sit_btn" + top_delta="0" + width="80" /> + <icon + name="secure_browsing" + image_name="Lock" + left_delta="80" + visible="false" + width="18" + height="18" + top_delta="0" + tool_tip="Secure Browsing" + follows="left|top" /> +</floater> -- cgit v1.2.3 From 876ac01791104afa9122ea0d3f6a914b5a86fd72 Mon Sep 17 00:00:00 2001 From: Richard Linden <none@none> Date: Tue, 1 Mar 2011 15:56:34 -0800 Subject: reverted inspectors to viewer 2 defaults --- .../skins/minimal/xui/en/inspect_object.xml | 76 ++++++++++++++++++---- 1 file changed, 65 insertions(+), 11 deletions(-) (limited to 'indra/newview/skins/minimal/xui/en/inspect_object.xml') diff --git a/indra/newview/skins/minimal/xui/en/inspect_object.xml b/indra/newview/skins/minimal/xui/en/inspect_object.xml index 32859690b7..8d14c974b4 100644 --- a/indra/newview/skins/minimal/xui/en/inspect_object.xml +++ b/indra/newview/skins/minimal/xui/en/inspect_object.xml @@ -76,17 +76,52 @@ L$30,000 </text> <!-- Overlapping buttons for all default actions. Show "Buy" if for sale, "Sit" if can sit, etc. --> + <icon + name="secure_browsing" + image_name="Lock" + left="0" + visible="false" + width="18" + height="18" + top="103" + tool_tip="Secure Browsing" + follows="left|top" /> <text follows="all" font="SansSerifSmall" height="13" name="object_media_url" - width="220" - top_pad="0" + width="207" + left_pad="2" + top_delta="0" max_length = "50" use_ellipses="true"> http://www.superdupertest.com </text> + <button + follows="top|left" + height="20" + label="Buy" + left="8" + name="buy_btn" + top="121" + width="80" /> + <button + follows="top|left" + height="20" + label="Pay" + left_delta="0" + name="pay_btn" + top_delta="0" + width="80" /> + <button + follows="top|left" + height="20" + label="Take Copy" + left_delta="0" + name="take_free_copy_btn" + top_delta="0" + width="80" /> <button follows="top|left" height="20" @@ -103,14 +138,33 @@ L$30,000 name="sit_btn" top_delta="0" width="80" /> - <icon - name="secure_browsing" - image_name="Lock" - left_delta="80" - visible="false" - width="18" - height="18" + <button + follows="top|left" + height="20" + label="Open" + left_delta="0" + name="open_btn" top_delta="0" - tool_tip="Secure Browsing" - follows="left|top" /> + width="80" /> + + <!-- non-overlapping buttons here --> + <button + follows="top|left" + height="20" + label="More" + layout="topleft" + name="more_info_btn" + left_pad="10" + top_delta="0" + tab_stop="false" + width="80" /> + <menu_button + follows="top|left" + height="20" + image_overlay="OptionsMenu_Off" + menu_filename="menu_inspect_object_gear.xml" + name="gear_btn" + right="-5" + top_delta="0" + width="35" /> </floater> -- cgit v1.2.3 From 10a572da887ee599d6c4207cda3a106c7fc3aa65 Mon Sep 17 00:00:00 2001 From: Richard Linden <none@none> Date: Thu, 3 Mar 2011 21:11:59 -0800 Subject: removed items from inspector menus that don't apply in minimal skin --- indra/newview/skins/minimal/xui/en/inspect_object.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'indra/newview/skins/minimal/xui/en/inspect_object.xml') diff --git a/indra/newview/skins/minimal/xui/en/inspect_object.xml b/indra/newview/skins/minimal/xui/en/inspect_object.xml index 8d14c974b4..a5b03a2f58 100644 --- a/indra/newview/skins/minimal/xui/en/inspect_object.xml +++ b/indra/newview/skins/minimal/xui/en/inspect_object.xml @@ -148,17 +148,7 @@ L$30,000 width="80" /> <!-- non-overlapping buttons here --> - <button - follows="top|left" - height="20" - label="More" - layout="topleft" - name="more_info_btn" - left_pad="10" - top_delta="0" - tab_stop="false" - width="80" /> - <menu_button + <menu_button follows="top|left" height="20" image_overlay="OptionsMenu_Off" -- cgit v1.2.3 From 91eb7f2e048369ddfc76eb2fbae83fa50ad8322a Mon Sep 17 00:00:00 2001 From: callum <none@none> Date: Mon, 14 Mar 2011 15:21:59 -0700 Subject: SOCIAL-653 FIX Object inspectors have Buy, Pay, and Wear options in minimal skin --- indra/newview/skins/minimal/xui/en/inspect_object.xml | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'indra/newview/skins/minimal/xui/en/inspect_object.xml') diff --git a/indra/newview/skins/minimal/xui/en/inspect_object.xml b/indra/newview/skins/minimal/xui/en/inspect_object.xml index a5b03a2f58..f424069ec6 100644 --- a/indra/newview/skins/minimal/xui/en/inspect_object.xml +++ b/indra/newview/skins/minimal/xui/en/inspect_object.xml @@ -98,22 +98,6 @@ L$30,000 use_ellipses="true"> http://www.superdupertest.com </text> - <button - follows="top|left" - height="20" - label="Buy" - left="8" - name="buy_btn" - top="121" - width="80" /> - <button - follows="top|left" - height="20" - label="Pay" - left_delta="0" - name="pay_btn" - top_delta="0" - width="80" /> <button follows="top|left" height="20" -- cgit v1.2.3