diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
4 files changed, 313 insertions, 34 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 0abee2ff80..425af16261 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1397,6 +1397,18 @@ even though the user gets a free copy. name="Object" top="16" width="295"> + <panel.string name="paste_position"> +Paste Position +[VALUE] + </panel.string> + <panel.string name="paste_size"> +Paste Size +[VALUE] + </panel.string> + <panel.string name="paste_rotation"> +Paste Rotation +[VALUE] + </panel.string> <check_box height="19" label="Locked" @@ -1456,6 +1468,21 @@ even though the user gets a free copy. text_enabled_color="1 0 0.3 .7" top_pad="5" width="87" /> + <button + top_delta="0" + left_pad="5" + height="19" + width="20" + follows="top|right" + layout="topleft" + tab_stop="false" + image_bottom_pad="1" + image_overlay="Copy" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + name="copy_pos_btn" + tool_tip="Copy Position" /> <spinner follows="left|top" height="19" @@ -1464,13 +1491,28 @@ even though the user gets a free copy. label="Y" label_width="10" layout="topleft" - left_delta="0" + left="10" max_val="512" min_val="-256" name="Pos Y" text_enabled_color="EmphasisColor" top_pad="3" width="87" /> + <button + top_delta="0" + left_pad="5" + height="19" + width="20" + follows="top|right" + layout="topleft" + tab_stop="false" + image_bottom_pad="1" + image_overlay="Paste" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + name="paste_pos_btn" + tool_tip="Paste Position" /> <spinner follows="left|top" height="19" @@ -1479,7 +1521,7 @@ even though the user gets a free copy. label="Z" label_width="10" layout="topleft" - left_delta="0" + left="10" max_val="4096" name="Pos Z" text_enabled_color="0 0.8 1 .65" @@ -1512,6 +1554,21 @@ even though the user gets a free copy. text_enabled_color="1 1 1 1" top_pad="5" width="87" /> + <button + top_delta="0" + left_pad="5" + height="19" + width="20" + follows="top|right" + layout="topleft" + tab_stop="false" + image_bottom_pad="1" + image_overlay="Copy" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + name="copy_size_btn" + tool_tip="Copy Size" /> <spinner follows="left|top" height="19" @@ -1520,13 +1577,28 @@ even though the user gets a free copy. label="Y" label_width="10" layout="topleft" - left_delta="0" + left="10" max_val="64" min_val="0.01" name="Scale Y" text_enabled_color="1 1 1 1" top_pad="3" width="87" /> + <button + top_delta="0" + left_pad="5" + height="19" + width="20" + follows="top|right" + layout="topleft" + tab_stop="false" + image_bottom_pad="1" + image_overlay="Paste" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + name="paste_size_btn" + tool_tip="Paste Size" /> <spinner follows="left|top" height="19" @@ -1535,7 +1607,7 @@ even though the user gets a free copy. label="Z" label_width="10" layout="topleft" - left_delta="0" + left="10" max_val="64" min_val="0.01" name="Scale Z" @@ -1570,6 +1642,21 @@ even though the user gets a free copy. text_enabled_color="1 1 1 1" top_pad="5" width="87" /> + <button + top_delta="0" + left_pad="5" + height="19" + width="20" + follows="top|right" + layout="topleft" + tab_stop="false" + image_bottom_pad="1" + image_overlay="Copy" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + name="copy_rot_btn" + tool_tip="Copy Rotation" /> <spinner decimal_digits="2" follows="left|top" @@ -1579,13 +1666,28 @@ even though the user gets a free copy. label="Y" label_width="10" layout="topleft" - left_delta="0" + left="10" max_val="9999" min_val="-9999" name="Rot Y" text_enabled_color="1 1 1 1" top_pad="3" width="87" /> + <button + top_delta="0" + left_pad="5" + height="19" + width="20" + follows="top|right" + layout="topleft" + tab_stop="false" + image_bottom_pad="1" + image_overlay="Paste" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + name="paste_rot_btn" + tool_tip="Paste Rotation" /> <spinner decimal_digits="2" follows="left|top" @@ -1595,7 +1697,7 @@ even though the user gets a free copy. label="Z" label_width="10" layout="topleft" - left_delta="0" + left="10" max_val="9999" min_val="-9999" name="Rot Z" @@ -1608,18 +1710,52 @@ even though the user gets a free copy. follows="left|top" height="10" layout="topleft" - left="125" + left="135" name="label basetype" top="5" width="150"> Prim Type </text>--> + <button + follows="top|right" + height="23" + label="Copy" + layout="topleft" + left="135" + name="copy_params_btn" + tool_tip="Copy Parameters to Clipboard" + top="6" + width="53"> + </button> + <button + follows="top|right" + height="23" + label="Paste" + layout="topleft" + left_pad="5" + name="paste_params_btn" + tool_tip="Paste Parameters from Clipboard" + width="53"> + </button> + <menu_button + menu_filename="menu_build_paste.xml" + follows="top|left" + height="23" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="5" + name="paste_gear_btn" + tool_tip="Paste options" + width="31"/> <combo_box height="19" layout="topleft" name="comboBaseType" - top="6" - left="125" + top_pad="5" + left="135" width="150"> <combo_box.item label="Box" @@ -1698,7 +1834,7 @@ even though the user gets a free copy. follows="left|top" height="10" layout="topleft" - left="125" + left="135" name="text hollow" top_pad="6" width="68"> @@ -1722,7 +1858,7 @@ even though the user gets a free copy. increment="5" initial_value="0" layout="topleft" - left="125" + left="135" max_val="95" name="Scale 1" top_pad="4" @@ -1746,7 +1882,7 @@ even though the user gets a free copy. follows="left|top" height="15" layout="topleft" - left="125" + left="135" name="Hollow Shape" top_pad="4" width="150"> @@ -1824,7 +1960,7 @@ even though the user gets a free copy. follows="left|top" height="10" layout="topleft" - left="125" + left="135" name="scale_taper" top_pad="3" width="150"> @@ -1877,7 +2013,7 @@ even though the user gets a free copy. follows="left|top" height="10" layout="topleft" - left="125" + left="135" name="text topshear" top_pad="3" width="141"> @@ -1920,7 +2056,7 @@ even though the user gets a free copy. follows="left|top" height="10" layout="topleft" - left="125" + left="135" name="advanced_cut" top_pad="3" width="150"> @@ -1984,7 +2120,7 @@ even though the user gets a free copy. follows="left|top" height="10" layout="topleft" - left="125" + left="135" name="text taper2" top_pad="3" width="150"> @@ -2027,7 +2163,7 @@ even though the user gets a free copy. follows="left|top" height="10" layout="topleft" - left="125" + left="135" name="text radius delta" top_pad="2" width="78"> @@ -2052,7 +2188,7 @@ even though the user gets a free copy. increment="0.05" initial_value="0" layout="topleft" - left="125" + left="135" min_val="-1" name="Radius Offset" top_pad="4" @@ -2077,7 +2213,7 @@ even though the user gets a free copy. height="141" label="Sculpt Texture" layout="topleft" - left="125" + left="135" name="sculpt texture control" tool_tip="Click to choose a picture" top="70" @@ -2535,7 +2671,7 @@ even though the user gets a free copy. top_pad="8" width="132" /> </panel> - <panel + <panel label="Texture" help_topic="toolbox_texture_tab" name="Texture" diff --git a/indra/newview/skins/default/xui/en/menu_build_paste.xml b/indra/newview/skins/default/xui/en/menu_build_paste.xml new file mode 100644 index 0000000000..acbef528b8 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_build_paste.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Conversation Gear Menu"> + <menu_item_check + label="Prim Parameters" + layout="topleft" + name="Parametric"> + <on_check function="BuildObject.PasteCheckItem" parameter="Parametric" /> + <on_click function="BuildObject.PasteDoToSelected" parameter="Parametric" /> + <on_enable function="BuildObject.PasteEnable" parameter="Parametric" /> + </menu_item_check> + <menu_item_check + label="Flexible" + layout="topleft" + name="Flexible"> + <on_check function="BuildObject.PasteCheckItem" parameter="Flexible" /> + <on_click function="BuildObject.PasteDoToSelected" parameter="Flexible" /> + <on_enable function="BuildObject.PasteEnable" parameter="Flexible" /> + </menu_item_check> + <menu_item_check + label="Physics" + layout="topleft" + name="Physics"> + <on_check function="BuildObject.PasteCheckItem" parameter="Physics" /> + <on_click function="BuildObject.PasteDoToSelected" parameter="Physics" /> + <on_enable function="BuildObject.PasteEnable" parameter="Physics" /> + </menu_item_check> + <menu_item_check + label="Light" + layout="topleft" + name="Light"> + <on_check function="BuildObject.PasteCheckItem" parameter="Light" /> + <on_click function="BuildObject.PasteDoToSelected" parameter="Light" /> + <on_enable function="BuildObject.PasteEnable" parameter="Light" /> + </menu_item_check> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/menu_texture_paste.xml b/indra/newview/skins/default/xui/en/menu_texture_paste.xml new file mode 100644 index 0000000000..be6535b989 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_texture_paste.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + name="Conversation Gear Menu"> + <menu_item_check + label="Color" + layout="topleft" + name="Color"> + <on_check function="BuildFace.PasteCheckItem" parameter="Color" /> + <on_click function="BuildFace.PasteDoToSelected" parameter="Color" /> + <on_enable function="BuildFace.PasteEnable" parameter="Color" /> + </menu_item_check> + <menu_item_check + label="Transparency" + layout="topleft" + name="Transparency"> + <on_check function="BuildFace.PasteCheckItem" parameter="Transparency" /> + <on_click function="BuildFace.PasteDoToSelected" parameter="Transparency" /> + <on_enable function="BuildFace.PasteEnable" parameter="Transparency" /> + </menu_item_check> + <menu_item_check + label="Glow" + layout="topleft" + name="Glow"> + <on_check function="BuildFace.PasteCheckItem" parameter="Glow" /> + <on_click function="BuildFace.PasteDoToSelected" parameter="Glow" /> + <on_enable function="BuildFace.PasteEnable" parameter="Glow" /> + </menu_item_check> + <menu_item_check + label="Texture" + layout="topleft" + name="Diffuse"> + <on_check function="BuildFace.PasteCheckItem" parameter="Diffuse" /> + <on_click function="BuildFace.PasteDoToSelected" parameter="Diffuse" /> + <on_enable function="BuildFace.PasteEnable" parameter="Diffuse" /> + </menu_item_check> + <menu_item_check + label="Bumpiness" + layout="topleft" + name="Normal"> + <on_check function="BuildFace.PasteCheckItem" parameter="Normal" /> + <on_click function="BuildFace.PasteDoToSelected" parameter="Normal" /> + <on_enable function="BuildFace.PasteEnable" parameter="Normal" /> + </menu_item_check> + <menu_item_check + label="Shininess" + layout="topleft" + name="Specular"> + <on_check function="BuildFace.PasteCheckItem" parameter="Specular" /> + <on_click function="BuildFace.PasteDoToSelected" parameter="Specular" /> + <on_enable function="BuildFace.PasteEnable" parameter="Specular" /> + </menu_item_check> + <menu_item_check + label="Mapping" + layout="topleft" + name="Mapping"> + <on_check function="BuildFace.PasteCheckItem" parameter="Mapping" /> + <on_click function="BuildFace.PasteDoToSelected" parameter="Mapping" /> + <on_enable function="BuildFace.PasteEnable" parameter="Mapping" /> + </menu_item_check> + <menu_item_check + label="Media" + layout="topleft" + name="Media"> + <on_check function="BuildFace.PasteCheckItem" parameter="Media" /> + <on_click function="BuildFace.PasteDoToSelected" parameter="Media" /> + <on_enable function="BuildFace.PasteEnable" parameter="Media" /> + </menu_item_check> +</toggleable_menu> + diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 90f32ae452..1819106970 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -43,7 +43,7 @@ follows="left|top" height="10" layout="topleft" - left_pad="15" + left_pad="10" name="color trans" text_readonly_color="LabelDisabledColor" top="6" @@ -68,7 +68,7 @@ follows="left|top" height="10" layout="topleft" - left_pad="15" + left_pad="13" name="glow label" text_readonly_color="LabelDisabledColor" top="6" @@ -84,7 +84,7 @@ left_delta="0" name="glow" top_pad="4" - width="80" /> + width="50" /> <check_box height="19" label="Full Bright" @@ -93,12 +93,47 @@ name="checkbox fullbright" top_pad="4" width="81" /> + <button + follows="top|right" + height="23" + label="Copy" + layout="topleft" + left="240" + name="copy_face_btn" + tool_tip="Copy Parameters to Clipboard" + top="6" + width="53"> + </button> + <button + follows="top|right" + height="23" + label="Paste" + layout="topleft" + name="paste_face_btn" + tool_tip="Paste Parameters from Clipboard" + top_pad="5" + width="53"> + </button> + <menu_button + menu_filename="menu_texture_paste.xml" + follows="top|left" + height="23" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_delta="20" + name="paste_face_gear_btn" + tool_tip="Paste options" + top_pad="5" + width="31"/> <combo_box height="23" layout="topleft" left="10" name="combobox matmedia" - top_pad="5" + top="70" width="100"> <combo_box.item label="Materials" @@ -113,10 +148,10 @@ control_name="ComboMaterialType" height="50" layout="topleft" - left_pad="20" + left_pad="5" top_delta="-10" width="150" - visible = "false" + visible = "true" name="radio_material_type"> <radio_item label="Texture (diffuse)" @@ -139,7 +174,7 @@ layout="topleft" top_pad="1" value="2"/> - </radio_group> + </radio_group> <check_box control_name="SyncMaterialSettings" follows="top|left" @@ -158,7 +193,7 @@ fallback_image="materials_ui_x_24.png" follows="left|top" height="80" - label="Texture " + label="Texture" layout="topleft" left="10" name="texture control" @@ -235,7 +270,7 @@ fallback_image="materials_ui_x_24.png" follows="left|top" height="80" - label="Texture " + label="Texture" layout="topleft" left="10" name="bumpytexture control" @@ -349,7 +384,7 @@ fallback_image="materials_ui_x_24.png" follows="left|top" height="80" - label="Texture " + label="Texture" layout="topleft" left="10" name="shinytexture control" @@ -771,14 +806,14 @@ top_delta="16" width="260" /> <button - left="10" - top="222" + follows="left|top" + layout="topleft" + left="9" + top="192" height="20" label="Align" label_selected="Align current texture layers" - layout="topleft" name="button align textures" - top_delta="0" tool_tip="Align current texture layers" width="66" /> <web_browser |