From 73e6407af8f802bbc4a3932bc5ac32ca8f13ab56 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 7 May 2010 22:07:01 +0300
Subject: EXT-2493 FIXED Added strafe buttons.

- Added slide left and Move right buttons to movement actions panel, when inserting them in xml organized buttons in panel into 3 columns to make their position more easily configurable.

- Removed hiding of fly up and down buttons. When not flying(in walk/run mode) they act as jump ans crouch.

- Added movement mode(walk/run/fly) dependent tooltips for fly/jump/crouch and slide buttons.

- Added comment regarding implementation of move floater buttons toggling when user moves via keyboard (because it's not quite obvious and time consuming when you first encounter it) to LLFloaterMove::postBuild().

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/360

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_moveview.xml      | 146 +++++++++++++++------
 .../default/xui/en/panel_stand_stop_flying.xml     |   6 +-
 2 files changed, 112 insertions(+), 40 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 8e2c57764b..a685094190 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -13,7 +13,7 @@
  save_rect="true"
  save_visibility="true"
  save_dock_state="true"
- width="115">
+ width="113">
     <string
      name="walk_forward_tooltip">
         Walk Forward (press Up Arrow or W)
@@ -22,6 +22,14 @@
      name="walk_back_tooltip">
         Walk Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="walk_left_tooltip">
+        Walk left (press Shift + Left Arrow or A)
+    </string>
+    <string
+     name="walk_right_tooltip">
+        Walk right (press Shift + Right Arrow or D)
+    </string>
     <string
      name="run_forward_tooltip">
         Run Forward (press Up Arrow or W)
@@ -30,6 +38,14 @@
      name="run_back_tooltip">
         Run Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="run_left_tooltip">
+        Run left (press Shift + Left Arrow or A)
+    </string>
+    <string
+     name="run_right_tooltip">
+        Run right (press Shift + Right Arrow or D)
+    </string>
     <string
      name="fly_forward_tooltip">
         Fly Forward (press Up Arrow or W)
@@ -38,6 +54,30 @@
      name="fly_back_tooltip">
         Fly Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="fly_left_tooltip">
+        Fly left (press Shift + Left Arrow or A)
+    </string>
+    <string
+     name="fly_right_tooltip">
+        Fly right (press Shift + Right Arrow or D)
+    </string>
+    <string
+     name="fly_up_tooltip">
+        Fly up (press E)
+    </string>
+    <string
+     name="fly_down_tooltip">
+        Fly down (press C)
+    </string>
+    <string
+     name="jump_tooltip">
+        Jump (press E)
+    </string>
+    <string
+     name="crouch_tooltip">
+        Crouch (press C)
+    </string>
     <string
      name="walk_title">
         Walk
@@ -59,59 +99,91 @@
      mouse_opaque="false"
      name="panel_actions"
      top="0"
-     width="115">
+     width="113">
+        <!-- Buttons in panel are organized in 3 columns to enable their easy vertical adjustment via top_pad-->
+        <!-- Left column -->
         <button
          follows="left|bottom"
-         height="25"
+         height="24"
+         image_selected="Movement_Up_On"
+         image_pressed_selected="Movement_Up_On"
+         image_unselected="Movement_Up_Off"
+         layout="topleft"
+         left="23"
+         name="move up btn"
+         scale_image="false"
+         tool_tip="Fly up (press E)"
+         top="18"
+         width="24" />
+        <button
+         follows="left|bottom"
+         height="24"
          image_selected="Movement_TurnLeft_On"
          image_pressed_selected="Movement_TurnLeft_On"
          image_unselected="Movement_TurnLeft_Off"
          layout="topleft"
-         left="17"
+         left="15"
          name="turn left btn"
          scale_image="false"
          tool_tip="Turn left (press Left Arrow or A)"
-         top="45"
-         width="25" />
-        <button
-         follows="left|bottom"
-         height="25"
-         image_selected="Movement_TurnRight_On"
-         image_pressed_selected="Movement_TurnRight_On"
-         image_unselected="Movement_TurnRight_Off"
-         layout="topleft"
-         left_pad="34"
-         name="turn right btn"
-         scale_image="false"
-         tool_tip="Turn right (press Right Arrow or D)"
-         top_delta="0"
-         width="25" />
-        <button
+         top_pad="-3"
+         width="24" />
+        <joystick_slide
          follows="left|bottom"
-         height="25"
-         image_selected="Movement_Up_On"
-         image_pressed_selected="Movement_Up_On"
-         image_unselected="Movement_Up_Off"
+         height="24"
+         image_selected="Movement_Left_On"
+         image_pressed_selected="Movement_Left_On"
+         image_unselected="Movement_Left_Off"
          layout="topleft"
-         left="10"
-         name="move up btn"
+         left="18"
+         name="move left btn"
+         quadrant="left"
          scale_image="false"
-         tool_tip="Fly up, press E"
-         top="14"
-         width="25" />
+         tool_tip="Walk left (press Shift + Left Arrow or A)"
+         top_pad="-3"
+         width="24" />
+        <!-- Right column -->
         <button
          follows="left|bottom"
-         height="25"
+         height="24"
          image_selected="Movement_Down_On"
          image_pressed_selected="Movement_Down_On"
          image_unselected="Movement_Down_Off"
          layout="topleft"
-         left_pad="45"
+         right="-21"
          name="move down btn"
          scale_image="false"
-         tool_tip="Fly down, press C"
-         top_delta="0"
-         width="20" />
+         tool_tip="Fly down (press C)"
+         top="18"
+         width="24" />
+        <button
+         follows="left|bottom"
+         height="24"
+         image_selected="Movement_TurnRight_On"
+         image_pressed_selected="Movement_TurnRight_On"
+         image_unselected="Movement_TurnRight_Off"
+         layout="topleft"
+         right="-13"
+         name="turn right btn"
+         scale_image="false"
+         tool_tip="Turn left (press Right Arrow or D)"
+         top_pad="-3"
+         width="24" />
+        <joystick_slide
+         follows="left|bottom"
+         height="24"
+         image_selected="Movement_Right_On"
+         image_pressed_selected="Movement_Right_On"
+         image_unselected="Movement_Right_Off"
+         layout="topleft"
+         name="move right btn"
+         quadrant="right"
+         right="-16"
+         scale_image="false"
+         tool_tip="Walk right (press Shift + Right Arrow or D)"
+         top_pad="-3"
+         width="24" />
+        <!-- Middle column -->
         <joystick_turn
          follows="left|bottom"
          height="25"
@@ -124,7 +196,7 @@
          quadrant="up"
          scale_image="false"
          tool_tip="Walk forward (press up arrow or W)"
-         top_delta="10"
+         top="22"
          width="21" />
         <joystick_turn
          follows="left|bottom"
@@ -138,7 +210,7 @@
          quadrant="down"
          scale_image="false"
          tool_tip="Walk backward (press down arrow or S)"
-         top_delta="30"
+         top_pad="7"
          width="21" />
     </panel>
 <!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml -->
@@ -149,7 +221,7 @@
      left="0"
      name="panel_modes"
      top_pad="0"
-     width="115">
+     width="113">
         <button
          follows="left|bottom"
          height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
index b48943c699..3effc9de89 100644
--- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -6,7 +6,7 @@
  name="panel_stand_stop_flying"
  mouse_opaque="false"
  visible="true"
- width="115">
+ width="113">
     <button
      follows="left|bottom"
      height="19"
@@ -16,7 +16,7 @@
      tool_tip="Click here to stand up."
      top="2"
      visible="false"
-     width="115" />
+     width="113" />
     <button
      follows="left|bottom"
      height="19"
@@ -26,5 +26,5 @@
      tool_tip="Stop flying"
      top="2"
      visible="false"
-     width="115" />
+     width="113" />
 </panel>
-- 
cgit v1.2.3