Skip to content
Snippets Groups Projects
Commit 6a9f38d1 authored by Erica Olsen's avatar Erica Olsen
Browse files

Animation preview - updated widgets and layout

parent e51ae529
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/skins/default/xui/en/floater_animation_preview.xml
+ 61
− 60
View file @ 6a9f38d1
...@@ -150,16 +150,16 @@ Maximum animation length is [MAX_LENGTH] seconds. ...@@ -150,16 +150,16 @@ Maximum animation length is [MAX_LENGTH] seconds.
length="1" length="1"
bottom="42" bottom="42"
follows="top|left" follows="top|left"
height="15" height="23"
layout="topleft" layout="topleft"
left="10" left="10"
name="name_label"> name="name_label">
Name: Name:
</text> </text>
<line_editor <line_editor
bottom_delta="2" bottom_delta="0"
follows="top|left|right" follows="top|left|right"
height="19" height="23"
layout="topleft" layout="topleft"
left="85" left="85"
name="name_form" name="name_form"
...@@ -167,18 +167,18 @@ Maximum animation length is [MAX_LENGTH] seconds. ...@@ -167,18 +167,18 @@ Maximum animation length is [MAX_LENGTH] seconds.
<text <text
type="string" type="string"
length="1" length="1"
bottom_delta="22" top_pad="5"
follows="top|left" follows="top|left"
height="15" height="23"
layout="topleft" layout="topleft"
left="10" left="10"
name="description_label"> name="description_label">
Description: Description:
</text> </text>
<line_editor <line_editor
bottom_delta="2" bottom_delta="0"
follows="top|left|right" follows="top|left|right"
height="19" height="23"
layout="topleft" layout="topleft"
left="85" left="85"
name="description_form" name="description_form"
...@@ -186,70 +186,73 @@ Maximum animation length is [MAX_LENGTH] seconds. ...@@ -186,70 +186,73 @@ Maximum animation length is [MAX_LENGTH] seconds.
<spinner <spinner
decimal_digits="0" decimal_digits="0"
follows="left|top" follows="left|top"
height="18" height="23"
increment="1" increment="1"
initial_value="0" initial_value="0"
label="Priority" label="Priority"
label_width="50" label_width="90"
layout="topleft" layout="topleft"
left="10" left="10"
max_val="4" max_val="4"
name="priority" name="priority"
tool_tip="Controls which other animations can be overridden by this animation." tool_tip="Controls which other animations can be overridden by this animation."
width="90" /> width="160" />
<check_box <check_box
bottom_delta="23" top_pad="0"
height="18" height="14"
label="Loop" label="Loop"
layout="topleft" layout="topleft"
left="10" left="10"
width="100"
name="loop_check" name="loop_check"
tool_tip="Makes this animation loop." /> tool_tip="Makes this animation loop." />
<spinner <spinner
follows="left|top" follows="left|top"
height="18" height="23"
increment="1" increment="1"
initial_value="0" initial_value="0"
label="In(%)" label="In(%)"
label_width="30" label_width="35"
layout="topleft" layout="topleft"
left_delta="70" top_pad="5"
left="30"
max_val="100" max_val="100"
name="loop_in_point" name="loop_in_point"
tool_tip="Sets point in animation that looping returns to." tool_tip="Sets point in animation that looping returns to."
top_delta="2" width="110" />
width="90" />
<spinner <spinner
bottom_delta="0" bottom_delta="0"
follows="left|top" follows="left|top"
height="18" height="23"
increment="1" increment="1"
initial_value="0" initial_value="0"
label="Out(%)" label="Out(%)"
layout="topleft" layout="topleft"
left="185" left_pad="10"
max_val="100" max_val="100"
name="loop_out_point" name="loop_out_point"
tool_tip="Sets point in animation that ends a loop." /> tool_tip="Sets point in animation that ends a loop."
label_width="45"
width="120" />
<text <text
type="string" type="string"
length="1" length="1"
bottom_delta="20" top_pad="0"
follows="top|left" follows="top|left"
height="15" height="23"
width="110"
layout="topleft" layout="topleft"
left="10" left="10"
name="hand_label"> name="hand_label">
Hand Pose Hand Pose
</text> </text>
<combo_box <combo_box
height="18" height="23"
layout="topleft" layout="topleft"
left_delta="76" left_pad="0"
name="hand_pose_combo" name="hand_pose_combo"
tool_tip="Controls what hands do during animation." tool_tip="Controls what hands do during animation."
top_delta="-1" width="150">
width="104">
<combo_box.item <combo_box.item
label="Spread" label="Spread"
name="Spread" name="Spread"
...@@ -306,22 +309,22 @@ Maximum animation length is [MAX_LENGTH] seconds. ...@@ -306,22 +309,22 @@ Maximum animation length is [MAX_LENGTH] seconds.
<text <text
type="string" type="string"
length="1" length="1"
bottom_delta="22" top_pad="5"
follows="top|left" follows="top|left"
height="15" height="23"
width="110"
layout="topleft" layout="topleft"
left="10" left="10"
name="emote_label"> name="emote_label">
Expression Expression
</text> </text>
<combo_box <combo_box
height="18" height="23"
width="150"
layout="topleft" layout="topleft"
left_delta="76" left_pad="0"
name="emote_combo" name="emote_combo"
tool_tip="Controls what face does during animation." tool_tip="Controls what face does during animation.">
top_delta="-1"
width="104">
<combo_box.item <combo_box.item
label="(None)" label="(None)"
name="[None]" /> name="[None]" />
...@@ -386,23 +389,22 @@ Maximum animation length is [MAX_LENGTH] seconds. ...@@ -386,23 +389,22 @@ Maximum animation length is [MAX_LENGTH] seconds.
<text <text
type="string" type="string"
length="1" length="1"
top_pad="5"
follows="top|left" follows="top|left"
height="15" height="23"
width="110"
layout="topleft" layout="topleft"
left="10" left="10"
name="preview_label" name="preview_label">
top="167"
width="70">
Preview while Preview while
</text> </text>
<combo_box <combo_box
height="18" height="23"
width="150"
layout="topleft" layout="topleft"
left_pad="6" left_pad="0"
name="preview_base_anim" name="preview_base_anim"
tool_tip="Use this to test your animation behavior while your avatar performs common actions." tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
top_delta="-1"
width="104">
<combo_box.item <combo_box.item
label="Standing" label="Standing"
name="Standing" /> name="Standing" />
...@@ -418,32 +420,31 @@ Maximum animation length is [MAX_LENGTH] seconds. ...@@ -418,32 +420,31 @@ Maximum animation length is [MAX_LENGTH] seconds.
</combo_box> </combo_box>
<spinner <spinner
follows="left|top" follows="left|top"
height="18" height="23"
increment="0.01" increment="0.01"
initial_value="0" initial_value="0"
label="Ease In (sec)" label="Ease In (sec)"
label_width="75" label_width="110"
layout="topleft" layout="topleft"
left="10" left="10"
max_val="10" max_val="10"
name="ease_in_time" name="ease_in_time"
tool_tip="Amount of time (in seconds) over which animations blends in." tool_tip="Amount of time (in seconds) over which animations blends in."
top="191" top_pad="10"
width="125" /> width="200" />
<spinner <spinner
follows="left|top" follows="left|top"
height="18" height="23"
increment="0.01" increment="0.01"
initial_value="0" initial_value="0"
label="Ease Out (sec)" label="Ease Out (sec)"
label_width="80" label_width="110"
layout="topleft" layout="topleft"
left_pad="10" top_pad="0"
max_val="10" max_val="10"
name="ease_out_time" name="ease_out_time"
tool_tip="Amount of time (in seconds) over which animations blends out." tool_tip="Amount of time (in seconds) over which animations blends out."
top_delta="0" width="200" />
width="130" />
<button <button
follows="top|right" follows="top|right"
height="28" height="28"
...@@ -454,7 +455,7 @@ Maximum animation length is [MAX_LENGTH] seconds. ...@@ -454,7 +455,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
name="play_btn" name="play_btn"
picture_style="true" picture_style="true"
tool_tip="Play/pause your animation." tool_tip="Play/pause your animation."
top="223" top_pad="0"
width="28" /> width="28" />
<button <button
follows="top|right" follows="top|right"
...@@ -469,23 +470,23 @@ Maximum animation length is [MAX_LENGTH] seconds. ...@@ -469,23 +470,23 @@ Maximum animation length is [MAX_LENGTH] seconds.
top_delta="0" top_delta="0"
width="28" /> width="28" />
<slider <slider
bottom_delta="0" left_pad="0"
follows="top|right" follows="top|right"
height="20" height="23"
width="200"
increment="0.0001" increment="0.0001"
initial_value="0" initial_value="0"
layout="topleft" layout="topleft"
left="80"
name="playback_slider" name="playback_slider"
right="275"
show_text="false" /> show_text="false" />
<text <text
type="string" type="string"
length="1" length="1"
bottom="306" top_pad="5"
text_color="EmphasisColor"
follows="top|left" follows="top|left"
layout="topleft" layout="topleft"
left="10" left="70"
name="bad_animation_text"> name="bad_animation_text">
Unable to read animation file. Unable to read animation file.
...@@ -494,7 +495,7 @@ We recommend BVH files exported from Poser 4. ...@@ -494,7 +495,7 @@ We recommend BVH files exported from Poser 4.
<button <button
bottom="546" bottom="546"
follows="bottom|right" follows="bottom|right"
height="20" height="23"
label="Cancel" label="Cancel"
layout="topleft" layout="topleft"
name="cancel_btn" name="cancel_btn"
...@@ -502,7 +503,7 @@ We recommend BVH files exported from Poser 4. ...@@ -502,7 +503,7 @@ We recommend BVH files exported from Poser 4.
width="123" /> width="123" />
<button <button
follows="bottom|left" follows="bottom|left"
height="20" height="23"
label="Upload (L$[AMOUNT])" label="Upload (L$[AMOUNT])"
layout="topleft" layout="topleft"
left_delta="-129" left_delta="-129"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment