summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-05-23 19:01:52 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-05-23 19:01:52 +0300
commitc75eeab8391859e0819de0afbf9acc2293864f1e (patch)
tree6a28c2e613aafb29996ceb42e9c0df192ccaf341 /indra/newview/skins/default/xui
parentfbaa01d9a0c63386f13f0e43437c69f700950fd6 (diff)
MAINT-8344 Day Cycle Editor (playing)
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml120
1 files changed, 59 insertions, 61 deletions
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 c4de2cdaee..1b07d1aa27 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
@@ -47,7 +47,7 @@
follows="top|left"
layout="topleft"
left_pad="10"
- max_chars="100"
+ max_length_bytes="100"
name="day_cycle_name"
top="5"
width="200"
@@ -74,8 +74,6 @@
<panel name="timeline_layers"
border="false"
follows="left|top"
- auto_resize="false"
- user_resize="true"
height="150"
width="110"
top_pad="0"
@@ -150,8 +148,6 @@
<panel name="timeline"
border="true"
follows="left|top"
- auto_resize="false"
- user_resize="true"
height="150"
min_height="0"
width="595"
@@ -205,7 +201,6 @@
value="100%[DSC]"
width="80" />
<multi_slider
- can_edit_text="true"
decimal_digits="0"
draw_track="false"
follows="bottom"
@@ -220,11 +215,9 @@
show_text="false"
top_pad="0"
use_triangle="true"
- width="525"
- min_width="525"/>
+ width="525" />
<multi_slider
- can_edit_text="true"
decimal_digits="0"
follows="bottom"
height="10"
@@ -237,8 +230,7 @@
name="WLDayCycleFrames"
show_text="false"
top_pad="15"
- width="525"
- min_width="525" />
+ width="525" />
<text
follows="left|bottom"
@@ -246,7 +238,6 @@
layout="topleft"
left_pad="0"
name="current_time"
- select_on_focus="true"
value="[PRCNT]%[DSC]"
top_delta="-5"
width="70" />
@@ -272,25 +263,29 @@
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"/>
+ 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"
+ name="play_layout"
mouse_opaque="false"
auto_resize="false"
layout="topleft"
@@ -312,11 +307,15 @@
height="25"
width="25"
left="0"
- top="0" />
+ top="0">
+ <button.commit_callback
+ function="DayCycle.PlayActions"
+ parameter="play" />
+ </button>
</layout_panel>
<layout_panel
- name="pause"
+ name="pause_layout"
mouse_opaque="false"
auto_resize="false"
layout="topleft"
@@ -339,32 +338,40 @@
height="25"
width="25"
left="0"
- top="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">
+ 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" />
+ 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>
@@ -505,15 +512,6 @@
name="cancel_btn"
width="100" />
- <!--<button
- follows="top|left"
- height="23"
- label="Upload"
- layout="topleft"
- left_pad="10"
- name="upload_btn"
- width="100" />-->
-
</layout_panel>
</layout_stack>