MAINT-8334 EEP UI control: Virtual Trackball

13 files changed, 104 insertions, 34 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index a16b1a68ad..a177dbadd5 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -689,6 +689,16 @@ with the same filename but different name
   
   <texture name="Vertical Drag Handle" file_name="widgets/vertical_drag_handle.png" scale.left="2" scale.right="7" scale.bottom="8" scale.top="120"  scale_type="scale_outer"/>
 
+  <texture name="VirtualTrackball_Moon_Back" file_name="widgets/track_control_moon_back.png" />
+  <texture name="VirtualTrackball_Moon_Front" file_name="widgets/track_control_moon_front.png" />
+  <texture name="VirtualTrackball_Rotate_Bottom" file_name="widgets/track_control_rotate_bottom.png" />
+  <texture name="VirtualTrackball_Rotate_Left" file_name="widgets/track_control_rotate_left_side.png" />
+  <texture name="VirtualTrackball_Rotate_Right" file_name="widgets/track_control_rotate_right_side.png" />
+  <texture name="VirtualTrackball_Rotate_Top" file_name="widgets/track_control_rotate_top.png" />
+  <texture name="VirtualTrackball_Sphere" file_name="widgets/track_control_sphere.png" />
+  <texture name="VirtualTrackball_Sun_Back" file_name="widgets/track_control_sun_back.png" />
+  <texture name="VirtualTrackball_Sun_Front" file_name="widgets/track_control_sun_front.png" />
+    
     <texture name="Volume_Background" file_name="windows/Volume_Background.png" preload="false"
            scale.left="6" scale.top="33" scale.right="63" scale.bottom="10" />
 
diff --git a/indra/newview/skins/default/textures/widgets/track_control_moon_back.png b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png
new file mode 100644
index 0000000000..73d24e53f6
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png
diff --git a/indra/newview/skins/default/textures/widgets/track_control_moon_front.png b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png
new file mode 100644
index 0000000000..64def00772
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png
diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_bottom.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_bottom.png
new file mode 100644
index 0000000000..232c812aae
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_bottom.png
diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_left_side.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_left_side.png
new file mode 100644
index 0000000000..bcc78fc5e4
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_left_side.png
diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_right_side.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_right_side.png
new file mode 100644
index 0000000000..d0827abf28
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_right_side.png
diff --git a/indra/newview/skins/default/textures/widgets/track_control_rotate_top.png b/indra/newview/skins/default/textures/widgets/track_control_rotate_top.png
new file mode 100644
index 0000000000..13a5e9c2e8
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/track_control_rotate_top.png
diff --git a/indra/newview/skins/default/textures/widgets/track_control_sphere.png b/indra/newview/skins/default/textures/widgets/track_control_sphere.png
new file mode 100644
index 0000000000..a13b7725ea
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/track_control_sphere.png
diff --git a/indra/newview/skins/default/textures/widgets/track_control_sun_back.png b/indra/newview/skins/default/textures/widgets/track_control_sun_back.png
new file mode 100644
index 0000000000..23c89068f8
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/track_control_sun_back.png
diff --git a/indra/newview/skins/default/textures/widgets/track_control_sun_front.png b/indra/newview/skins/default/textures/widgets/track_control_sun_front.png
new file mode 100644
index 0000000000..6dfdc04423
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/track_control_sun_front.png
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 fb53eb969b..aac2084543 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
@@ -6,7 +6,7 @@
         save_rect="true"
         title="Edit Day Cycle"
         width="705"
-        height="602"
+        height="650"
         min_width="450"
         min_height="85"
         can_resize="true">
@@ -22,7 +22,7 @@
 
     <layout_stack name="outer_stack"
             width="705"
-            height="602"
+            height="650"
             follows="all"
             animate="false"
             top="0"
@@ -450,14 +450,14 @@
                 <layout_panel name="frame_settings_water"
                         auto_resize="true"
                         user_resize="true"
-                        height="420"
+                        height="500"
                         width="700"
                         min_height="0"
                         visible="true">
                     <tab_container
                             follows="all"
                             halign="left"
-                            height="420"
+                            height="430"
                             layout="topleft"
                             left="0"
                             name="water_tabs"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 1323ad6a17..a951e39697 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -21,7 +21,7 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="75">
+                height="350">
             <text
                     follows="left|top"
                     height="10"
@@ -117,7 +117,7 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="75">
+                height="350">
             <layout_stack 
                     left="5"
                     top="5"
@@ -131,7 +131,7 @@
                         auto_resize="true"
                         user_resize="true"
                         visible="true"
-                        height="75">
+                        height="220">
                     <text
                             follows="left|top"
                             height="10"
@@ -151,23 +151,19 @@
                             width="100">
                         Position:
                     </text>
-                    <joystick_quat
-                            follows="left|top"
-                            height="78"
-                            layout="topleft"
-                            left_delta="0"
-                            top_delta="20"
-                            name="sun_rotation"
-                            quadrant="left"
-                            sound_flags="3"
-                            visible="true"
-                            tool_tip="Move sun in sky"
-                            width="78" /> <!-- Should be 126x126 -->
+                    <sun_moon_trackball
+                        name="sun_rotation"
+                        follows="left|top"
+                        left_delta="0"
+                        top_delta="20"
+                        height="150"
+                        width="150"
+                        thumb_mode="sun" />
                     <text
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="100"
+                            left_delta="160"
                             top_delta="-20"
                             width="200">
                         Image:
@@ -186,7 +182,7 @@
                         auto_resize="true"
                         user_resize="true"
                         visible="true"
-                        height="75">
+                        height="220">
                     <text
                             follows="left|top"
                             height="10"
@@ -206,23 +202,19 @@
                             width="100">
                         Position:
                     </text>
-                    <joystick_quat
-                            follows="left|top"
-                            height="78"
-                            layout="topleft"
-                            left_delta="0"
-                            top_delta="20"
-                            name="moon_rotation"
-                            quadrant="left"
-                            sound_flags="3"
-                            visible="true"
-                            tool_tip="Move sun in sky"
-                            width="78" /> <!-- Should be 126x126 -->
+                    <sun_moon_trackball
+                        name="moon_rotation"
+                        follows="left|top"
+                        left_delta="0"
+                        top_delta="20"
+                        height="150"
+                        width="150"
+                        thumb_mode="moon" />
                     <text
                             follows="left|top"
                             height="10"
                             layout="topleft"
-                            left_delta="100"
+                            left_delta="160"
                             top_delta="-20"
                             width="200">
                         Image:
diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
new file mode 100644
index 0000000000..68681b8228
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<sun_moon_trackball
+    name="virtualtrackball"
+    width="150"
+    height="150"
+    user_resize="false"     
+    increment_angle_mouse="0.5f"
+    increment_angle_btn="3.0f"    
+    image_sphere="VirtualTrackball_Sphere"
+    image_moon_back="VirtualTrackball_Moon_Back"
+    image_moon_front="VirtualTrackball_Moon_Front"
+    image_sun_back="VirtualTrackball_Sun_Back"
+    image_sun_front="VirtualTrackball_Sun_Front">
+
+    <sun_moon_trackball.border
+        visible="true"/>
+
+    <sun_moon_trackball.labelN
+        font="SansSerif"
+        name="labelN"
+        valign="bottom"
+        halign="left"
+        label="N"/>
+    <sun_moon_trackball.labelS
+        font="SansSerif"
+        name="labelS"
+        valign="top"
+        halign="left"
+        label="S"/>
+    <sun_moon_trackball.labelW
+        font="SansSerif"
+        name="labelW"
+        valign="top"
+        halign="right"
+        label="W"/>
+    <sun_moon_trackball.labelE
+        font="SansSerif"
+        name="labelE"
+        valign="top"
+        halign="left"
+        label="E"/>
+
+    <sun_moon_trackball.button_rotate_top
+        name="btn_rotate_top"
+        image_unselected="VirtualTrackball_Rotate_Top"
+        image_selected="VirtualTrackball_Rotate_Top"
+        image_disabled="VirtualTrackball_Rotate_Top" />
+
+    <sun_moon_trackball.button_rotate_bottom
+        name="btn_rotate_bottom"
+        image_unselected="VirtualTrackball_Rotate_Bottom"
+        image_selected="VirtualTrackball_Rotate_Bottom"
+        image_disabled="VirtualTrackball_Rotate_Bottom" />
+
+    <sun_moon_trackball.button_rotate_left
+        name="btn_rotate_left"
+        image_unselected="VirtualTrackball_Rotate_Left"
+        image_selected="VirtualTrackball_Rotate_Left"
+        image_disabled="VirtualTrackball_Rotate_Left" />
+
+    <sun_moon_trackball.button_rotate_right
+        name="btn_rotate_right"
+        image_unselected="VirtualTrackball_Rotate_Right"
+        image_selected="VirtualTrackball_Rotate_Right"
+        image_disabled="VirtualTrackball_Rotate_Right" />
+
+</sun_moon_trackball>
+