From 94bd363f9cdca043bc5e612ff07b0f8ce6c74b6b Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 19 Jul 2020 14:39:50 +0200
Subject: [PATCH] Keep previous camera floater layout for AnsaStorm skin since
 it's actually smaller than the new default layout (28.900 vs. 32.175
 square-px)

---
 .../skins/ansastorm/xui/de/floater_camera.xml |  57 ++++
 .../skins/ansastorm/xui/en/floater_camera.xml | 277 ++++++++++++++++++
 2 files changed, 334 insertions(+)
 create mode 100644 indra/newview/skins/ansastorm/xui/de/floater_camera.xml
 create mode 100644 indra/newview/skins/ansastorm/xui/en/floater_camera.xml

diff --git a/indra/newview/skins/ansastorm/xui/de/floater_camera.xml b/indra/newview/skins/ansastorm/xui/de/floater_camera.xml
new file mode 100644
index 0000000000..5df5893841
--- /dev/null
+++ b/indra/newview/skins/ansastorm/xui/de/floater_camera.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="camera_floater" title="Kamerasteuerungen">
+	<floater.string name="rotate_tooltip">
+		Kamera um Fokus drehen
+	</floater.string>
+	<floater.string name="zoom_tooltip">
+		Kamera auf Fokus zoomen
+	</floater.string>
+	<floater.string name="move_tooltip">
+		Kamera nach oben, unten, links und rechts bewegen
+	</floater.string>
+	<floater.string name="free_mode_title">
+		Objekt ansehen
+	</floater.string>
+	<string name="inactive_combo_text">
+		Voreinstellung...
+	</string>
+
+	<panel name="controls">
+		<panel name="zoom">
+			<joystick_rotate name="cam_rotate_stick" tool_tip="Kamera um Fokus kreisen"/>
+			<slider_bar name="zoom_slider" tool_tip="Kamera auf Fokus zoomen"/>
+			<joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/>
+		</panel>
+	</panel>
+	<panel name="buttons_panel">
+		<panel_camera_item name="front_view" tool_tip="Frontalansicht">
+			<panel_camera_item.text name="front_view_text">
+			</panel_camera_item.text>
+		</panel_camera_item>
+		<panel_camera_item name="group_view" tool_tip="Seitenansicht">
+			<panel_camera_item.text name="side_view_text">
+			</panel_camera_item.text>
+		</panel_camera_item>
+		<panel_camera_item name="rear_view" tool_tip="Rückansicht">
+			<panel_camera_item.text name="rear_view_text">
+			</panel_camera_item.text>
+		</panel_camera_item>
+		<panel_camera_item name="object_view" tool_tip="Objekt-Ansicht">
+			<panel_camera_item.text name="object_view_text">
+			</panel_camera_item.text>
+		</panel_camera_item>
+		<panel_camera_item name="mouselook_view" tool_tip="Mouselook">
+			<panel_camera_item.text name="mouselook_view_text">
+			</panel_camera_item.text>
+		</panel_camera_item>
+		<panel_camera_item name="reset_view" tool_tip="Ansicht zurücksetzen">
+			<panel_camera_item.text name="reset_view_text">
+			</panel_camera_item.text>
+		</panel_camera_item>
+	</panel>
+	<combo_box name="preset_combo">
+		<combo_box.item label="Voreinstellung verwenden" name="Use preset"/>
+	</combo_box>
+	<button name="gear_btn" tool_tip="Kamera-Voreinstellungen"/>
+	<button label="Kamera-Position..." name="camera_position_btn"/>
+</floater>
diff --git a/indra/newview/skins/ansastorm/xui/en/floater_camera.xml b/indra/newview/skins/ansastorm/xui/en/floater_camera.xml
new file mode 100644
index 0000000000..50a5fb8f89
--- /dev/null
+++ b/indra/newview/skins/ansastorm/xui/en/floater_camera.xml
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ header_height="0"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Foreground"
+ positioning="specified"
+ right="-460"
+ bottom="-50"
+ follows="left|bottom"
+ legacy_header_height="0"
+ can_minimize="false"
+ can_close="false"
+ height="85"
+ layout="topleft"
+ name="camera_floater"
+ help_topic="camera_floater"
+ save_visibility="true"
+ show_title="false"
+ single_instance="true"
+ title="Camera Controls"
+ chrome="true"
+ save_rect="true"
+ width="340">
+    <floater.string
+     name="rotate_tooltip">
+        Rotate Camera Around Focus
+    </floater.string>
+    <floater.string
+     name="zoom_tooltip">
+        Zoom Camera Towards Focus
+    </floater.string>
+    <floater.string
+     name="move_tooltip">
+        Move Camera Up and Down, Left and Right
+    </floater.string>
+    <floater.string
+     name="free_mode_title">
+        View Object
+    </floater.string>
+    <string name="inactive_combo_text">Use preset</string>
+    <panel
+     border="false"
+     follows="top|left"
+     height="123"
+     layout="topleft"
+     left="2"
+     top_pad="-23"
+     mouse_opaque="false"
+     name="controls"
+     width="190">
+         <!--TODO: replace + - images -->
+         <panel
+            border="false"
+            class="camera_zoom_panel"
+            bottom="-1"
+            layout="topleft"
+            left="0"
+            mouse_opaque="false"
+            name="zoom"
+            top="0"
+            width="220">
+           <joystick_rotate
+              follows="top|left"
+              height="78"
+              layout="topleft"
+              left="2"
+              name="cam_rotate_stick"
+              quadrant="left"
+              sound_flags="3"
+              visible="true"
+              tool_tip="Orbit camera around focus"
+              top="25"
+              width="78" />
+           <button
+              follows="top|left"
+              height="18"
+              image_disabled="AddItem_Disabled"
+              image_selected="AddItem_Press"
+              image_unselected="AddItem_Off"
+              layout="topleft"
+              left_pad="4" 
+              name="zoom_plus_btn"
+              width="18"
+              top="23">
+             <commit_callback
+                function="Zoom.plus" />
+             <mouse_held_callback
+                function="Zoom.plus" />
+           </button>
+           <slider_bar
+              height="50"
+              layout="topleft"
+              name="zoom_slider"
+              orientation="vertical"
+              tool_tip="Zoom camera toward focus"
+              top_pad="0"
+              min_val="0"
+              max_val="1" 
+              width="18">
+             <commit_callback function="Slider.value_changed"/>
+           </slider_bar>
+           <button
+              follows="top|left"
+              height="18"
+              image_disabled="MinusItem_Disabled"
+              image_selected="MinusItem_Press"
+              image_unselected="MinusItem_Off"
+              layout="topleft"
+              name="zoom_minus_btn"
+              top_pad="0"
+              width="18">
+             <commit_callback
+                function="Zoom.minus" />
+             <mouse_held_callback
+                function="Zoom.minus" />
+           </button>
+         <joystick_track
+         follows="top|left"
+         height="78"
+         image_selected="Cam_Tracking_In"
+         image_unselected="Cam_Tracking_Out"
+         layout="topleft"
+         left_pad="4"
+         name="cam_track_stick"
+         quadrant="left"
+         scale_image="false"
+         sound_flags="3"
+         tool_tip="Move camera up and down, left and right"
+         top="25"
+         width="78"/>
+        </panel>
+    </panel>
+    <panel
+     follows="all"
+     height="27"
+     layout="topleft"
+     left_pad="2"
+     name="buttons_panel"
+     top_delta="18"
+     width="120">
+    <panel_camera_item
+      name="front_view"
+      tool_tip="Front View"
+      width="18">
+      <panel_camera_item.mousedown_callback
+        function="CameraPresets.ChangeView"
+        parameter="Front View" />
+      <panel_camera_item.picture
+        image_name="Cam_Preset_Front_Off" />
+      <panel_camera_item.selected_picture
+        image_name="Cam_Preset_Front_On" />
+    </panel_camera_item>
+    <panel_camera_item
+      name="group_view"
+      tool_tip="Side View"
+      width="18"
+      left_pad="2">
+      <panel_camera_item.mousedown_callback
+        function="CameraPresets.ChangeView"
+        parameter="Side View" />
+      <panel_camera_item.picture
+        image_name="Cam_Preset_Side_Off" />
+      <panel_camera_item.selected_picture
+        image_name="Cam_Preset_Side_On" />
+    </panel_camera_item>
+    <panel_camera_item
+      name="rear_view"
+      tool_tip="Rear View"
+      width="18"
+      left_pad="2">
+      <panel_camera_item.mousedown_callback
+        function="CameraPresets.ChangeView"
+        tool_tip="Rear View"
+        parameter="Rear View" />
+      <panel_camera_item.picture
+        image_name="Cam_Preset_Back_Off" />
+      <panel_camera_item.selected_picture
+        image_name="Cam_Preset_Back_On" />
+    </panel_camera_item>
+    <panel_camera_item
+        name="object_view"
+        tool_tip="Object View"
+        width="18"
+        left_pad="2">
+        <panel_camera_item.mousedown_callback
+          function="CameraPresets.ChangeView"
+          parameter="object_view" />
+        <panel_camera_item.picture
+          image_name="Object_View_Off" />
+        <panel_camera_item.selected_picture
+          image_name="Object_View_On" />
+      </panel_camera_item>
+      <panel_camera_item
+        name="mouselook_view"
+        tool_tip="Mouselook View"
+        width="18"
+        left_pad="2">
+        <panel_camera_item.mousedown_callback
+          function="CameraPresets.ChangeView"
+          parameter="mouselook_view" />
+        <panel_camera_item.picture
+          image_name="MouseLook_View_Off" />
+        <panel_camera_item.selected_picture
+          image_name="MouseLook_View_On" />
+      </panel_camera_item>
+      <panel_camera_item
+        name="reset_view"
+        tool_tip="Reset view"
+        width="18"
+        left_pad="2">
+          <panel_camera_item.mousedown_callback
+          function="CameraPresets.ChangeView"
+          parameter="reset_view" />
+          <panel_camera_item.picture
+          image_name="StopReload_Off" />
+          <panel_camera_item.selected_picture
+          image_name="StopReload_Over" />
+      </panel_camera_item>
+    </panel>
+      <combo_box
+        height="23"
+        left_delta="-1"
+        mouse_opaque="true"
+        name="preset_combo"
+        top_pad="7"
+        width="122">
+        <combo_list
+        mouse_wheel_opaque="true"/>
+        <combo_box.item
+         label="Use preset"
+         name="Use preset"
+         value="default" />
+      </combo_box>
+      <button
+        height="16"
+        width="16"  
+        layout="topleft"
+        mouse_opaque="true"
+        name="gear_btn"
+        tool_tip="Camera Presets"
+        top_delta="3"
+        left_pad="3" 
+        image_selected="Icon_Gear"
+        image_pressed="Icon_Gear"
+        image_unselected="Icon_Gear"
+        is_toggle="true">
+        <button.commit_callback
+          function="CameraPresets.ShowPresetsList"/>
+      </button>
+      <!--
+      <button
+        follows="top|left"
+        height="23"
+        label="Save as preset..."
+        layout="topleft"
+        left="0"
+        name="save_preset_btn"
+        top_pad="7"
+        width="143">
+        <button.commit_callback
+          function="CameraPresets.Save"/>
+      </button>
+      -->
+      <button
+        follows="top|left"
+        height="23"
+        label="Camera Position..."
+        layout="topleft"
+        left_delta="-125"
+        name="camera_position_btn"
+        top_pad="9"
+        width="143">
+        <button.commit_callback
+          function="Floater.Show"
+          parameter="prefs_view_advanced"/>
+      </button>
+</floater>