Merge

1 files changed, 144 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
new file mode 100644
index 0000000000..9f5e6828d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="465"
+ name="gestures"
+ help_topic="gestures"
+ title="GESTURES"
+ background_visible="true"
+ follows="all"
+ label="Places"
+ layout="topleft"
+ min_height="350"
+ min_width="240"
+ width="313">
+    <floater.string
+     name="loading">
+        Loading...
+    </floater.string>
+    <floater.string
+     name="playing">
+        (Playing)
+    </floater.string>
+    <!-- It's used to build new name for gesture created by "Copy" menu item -->
+    <floater.string
+     name="copy_name">Copy of [COPY_NAME]</floater.string>
+    <scroll_list
+     bottom_delta="400"
+     draw_heading="true"
+     follows="all"
+     layout="topleft"
+     left="0"
+     multi_select="true"
+     top="20"
+     name="gesture_list">
+        <scroll_list.columns
+         label="Name"
+         name="name"
+         width="153" />
+        <scroll_list.columns
+         label="Chat"
+         name="trigger"
+         width="80" />
+       <scroll_list.columns
+         label=""
+         name="key"
+         width="-1" />
+        <scroll_list.columns
+         label="Key"
+         name="shortcut"
+         width="80" />
+    </scroll_list>
+              <panel
+             background_visible="true"
+             bevel_style="none"
+             top_pad="0"
+             follows="left|right|bottom"
+             height="30"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="bottom_panel"
+             width="313">
+              <menu_button
+               follows="bottom|left"
+               height="18"
+               image_disabled="OptionsMenu_Disabled"
+               image_selected="OptionsMenu_Press"
+               image_unselected="OptionsMenu_Off"
+               layout="topleft"
+               left="10"
+               menu_filename="menu_gesture_gear.xml"
+               name="gear_btn"
+               top="5"
+               tool_tip="More options"
+               width="18" />
+              <button
+                 follows="bottom|left"
+                 font="SansSerifBigBold"
+                 height="18"
+                 image_selected="AddItem_Press"
+                 image_unselected="AddItem_Off"
+                 image_disabled="AddItem_Disabled"
+                 layout="topleft"
+                 left_pad="5"
+                 name="new_gesture_btn"
+                 tool_tip="Make new gesture"
+                 top_delta="0"
+                 width="18" />
+              <button
+                 follows="bottom|left"
+                 font="SansSerifBigBold"
+                 height="10"
+                 image_hover_selected="Activate_Checkmark"
+                 image_selected="Activate_Checkmark"
+                 image_unselected="Activate_Checkmark"
+                 layout="topleft"
+                 left_pad="5"
+                 name="activate_btn"
+                 tool_tip="Activate/Deactivate selected gesture"
+                 top="10"
+                 width="10" />
+              <button
+                 follows="bottom|right"
+                 font="SansSerifBigBold"
+                 height="18"
+                 image_selected="TrashItem_Press"
+                 image_unselected="TrashItem_Off"
+                 image_disabled="TrashItem_Disabled"
+                 layout="topleft"
+                 name="del_btn"
+                 right="-5"
+                 tool_tip="Delete this gesture"
+                 top_delta="0"
+                 width="18" />
+            </panel>
+    <button
+     follows="left|bottom"
+     height="23"
+     label="Edit"
+     layout="topleft"
+     left="6"
+     name="edit_btn"
+     top_pad="5"
+     width="83" />
+    <button
+     follows="left|bottom"
+     height="23"
+     label="Play"
+     layout="topleft"
+     left_pad="6"
+     name="play_btn"
+     top_delta="0"
+     width="83" />
+    <button
+     follows="left|bottom"
+     height="23"
+     label="Stop"
+     layout="topleft"
+     left_delta="0"
+     name="stop_btn"
+     top_delta="0"
+     width="83" />
+</floater>