From 0bf678e23b2a29fcd2bf1488f999168b8737c010 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 5 Jul 2018 18:30:56 +0300
Subject: MAINT-8827 EEP Edit Day Cycle window needs Save & Cancel buttons
linked to bottom of the window
---
.../default/xui/en/floater_edit_ext_day_cycle.xml | 879 +++++++++++----------
1 file changed, 447 insertions(+), 432 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index b03a7037a6..fb53eb969b 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
- height="602"
layout="topleft"
name="env_edit_extdaycycle"
help_topic="day_presets"
save_rect="true"
title="Edit Day Cycle"
width="705"
+ height="602"
+ min_width="450"
+ min_height="85"
can_resize="true">
<!-- obsolete?, add as hint for 'save' button? -->
@@ -18,14 +20,14 @@
<!-- Todo: These 5 strings might be subjected to a change to get dynamic labels, consider using layout_stack to get dynamic width adjustment-->
<string name="time_label"> ([HH]:[MM])</string>
- <layout_stack name="test_stack"
+ <layout_stack name="outer_stack"
width="705"
height="602"
follows="all"
animate="false"
top="0"
orientation="vertical">
- <layout_panel name="temp"
+ <layout_panel name="name_and_import"
border="false"
auto_resize="false"
user_resize="true"
@@ -64,460 +66,473 @@
tool_tip="Import legacy settings from disk."
width="96" />
</layout_panel>
- <layout_panel name="timeline_track_selection"
+ <layout_panel name="content"
border="false"
- bevel_style="in"
- auto_resize="false"
+ auto_resize="true"
user_resize="true"
- height="150"
- min_height="0"
- visible="true">
- <panel name="timeline_layers"
- border="false"
- follows="left|top"
- height="150"
- width="110"
- top_pad="0"
- min_height="0"
- visible="true">
- <button
- follows="left|top"
- height="23"
- label="Sky 4"
- layout="topleft"
- top_pad="5"
- left="10"
- name="sky4_track"
- width="100">
- <button.commit_callback
- function="DayCycle.Track"
- parameter="4" />
- </button>
- <button
- follows="left|top"
- height="23"
- label="Sky 3"
- layout="topleft"
- top_pad="0"
- left="10"
- name="sky3_track"
- width="100">
- <button.commit_callback
- function="DayCycle.Track"
- parameter="3" />
- </button>
- <button
- follows="left|top"
- height="23"
- label="Sky 2"
- layout="topleft"
- top_pad="0"
- left="10"
- name="sky2_track"
- width="100">
- <button.commit_callback
- function="DayCycle.Track"
- parameter="2" />
- </button>
- <button
- follows="left|top"
- height="23"
- label="Ground Level"
- layout="topleft"
- top_pad="0"
- left="10"
- name="sky1_track"
- width="100">
- <button.commit_callback
- function="DayCycle.Track"
- parameter="1" />
- </button>
- <button
- follows="left|top"
- height="23"
- label="Water"
- layout="topleft"
- top_pad="0"
- left="10"
- name="water_track"
- width="100">
- <button.commit_callback
- function="DayCycle.Track"
- parameter="0" />
- </button>
- </panel>
- <panel name="timeline"
- border="true"
- follows="left|top"
- height="150"
- min_height="0"
- width="595"
- min_width="595"
- left_pad="0"
- visible="true">
- <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated, consider using layout_stack to get dynamic width adjustment-->
- <text
- follows="left|top"
- height="15"
- layout="topleft"
- left="10"
- name="p0"
- top_pad="5"
- value="0%[DSC]"
- width="80" />
- <text
- follows="left|top|right"
- height="15"
- layout="topleft"
- left_pad="39"
- name="p1"
- top_delta="0"
- value="25%[DSC]"
- width="80" />
- <text
- follows="left|top|right"
- height="15"
- layout="topleft"
- left_pad="39"
- name="p2"
- top_delta="0"
- value="50%[DSC]"
- width="80" />
- <text
- follows="left|top|right"
- height="15"
- layout="topleft"
- left_pad="39"
- name="p3"
- top_delta="0"
- value="75%[DSC]"
- width="80" />
- <text
- follows="left|top|right"
- height="15"
- layout="topleft"
- left_pad="39"
- name="p4"
- top_delta="0"
- value="100%[DSC]"
- width="80" />
- <multi_slider
- decimal_digits="0"
- draw_track="false"
- follows="bottom"
- height="10"
- increment="0.01"
- initial_value="0"
- layout="topleft"
- left="10"
- max_sliders="1"
- max_val="1"
- name="WLTimeSlider"
- show_text="false"
- top_pad="0"
- use_triangle="true"
- width="525" />
-
- <multi_slider
- decimal_digits="0"
- follows="bottom"
- height="10"
- increment="0.01"
- initial_value="0"
- layout="topleft"
- left="10"
- max_sliders="20"
- max_val="1"
- name="WLDayCycleFrames"
- show_text="false"
- top_pad="15"
- width="525" />
-
- <text
- follows="left|bottom"
- height="20"
- layout="topleft"
- left_pad="0"
- name="current_time"
- value="[PRCNT]%[DSC]"
- top_delta="-5"
- width="70" />
-
- <layout_stack
- name="progress_control"
- follows="top|left"
- height="25"
- width="83"
- layout="topleft"
- animate="false"
- left="225"
- top_pad="40"
- orientation="horizontal">
-
- <layout_panel
- name="skip_back"
- mouse_opaque="false"
- auto_resize="false"
- layout="topleft"
- top="0"
- height="25"
- min_width="25"
- width="25">
+ background_visible="false">
+ <layout_stack name="content_stack"
+ width="705"
+ follows="all"
+ animate="false"
+ top="0"
+ orientation="vertical">
+ <layout_panel name="timeline_track_selection"
+ border="false"
+ bevel_style="in"
+ auto_resize="false"
+ user_resize="true"
+ height="150"
+ min_height="0"
+ visible="true">
+ <panel name="timeline_layers"
+ border="false"
+ follows="left|top"
+ height="150"
+ width="110"
+ top_pad="0"
+ min_height="0"
+ visible="true">
<button
- name="skip_back_btn"
- follows="top"
- image_overlay="SkipBackward_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- auto_resize="false"
- width="25"
- height="25"
+ follows="left|top"
+ height="23"
+ label="Sky 4"
layout="topleft"
- tool_tip="Step back"
- top="0"
- left="0">
+ top_pad="5"
+ left="10"
+ name="sky4_track"
+ width="100">
<button.commit_callback
- function="DayCycle.PlayActions"
- parameter="back" />
+ function="DayCycle.Track"
+ parameter="4" />
</button>
- </layout_panel>
-
- <layout_panel
- name="play_layout"
- mouse_opaque="false"
- auto_resize="false"
- layout="topleft"
- top="0"
- height="25"
- min_width="25"
- width="25">
<button
- name="play_btn"
- follows="top"
- image_overlay="Play_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- auto_resize="false"
+ follows="left|top"
+ height="23"
+ label="Sky 3"
layout="topleft"
- height="25"
- width="25"
- left="0"
- top="0">
+ top_pad="0"
+ left="10"
+ name="sky3_track"
+ width="100">
<button.commit_callback
- function="DayCycle.PlayActions"
- parameter="play" />
+ function="DayCycle.Track"
+ parameter="3" />
</button>
- </layout_panel>
-
- <layout_panel
- name="pause_layout"
- mouse_opaque="false"
- auto_resize="false"
- layout="topleft"
- top="0"
- height="25"
- min_width="25"
- width="25"
- visible="false">
<button
- name="pause_btn"
- follows="top"
- image_overlay="Pause_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- auto_resize="false"
+ follows="left|top"
+ height="23"
+ label="Sky 2"
layout="topleft"
- height="25"
- width="25"
- left="0"
- top="0">
+ top_pad="0"
+ left="10"
+ name="sky2_track"
+ width="100">
<button.commit_callback
- function="DayCycle.PlayActions"
- parameter="pause" />
+ function="DayCycle.Track"
+ parameter="2" />
</button>
- </layout_panel>
-
- <layout_panel
- name="skip_forward"
- mouse_opaque="false"
- auto_resize="false"
- layout="topleft"
- top="0"
- height="25"
- min_width="25"
- width="25">
<button
- name="skip_forward_btn"
- follows="top"
- image_overlay="SkipForward_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- width="25"
- height="25"
+ follows="left|top"
+ height="23"
+ label="Ground Level"
layout="topleft"
- tool_tip="Step forward"
- top="0">
+ top_pad="0"
+ left="10"
+ name="sky1_track"
+ width="100">
<button.commit_callback
- function="DayCycle.PlayActions"
- parameter="forward" />
+ function="DayCycle.Track"
+ parameter="1" />
</button>
- </layout_panel>
- </layout_stack>
+ <button
+ follows="left|top"
+ height="23"
+ label="Water"
+ layout="topleft"
+ top_pad="0"
+ left="10"
+ name="water_track"
+ width="100">
+ <button.commit_callback
+ function="DayCycle.Track"
+ parameter="0" />
+ </button>
+ </panel>
+ <panel name="timeline"
+ border="true"
+ follows="left|top"
+ height="150"
+ min_height="0"
+ width="595"
+ min_width="595"
+ left_pad="0"
+ visible="true">
+ <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated, consider using layout_stack to get dynamic width adjustment-->
+ <text
+ follows="left|top"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="p0"
+ top_pad="5"
+ value="0%[DSC]"
+ width="80" />
+ <text
+ follows="left|top|right"
+ height="15"
+ layout="topleft"
+ left_pad="39"
+ name="p1"
+ top_delta="0"
+ value="25%[DSC]"
+ width="80" />
+ <text
+ follows="left|top|right"
+ height="15"
+ layout="topleft"
+ left_pad="39"
+ name="p2"
+ top_delta="0"
+ value="50%[DSC]"
+ width="80" />
+ <text
+ follows="left|top|right"
+ height="15"
+ layout="topleft"
+ left_pad="39"
+ name="p3"
+ top_delta="0"
+ value="75%[DSC]"
+ width="80" />
+ <text
+ follows="left|top|right"
+ height="15"
+ layout="topleft"
+ left_pad="39"
+ name="p4"
+ top_delta="0"
+ value="100%[DSC]"
+ width="80" />
+ <multi_slider
+ decimal_digits="0"
+ draw_track="false"
+ follows="bottom"
+ height="10"
+ increment="0.01"
+ initial_value="0"
+ layout="topleft"
+ left="10"
+ max_sliders="1"
+ max_val="1"
+ name="WLTimeSlider"
+ show_text="false"
+ top_pad="0"
+ use_triangle="true"
+ width="525" />
- <button
- follows="top|left"
- height="23"
- width="90"
- label="Add Frame"
- left_pad="175"
- top_delta="-12"
- name="add_frame" />
- <button
- follows="left|top"
- height="23"
- width="90"
- label="Delete Frame"
- top_pad="0"
- left_delta="0"
- name="delete_frame" />
- </panel>
- </layout_panel>
- <layout_panel name="frame_edit_controls"
- auto_resize="false"
- user_resize="true"
- height="30"
- width="700"
- min_height="30"
- visible="true">
- <!--bg_alpha_color="blue"
+ <multi_slider
+ decimal_digits="0"
+ follows="bottom"
+ height="10"
+ increment="0.01"
+ initial_value="0"
+ layout="topleft"
+ left="10"
+ max_sliders="20"
+ max_val="1"
+ name="WLDayCycleFrames"
+ show_text="false"
+ top_pad="15"
+ width="525" />
+
+ <text
+ follows="left|bottom"
+ height="20"
+ layout="topleft"
+ left_pad="0"
+ name="current_time"
+ value="[PRCNT]%[DSC]"
+ top_delta="-5"
+ width="70" />
+
+ <layout_stack
+ name="progress_control"
+ follows="top|left"
+ height="25"
+ width="83"
+ layout="topleft"
+ animate="false"
+ left="225"
+ top_pad="40"
+ orientation="horizontal">
+
+ <layout_panel
+ name="skip_back"
+ mouse_opaque="false"
+ auto_resize="false"
+ layout="topleft"
+ top="0"
+ height="25"
+ min_width="25"
+ width="25">
+ <button
+ name="skip_back_btn"
+ follows="top"
+ image_overlay="SkipBackward_Off"
+ image_disabled="PushButton_Disabled"
+ image_disabled_selected="PushButton_Disabled"
+ image_selected="PushButton_Selected"
+ image_unselected="PushButton_Off"
+ hover_glow_amount="0.15"
+ auto_resize="false"
+ width="25"
+ height="25"
+ layout="topleft"
+ tool_tip="Step back"
+ top="0"
+ left="0">
+ <button.commit_callback
+ function="DayCycle.PlayActions"
+ parameter="back" />
+ </button>
+ </layout_panel>
+
+ <layout_panel
+ name="play_layout"
+ mouse_opaque="false"
+ auto_resize="false"
+ layout="topleft"
+ top="0"
+ height="25"
+ min_width="25"
+ width="25">
+ <button
+ name="play_btn"
+ follows="top"
+ image_overlay="Play_Off"
+ image_disabled="PushButton_Disabled"
+ image_disabled_selected="PushButton_Disabled"
+ image_selected="PushButton_Selected"
+ image_unselected="PushButton_Off"
+ hover_glow_amount="0.15"
+ auto_resize="false"
+ layout="topleft"
+ height="25"
+ width="25"
+ left="0"
+ top="0">
+ <button.commit_callback
+ function="DayCycle.PlayActions"
+ parameter="play" />
+ </button>
+ </layout_panel>
+
+ <layout_panel
+ name="pause_layout"
+ mouse_opaque="false"
+ auto_resize="false"
+ layout="topleft"
+ top="0"
+ height="25"
+ min_width="25"
+ width="25"
+ visible="false">
+ <button
+ name="pause_btn"
+ follows="top"
+ image_overlay="Pause_Off"
+ image_disabled="PushButton_Disabled"
+ image_disabled_selected="PushButton_Disabled"
+ image_selected="PushButton_Selected"
+ image_unselected="PushButton_Off"
+ hover_glow_amount="0.15"
+ auto_resize="false"
+ layout="topleft"
+ height="25"
+ width="25"
+ left="0"
+ top="0">
+ <button.commit_callback
+ function="DayCycle.PlayActions"
+ parameter="pause" />
+ </button>
+ </layout_panel>
+
+ <layout_panel
+ name="skip_forward"
+ mouse_opaque="false"
+ auto_resize="false"
+ layout="topleft"
+ top="0"
+ height="25"
+ min_width="25"
+ width="25">
+ <button
+ name="skip_forward_btn"
+ follows="top"
+ image_overlay="SkipForward_Off"
+ image_disabled="PushButton_Disabled"
+ image_disabled_selected="PushButton_Disabled"
+ image_selected="PushButton_Selected"
+ image_unselected="PushButton_Off"
+ hover_glow_amount="0.15"
+ width="25"
+ height="25"
+ layout="topleft"
+ tool_tip="Step forward"
+ top="0">
+ <button.commit_callback
+ function="DayCycle.PlayActions"
+ parameter="forward" />
+ </button>
+ </layout_panel>
+ </layout_stack>
+
+ <button
+ follows="top|left"
+ height="23"
+ width="90"
+ label="Add Frame"
+ left_pad="175"
+ top_delta="-12"
+ name="add_frame" />
+ <button
+ follows="left|top"
+ height="23"
+ width="90"
+ label="Delete Frame"
+ top_pad="0"
+ left_delta="0"
+ name="delete_frame" />
+ </panel>
+ </layout_panel>
+ <layout_panel name="frame_edit_controls"
+ auto_resize="false"
+ user_resize="true"
+ height="30"
+ width="700"
+ min_height="30"
+ visible="true">
+ <!--bg_alpha_color="blue"
background_visible="true" -->
- <icon
- border="1"
- bevel_style="out"
- name="icn_lock_edit"
- layout="bottomleft"
- follows="bottom"
- image_name="Locked_Icon"
- bottom="4"
- left="5"
- height="15"
- width="15"
- tab_stop="false"
- visible="false"
- tool_tip="Select a key frame above to edit settings"/>
- <button
- name="btn_load_frame"
- follows="top"
- image_overlay="Command_Inventory_Icon"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- auto_resize="false"
- layout="topleft"
- height="30"
- width="30"
- left="25"
- top="1"
- tool_tip="Replace frame with settings from inventory"/>
- </layout_panel>
- <layout_panel name="frame_settings_water"
- auto_resize="true"
- user_resize="true"
- height="450"
- width="700"
- min_height="0"
- visible="true">
- <tab_container
- follows="all"
- halign="left"
- height="420"
- layout="topleft"
- left="0"
- name="water_tabs"
- tab_position="top"
- tab_width="140"
- tab_padding_right="3"
- top_pad="0"
- width="700">
- <panel
- border="true"
- class="panel_settings_water"
- filename="panel_settings_water.xml"
- label="Water"
- layout="topleft"
- left_delta="0"
- top_pad="5"
- name="water_panel"/>
- </tab_container>
- </layout_panel>
- <layout_panel name="frame_settings_sky"
- auto_resize="false"
- user_resize="true"
- height="450"
- width="700"
- min_height="0"
- visible="false">
- <tab_container
- follows="all"
- halign="left"
- height="386"
- visible="true"
- layout="topleft"
- left="0"
- name="sky_tabs"
- tab_position="top"
- tab_width="140"
- tab_padding_right="3"
- top_pad="0"
- width="700">
- <panel
- border="true"
- class="panel_settings_atmos"
- filename="panel_settings_sky_atmos.xml"
- label="Atmosphere & Lighting"
- layout="topleft"
- left_delta="0"
- top_pad="5"
- name="atmosphere_panel" />
- <panel
- border="true"
- class="panel_settings_cloud"
- filename="panel_settings_sky_clouds.xml"
- label="Clouds"
- layout="topleft"
- left_delta="0"
- top_pad="5"
- name="clouds_panel" />
- <panel
- border="true"
- class="panel_settings_sunmoon"
- filename="panel_settings_sky_sunmoon.xml"
- label="Sun & Moon"
- layout="topleft"
- left_delta="0"
- top_pad="5"
- name="moon_panel" />
- </tab_container>
+ <icon
+ border="1"
+ bevel_style="out"
+ name="icn_lock_edit"
+ layout="bottomleft"
+ follows="bottom"
+ image_name="Locked_Icon"
+ bottom="4"
+ left="5"
+ height="15"
+ width="15"
+ tab_stop="false"
+ visible="false"
+ tool_tip="Select a key frame above to edit settings"/>
+ <button
+ name="btn_load_frame"
+ follows="top"
+ image_overlay="Command_Inventory_Icon"
+ image_disabled="PushButton_Disabled"
+ image_disabled_selected="PushButton_Disabled"
+ image_selected="PushButton_Selected"
+ image_unselected="PushButton_Off"
+ hover_glow_amount="0.15"
+ auto_resize="false"
+ layout="topleft"
+ height="30"
+ width="30"
+ left="25"
+ top="1"
+ tool_tip="Replace frame with settings from inventory"/>
+ </layout_panel>
+ <layout_panel name="frame_settings_water"
+ auto_resize="true"
+ user_resize="true"
+ height="420"
+ width="700"
+ min_height="0"
+ visible="true">
+ <tab_container
+ follows="all"
+ halign="left"
+ height="420"
+ layout="topleft"
+ left="0"
+ name="water_tabs"
+ tab_position="top"
+ tab_width="140"
+ tab_padding_right="3"
+ top_pad="0"
+ width="700">
+ <panel
+ border="true"
+ class="panel_settings_water"
+ filename="panel_settings_water.xml"
+ label="Water"
+ layout="topleft"
+ left_delta="0"
+ top_pad="5"
+ name="water_panel"/>
+ </tab_container>
+ </layout_panel>
+ <layout_panel name="frame_settings_sky"
+ auto_resize="true"
+ user_resize="true"
+ height="420"
+ width="700"
+ min_height="0"
+ visible="false">
+ <tab_container
+ follows="all"
+ halign="left"
+ height="420"
+ visible="true"
+ layout="topleft"
+ left="0"
+ name="sky_tabs"
+ tab_position="top"
+ tab_width="140"
+ tab_padding_right="3"
+ top_pad="0"
+ width="700">
+ <panel
+ border="true"
+ class="panel_settings_atmos"
+ filename="panel_settings_sky_atmos.xml"
+ label="Atmosphere & Lighting"
+ layout="topleft"
+ left_delta="0"
+ top_pad="5"
+ name="atmosphere_panel" />
+ <panel
+ border="true"
+ class="panel_settings_cloud"
+ filename="panel_settings_sky_clouds.xml"
+ label="Clouds"
+ layout="topleft"
+ left_delta="0"
+ top_pad="5"
+ name="clouds_panel" />
+ <panel
+ border="true"
+ class="panel_settings_sunmoon"
+ filename="panel_settings_sky_sunmoon.xml"
+ label="Sun & Moon"
+ layout="topleft"
+ left_delta="0"
+ top_pad="5"
+ name="moon_panel" />
+ </tab_container>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
<layout_panel name="buttons"
auto_resize="false"
user_resize="true"
height="26"
- min_height="0"
+ min_height="26"
visible="true"
width="700">
<button
--
cgit v1.2.3