diff options
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 108 insertions, 52 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml index 74921e8b64..83416f60d7 100644 --- a/indra/newview/skins/default/xui/en/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -110,13 +110,12 @@ top_pad="0" left_delta="-3" width="200" /> - </layout_panel> <layout_panel auto_resize="false" user_resize="true" tab_group="1" - height="62" + height="31" name="pnl_control" font="SansSerifBold"> <panel @@ -142,7 +141,7 @@ top="5" tool_tip="More options" width="18" /> - <button + <menu_button follows="bottom|left" font="SansSerifBigBold" height="18" @@ -151,8 +150,9 @@ image_disabled="AddItem_Disabled" layout="topleft" left_pad="5" + menu_filename="menu_settings_add.xml" name="btn_newsettings" - tool_tip="Make new gesture" + tool_tip="Make new setting" top_delta="0" width="18" /> <button @@ -165,20 +165,10 @@ layout="topleft" name="btn_del" right="-5" - tool_tip="Delete this gesture" + tool_tip="Delete this setting" top_delta="0" width="18" /> </panel> - <button - follows="top|left" - height="23" - label="Edit" - layout="topleft" - left="6" - name="btn_edit" - top_pad="5" - width="83" /> - </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_settings_add.xml b/indra/newview/skins/default/xui/en/menu_settings_add.xml new file mode 100644 index 0000000000..a4782cfdc3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_settings_add.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + layout="topleft" + mouse_opaque="false" + name="menu_settings_add" + visible="false"> + <menu_item_call + label="New Sky" + layout="topleft" + name="New Sky"> + <menu_item_call.on_click + function="MyEnvironments.DoCreate" + parameter="sky"/> + <menu_item_call.on_enable + function="MyEnvironments.EnvironmentEnabled" /> + </menu_item_call> + <menu_item_call + label="New Water" + layout="topleft" + name="New Water"> + <menu_item_call.on_click + function="MyEnvironments.DoCreate" + parameter="water"/> + <menu_item_call.on_enable + function="MyEnvironments.EnvironmentEnabled" /> + </menu_item_call> + <menu_item_call + label="New Day Cycle" + layout="topleft" + name="New Day Cycle"> + <menu_item_call.on_click + function="MyEnvironments.DoCreate" + parameter="daycycle"/> + <menu_item_call.on_enable + function="MyEnvironments.EnvironmentEnabled" /> + </menu_item_call> +</toggleable_menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_settings_gear.xml b/indra/newview/skins/default/xui/en/menu_settings_gear.xml index 73fae4f693..41fd0fce2c 100644 --- a/indra/newview/skins/default/xui/en/menu_settings_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_settings_gear.xml @@ -1,57 +1,86 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <toggleable_menu - layout="topleft" - mouse_opaque="false" - name="menu_settings_gear" - visible="false"> + layout="topleft" + mouse_opaque="false" + name="menu_settings_gear" + visible="false"> <menu_item_call - label="Apply Selected Setting to Myself" - layout="topleft" - name="activate"> + label="Edit" + layout="topleft" + name="edit_settings"> <on_click - function="Gesture.Action.ToogleActiveState" /> + function="MyEnvironments.ShowPreview" /> + <on_enable + function="MyEnvironments.EnableAction" + parameter="edit_settings" /> </menu_item_call> + <menu_item_separator + layout="topleft" + name="Separator" /> <menu_item_call - label="Copy" - layout="topleft" - name="copy_settings"> - <on_click - function="Gesture.Action.CopyPaste" - parameter="copy_gesture" /> - <on_enable - function="Gesture.EnableAction" - parameter="copy_gesture" /> + name="Settings Apply Local" + layout="topleft" + label="Apply Only To Myself"> + <menu_item_call.on_click + function="MyEnvironments.DoApply" + parameter="local" /> + </menu_item_call> + <menu_item_call + name="Settings Apply Parcel" + layout="topleft" + label="Apply To Parcel"> + <menu_item_call.on_click + function="MyEnvironments.DoApply" + parameter="parcel" /> + <menu_item_call.on_enable + function="MyEnvironments.CanAppyl" + parameter="parcel"/> + </menu_item_call> + <menu_item_call + name="Settings Apply Region" + layout="topleft" + label="Apply To Region"> + <menu_item_call.on_click + function="MyEnvironments.DoToSelected" + parameter="region" /> + <menu_item_call.on_enable + function="MyEnvironments.CanAppyl" + parameter="region"/> </menu_item_call> + <menu_item_separator + layout="topleft" + name="Separator" /> <menu_item_call - label="Paste" - layout="topleft" - name="paste_settings"> + label="Copy" + layout="topleft" + name="copy_settings"> <on_click - function="Gesture.Action.CopyPaste" - parameter="paste" /> + function="MyEnvironments.CopyPaste" + parameter="copy" /> <on_enable - function="Gesture.EnableAction" - parameter="paste" /> + function="MyEnvironments.EnableAction" + parameter="copy" /> </menu_item_call> <menu_item_call - label="Copy UUID" - layout="topleft" - name="copy_uuid"> + label="Paste" + layout="topleft" + name="paste_settings"> <on_click - function="Gesture.Action.CopyPaste" - parameter="copy_uuid" /> + function="MyEnvironments.CopyPaste" + parameter="paste" /> <on_enable - function="Gesture.EnableAction" - parameter="copy_uuid" /> + function="MyEnvironments.EnableAction" + parameter="paste" /> </menu_item_call> <menu_item_call - label="Edit" - layout="topleft" - name="edit_settings"> + label="Copy UUID" + layout="topleft" + name="copy_uuid"> <on_click - function="Gesture.Action.ShowPreview" /> + function="MyEnvironments.CopyPaste" + parameter="copy_uuid" /> <on_enable - function="Gesture.EnableAction" - parameter="edit_settings" /> + function="MyEnvironments.EnableAction" + parameter="copy_uuid" /> </menu_item_call> </toggleable_menu> |