summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorLisabeth Pardi <lis@lindenlab.com>2009-09-15 20:59:50 +0000
committerLisabeth Pardi <lis@lindenlab.com>2009-09-15 20:59:50 +0000
commit47a9bd447c2083351b55f4e010e4d3c8a5fde153 (patch)
tree505abb79ca337672fa01bdb3c15f38358df93735 /indra/newview/skins/default
parent9bcace0608c79ae881a33b0bcc6d6ea701021147 (diff)
small tweaks for height and padding
commented out a bunch of options to make it cosmetically nice. will reinstate soon. EXT-147
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preview_gesture.xml26
-rw-r--r--indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml126
-rw-r--r--indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml108
4 files changed, 119 insertions, 145 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 0f6504c875..c196bbe852 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
auto_tile="true"
- height="700"
+ height="800"
layout="topleft"
name="gesture_preview"
width="280">
@@ -89,14 +89,14 @@
follows="all"
name="group_accordion">
<accordion_tab
- min_height="75"
+ min_height="90"
title="Shortcuts"
name="snapshot_destination_tab"
an_resize="false">
<panel
- class="floater_snapshot_destination"
+ class="floater_preview_shortcut"
filename="floater_preview_gesture_shortcut.xml"
- name="snapshot_destination_tab"/>
+ name="floater_preview_shortcut"/>
</accordion_tab>
<accordion_tab
min_height="400"
@@ -104,21 +104,21 @@
name="snapshot_file_settings_tab"
can_resize="false">
<panel
- class="floater_snapshot_file_settings"
+ class="floater_preview_steps"
filename="floater_preview_gesture_steps.xml"
- name="snapshot_file_settings_tab"/>
+ name="floater_preview_steps"/>
</accordion_tab>
<accordion_tab
- min_height="100"
+ min_height="155"
title="Info"
name="snapshot_capture_tab"
can_resize="false">
<panel
- class="floater_snapshot_capture"
- filename="floater_snapshot_Info.xml"
- name="snapshot_capture_panel"/>
+ class="floater_preview_info"
+ filename="floater_preview_gesture_info.xml"
+ name="floater_preview_info"/>
</accordion_tab>
- <accordion_tab
+ <!--accordion_tab
min_height="100"
title="Permissions"
name="snapshot_capture_tab2"
@@ -127,7 +127,7 @@
class="floater_snapshot_capture"
filename="floater_snapshot_Permissions.xml"
name="snapshot_capture_panel2"/>
- </accordion_tab>
+ </accordion_tab-->
</accordion>
<!--check_box
follows="top|left"
@@ -147,7 +147,7 @@
layout="topleft"
left="20"
name="preview_btn"
- top_pad="-80"
+ top_pad="30"
width="80" />
<button
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml
index b4a7e8fefd..b20a6fe868 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml
@@ -13,27 +13,9 @@
height="110"
layout="topleft"
left="10"
- name="step_list"
- top_pad="10"
- width="260" />
- <button
- follows="top|left"
- height="20"
- font="SansSerifSmall"
- label="Add"
- layout="topleft"
- left_pad="-100"
- name="add_btn"
- top_pad="5"
- width="100" />
- <scroll_list
- follows="top|left"
- height="110"
- layout="topleft"
- left="10"
name="library_list"
- top_pad="10"
- width="260">
+ top="10"
+ width="240">
<scroll_list.rows
value="Animation" />
<scroll_list.rows
@@ -43,7 +25,7 @@
<scroll_list.rows
value="Wait" />
</scroll_list>
- <button
+ <!--button
follows="top|left"
height="20"
label="Preview"
@@ -69,105 +51,5 @@
left_pad="5"
name="save_btn"
top_delta="0"
- width="80" />
- <text
- type="string"
- length="1"
- follows="top|left"
- font="SansSerifSmall"
- height="60"
- layout="topleft"
- left="10"
- name="help_label"
- top_pad="10"
- width="200">
- All steps happen simultaneously,
-unless you add wait steps.
- </text>
- <text
- follows="top|left"
- height="60"
- layout="topleft"
- left="10"
- name="options_text"
- top_pad="10"
- width="205" />
- <combo_box
- follows="top|left"
- height="20"
- layout="topleft"
- left_delta="10"
- name="animation_list"
- top_pad="10"
- width="100" />
- <combo_box
- follows="top|left"
- height="20"
- layout="topleft"
- left_delta="0"
- name="sound_list"
- top_delta="0"
- width="100" />
- <line_editor
- follows="top|left"
- height="20"
- layout="topleft"
- left_delta="0"
- max_length="127"
- name="chat_editor"
- top_delta="0"
- width="100" />
- <radio_group
- draw_border="false"
- follows="top|left"
- height="40"
- layout="topleft"
- left_pad="8"
- name="animation_trigger_type"
- top="445"
- width="80">
- <radio_item
- height="16"
- label="Start"
- layout="topleft"
- left="3"
- name="start"
- top="-11"
- width="80" />
- <radio_item
- height="16"
- label="Stop"
- layout="topleft"
- left_delta="0"
- name="stop"
- top_pad="10"
- width="80" />
- </radio_group>
- <check_box
- follows="top|left"
- height="20"
- label="until animations are done"
- layout="topleft"
- left="16"
- name="wait_anim_check"
- top="430"
- width="100" />
- <check_box
- follows="top|left"
- height="20"
- label="time in seconds"
- layout="topleft"
- left_delta="0"
- name="wait_time_check"
- top_delta="20"
- width="100" />
- <line_editor
- follows="top|left"
- height="20"
- layout="topleft"
- left_pad="5"
- max_length="15"
- name="wait_time_editor"
- top_delta="0"
- width="50" />
+ width="80" /-->
</floater> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml
index 75fb24d640..17b6766f67 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml
@@ -2,7 +2,7 @@
<floater
can_minimize="false"
follows="left|top"
- height="80"
+ height="90"
layout="topleft"
name="Gesture"
save_rect="true"
@@ -47,7 +47,7 @@
height="20"
label="None"
layout="topleft"
- left_pad="5"
+ left_pad="13"
name="modifier_combo"
top_delta="-4"
width="50" />
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml
index f0e88b9dd4..a8f7e95aed 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml
@@ -15,18 +15,110 @@
left="10"
name="step_list"
top_pad="10"
- width="260" />
- <button
+ width="240" />
+ <!--text
+ type="string"
+ length="1"
follows="top|left"
- height="20"
font="SansSerifSmall"
- label="Add"
+ height="60"
+ layout="topleft"
+ left="10"
+ name="help_label"
+ top_pad="10"
+ width="200">
+ All steps happen simultaneously,
+unless you add wait steps.
+ </text-->
+ <!--text
+ follows="top|left"
+ height="60"
+ layout="topleft"
+ left="10"
+ name="options_text"
+ top_pad="10"
+ width="205" /-->
+ <!--combo_box
+ follows="top|left"
+ height="20"
+ layout="topleft"
+ left_delta="10"
+ name="animation_list"
+ top_pad="10"
+ width="100" />
+ <combo_box
+ follows="top|left"
+ height="20"
layout="topleft"
- left_pad="-100"
- name="add_btn"
- top_pad="5"
+ left_delta="0"
+ name="sound_list"
+ top_delta="10"
width="100" />
-
+ <line_editor
+ follows="top|left"
+ height="20"
+ layout="topleft"
+ left_delta="0"
+ max_length="127"
+ name="chat_editor"
+ top_pad="10"
+ width="100" />
+ <radio_group
+ draw_border="false"
+ follows="top|left"
+ height="40"
+ layout="topleft"
+ left_pad="8"
+ name="animation_trigger_type"
+ top_pad="10"
+ width="80">
+ <radio_item
+ height="16"
+ label="Start"
+ layout="topleft"
+ left="3"
+ name="start"
+ top="-11"
+ width="80" />
+ <radio_item
+ height="16"
+ label="Stop"
+ layout="topleft"
+ left_delta="0"
+ name="stop"
+ top_pad="10"
+ width="80" />
+ </radio_group>
+ <check_box
+ follows="top|left"
+ height="20"
+ label="until animations are done"
+ layout="topleft"
+ left="16"
+ name="wait_anim_check"
+ top_pad="10"
+ width="100" />
+ <check_box
+ follows="top|left"
+ height="20"
+ label="time in seconds"
+ layout="topleft"
+ left_delta="0"
+ name="wait_time_check"
+ top_pad="10"
+ width="100" />
+ <line_editor
+ follows="top|left"
+ height="20"
+ layout="topleft"
+ left_pad="5"
+ max_length="15"
+ name="wait_time_editor"
+ top_pad="10"
+ width="50" /-->
+
+
+
<!--For pop out floater-->
<!--scroll_list
follows="top|left"