From 29be92d220b4b09b14473147ca618a98d3f656f4 Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Fri, 5 Jul 2013 00:37:30 -0700
Subject: [PATCH] Reformed volume controls pulldown and floater, fixed layout
 issues and sizeing (hopefully)

---
 .../xui/en/floater_fs_volume_controls.xml     |  49 +-
 .../default/xui/en/panel_volume_pulldown.xml  | 657 +++++++++---------
 2 files changed, 368 insertions(+), 338 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_fs_volume_controls.xml b/indra/newview/skins/default/xui/en/floater_fs_volume_controls.xml
index c8df77f610..bdcf163194 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_volume_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_volume_controls.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-	legacy_header_height="18"
-	can_resize="false"
-	can_dock="false"
-	can_close="true"
-	can_minimize="false"
-	height="170"
-	layout="topleft"
-	name="volume_controls"
-	save_rect="true"
-	save_visibility="false"
-	single_instance="true"
-	save_dock_state="false"
-	title="Volume Controls"
-	background_opaque="false"
-	width="225">
-
+ name="volume_controls"
+ height="170"
+ width="225"
+ layout="topleft"
+ background_opaque="false"
+ can_close="true"
+ can_dock="false"
+ can_minimize="false"
+ can_resize="false"
+ legacy_header_height="18"
+ save_dock_state="false"
+ save_rect="true"
+ save_visibility="false"
+ single_instance="true"
+ title="Volume Controls"
+>
 	<panel
-		name="global_volume_controls_panel"
-		filename="panel_volume_pulldown.xml"
-		left="0"
-		top="20"
-		width="225"
-		height="155"
-		follows="all"
-		layout="topleft">
+	 name="global_volume_controls_panel"
+	 top="20"
+	 left="0"
+	 height="155"
+	 width="225"
+	 follows="all"
+	 layout="topleft"
+	 filename="panel_volume_pulldown.xml"
+	>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 7b62f4d219..04556312b1 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -1,314 +1,343 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_opaque="true"
- background_visible="true"
- bg_opaque_image="Volume_Background" 
- bg_alpha_image="Volume_Background" 
- border_visible="false"
- border="false"
- chrome="true"
- follows="bottom"
- height="155"
- layout="topleft"
- name="volumepulldown_floater"
- width="225">
-   <button
-    left="197"
-    top_pad="9"
-    width="12"
-    height="12"
-    follows="top|left"
-    name="prefs_btn"
-    image_unselected="Icon_Gear_Foreground"
-    image_disabled="Icon_Gear_Background"
-    image_pressed="Icon_Gear_Press"
-    scale_image="false">
-    <button.commit_callback
-       function="Vol.GoAudioPrefs" />
-  </button> 
-      <slider
-     control_name="AudioLevelMaster"
-     follows="top|left"
-     font.style="BOLD"
-     height="15"
-     increment="0.025"
-     initial_value="0.5"
-     label="Master"
-     label_width="60"
-     left="10"
-     width="160"
-     layout="topleft"
-     name="System Volume"
-     show_text="false"
-     top="10"
-     volume="true">
-        <slider.commit_callback
-         function="Vol.setControlFalse"
-         parameter="MuteAudio" />
-    </slider>
-    <button
-     control_name="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16" />
-    <slider
-        control_name="AudioLevelUI"
-        disabled_control="MuteAudio"
-        follows="left|top"
-        height="15"
-        increment="0.025"
-        initial_value="0.5"
-        label="Buttons"
-        label_width="60"
-        left="10"
-        width="160"
-        layout="topleft"
-        name="UI Volume"
-        show_text="false"
-        top_pad="4"
-        volume="true">
-    <slider.commit_callback
-        function="Vol.setControlFalse"
-        parameter="MuteUI" />
-    </slider>
-    <button
-        control_name="MuteUI"
-        disabled_control="MuteAudio"
-        follows="top|left"
-        height="16"
-        image_selected="AudioMute_Off"
-        image_unselected="Audio_Off"
-        is_toggle="true"
-        layout="topleft"
-        left_pad="5"
-        name="mute_audio"
-        tab_stop="false"
-        width="16" />
-    <slider
-     control_name="AudioLevelAmbient"
-     disabled_control="MuteAudio"
-     follows="left|top"
-     height="15"
-     increment="0.025"
-     initial_value="0.5"
-     label="Ambient"
-     label_width="60"
-     left="10"
-     width="160"
-     layout="topleft"
-     name="Wind Volume"
-     show_text="false"
-     top_pad="4"
-     volume="true">
-        <slider.commit_callback
-         function="Vol.setControlFalse"
-         parameter="MuteAmbient" />
-    </slider>
-    <button
-     control_name="MuteAmbient"
-     disabled_control="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16" />
-  <check_box
-    name="collisions_audio_play_btn"
-    control_name="FSPlayCollisionSounds"
-    disabled_control="MuteAudio"
-    height="16"
-    layout="topleft"
-    left_pad="5"
-    tool_tip="Enable default sounds from collisions"
-    top_delta="2"
-    width="350"/>
-    <slider
-     control_name="AudioLevelSFX"
-     disabled_control="MuteAudio"
-     follows="left|top"
-     height="15"
-     increment="0.025"
-     initial_value="0.5"
-     label="Sounds"
-     label_width="60"
-     left="10"
-     width="160"
-     layout="topleft"
-     name="SFX Volume"
-     show_text="false"
-     top_pad="4"
-     volume="true">
-        <slider.commit_callback
-         function="Vol.setControlFalse"
-         parameter="MuteSounds" />
-    </slider>
-    <button
-     control_name="MuteSounds"
-     disabled_control="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16">
-      <button.commit_callback
-      function="Vol.SetSounds"/>
-    </button>
-  <check_box
-    name="gesture_audio_play_btn"
-		control_name="EnableGestureSounds"
-    disabled_control="MuteAudio"
-    height="16"
-    layout="topleft"
-    left_pad="5"
-    tool_tip="Enable sounds from gestures"
-    top_delta="2"
-    width="350"/>
-    <slider
-     control_name="AudioLevelMusic"
-     disabled_control="MuteAudio"
-     follows="left|top"
-     height="15"
-     increment="0.025"
-     initial_value="0.5"
-     label="Music"
-     label_width="60"
-     left="10"
-     width="160"
-     layout="topleft"
-     name="Music Volume"
-     show_text="false"
-     top_pad="4"
-     volume="true">
-        <slider.commit_callback
-         function="Vol.setControlFalse"
-         parameter="MuteMusic" />
-    </slider>
-    <button
-     control_name="MuteMusic"
-     disabled_control="MuteAudio"
-     follows="top|left"
-     height="16"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     layout="topleft"
-     left_pad="5"
-     name="mute_audio"
-     tab_stop="false"
-     width="16" />
-    <check_box
-        control_name="AudioStreamingMusic"
-        height="16"
-        tool_tip="Enable Streaming Music"
-        layout="topleft"
-        left_pad="5"
-        name="enable_music"
-        top_delta="2"
-        width="350"/>
-    <slider
-        control_name="AudioLevelMedia"
-        disabled_control="MuteAudio"
-        follows="left|top"
-        height="16"
-        increment="0.025"
-        initial_value="0.5"
-        label="Media"
-        label_width="60"
-        left="10"
-        width="160"
-        layout="topleft"
-        name="Media Volume"
-        show_text="false"
-        top_pad="4"
-        volume="true">
-      <slider.commit_callback
-        function="Vol.setControlFalse"
-        parameter="MuteMedia" />
-    </slider>
-    <button
-        control_name="MuteMedia"
-        disabled_control="MuteAudio"
-        follows="top|left"
-        height="16"
-        image_selected="AudioMute_Off"
-        image_unselected="Audio_Off"
-        is_toggle="true"
-        layout="topleft"
-        left_pad="5"
-        name="mute_audio"
-        tab_stop="false"
-        width="16" />
-    <check_box
-        label_text.halign="left"
-        follows="left|top"
-        height="16"
-        control_name ="AudioStreamingMedia"
-        tool_tip="Enable Streaming Media"
-        layout="topleft"
-        top_delta="2"
-        left_pad="5"
-        name="enable_media"
-        width="110"/>
-    <slider
-        control_name="AudioLevelVoice"
-        disabled_control="MuteAudio"
-        follows="left|top"
-        height="16"
-        increment="0.025"
-        initial_value="0.5"
-        label="Voice"
-        label_width="60"
-        left="10"
-        width="160"
-        layout="topleft"
-        top_pad="4"
-        name="Voice Volume"
-        show_text="false"
-        volume="true">
-    <slider.commit_callback
-        function="Vol.setControlFalse"
-        parameter="MuteVoice" />
-    </slider>
-    <button
-        control_name="MuteVoice"
-        disabled_control="MuteAudio"
-        follows="top|left"
-        height="16"
-        image_selected="AudioMute_Off"
-        image_unselected="Audio_Off"
-        is_toggle="true"
-        layout="topleft"
-        left_pad="5"
-        name="mute_audio"
-        tab_stop="false"
-        width="16" />
-    <check_box
-        label_text.halign="left"
-        follows="left|top"
-        height="16"
-        control_name ="EnableVoiceChat"
-        disabled_control="CmdLineDisableVoice"
-        tool_tip="Enable Voice Chat"
-        layout="topleft"
-        top_delta="2"
-        left_pad="5"
-        name="enable_voice_check"
-        width="110"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ name="volumepulldown_floater"
+ height="155"
+ width="225"
+ follows="bottom"
+ layout="topleft"
+ background_opaque="true"
+ background_visible="true"
+ bg_alpha_image="Volume_Background"
+ bg_opaque_image="Volume_Background"
+ border="false"
+ border_visible="false"
+ chrome="true"
+>
+	<slider
+	 name="System Volume"
+	 label="Master"
+	 top="6"
+	 left="10"
+	 height="15"
+	 width="160"
+	 follows="top|left"
+	 layout="topleft"
+	 control_name="AudioLevelMaster"
+	 font.style="BOLD"
+	 increment="0.025"
+	 initial_value="0.5"
+	 label_width="60"
+	 show_text="false"
+	 volume="true"
+	>
+		<slider.commit_callback
+		 function="Vol.setControlFalse"
+		 parameter="MuteAudio"
+		/>
+	</slider>
+	<button
+	 name="mute_audio"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 follows="top|left"
+	 layout="topleft"
+	 control_name="MuteAudio"
+	 image_selected="AudioMute_Off"
+	 image_unselected="Audio_Off"
+	 is_toggle="true"
+	 tab_stop="false"
+	/>
+	<button
+	 name="prefs_btn"
+	 left_pad="8"
+	 height="16"
+	 width="16"
+	 follows="top|left"
+	 layout="topleft"
+	 image_disabled="Icon_Gear_Background"
+	 image_pressed="Icon_Gear_Press"
+	 image_unselected="Icon_Gear_Foreground"
+	 scale_image="false"
+	>
+		<button.commit_callback
+		 function="Vol.GoAudioPrefs"
+		/>
+	</button>
+	<slider
+	 name="UI Volume"
+	 label="Buttons"
+	 top_pad="6"
+	 left="10"
+	 height="15"
+	 width="160"
+	 follows="left|top"
+	 layout="topleft"
+	 control_name="AudioLevelUI"
+	 disabled_control="MuteAudio"
+	 increment="0.025"
+	 initial_value="0.5"
+	 label_width="60"
+	 show_text="false"
+	 volume="true"
+	>
+		<slider.commit_callback
+		 function="Vol.setControlFalse"
+		 parameter="MuteUI"
+		/>
+	</slider>
+	<button
+	 name="mute_audio"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 follows="top|left"
+	 layout="topleft"
+	 control_name="MuteUI"
+	 disabled_control="MuteAudio"
+	 image_selected="AudioMute_Off"
+	 image_unselected="Audio_Off"
+	 is_toggle="true"
+	 tab_stop="false"
+	/>
+	<slider
+	 name="Wind Volume"
+	 label="Ambient"
+	 top_pad="4"
+	 left="10"
+	 height="15"
+	 width="160"
+	 follows="left|top"
+	 layout="topleft"
+	 control_name="AudioLevelAmbient"
+	 disabled_control="MuteAudio"
+	 increment="0.025"
+	 initial_value="0.5"
+	 label_width="60"
+	 show_text="false"
+	 volume="true"
+	>
+		<slider.commit_callback
+		 function="Vol.setControlFalse"
+		 parameter="MuteAmbient"
+		/>
+	</slider>
+	<button
+	 name="mute_audio"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 follows="top|left"
+	 layout="topleft"
+	 control_name="MuteAmbient"
+	 disabled_control="MuteAudio"
+	 image_selected="AudioMute_Off"
+	 image_unselected="Audio_Off"
+	 is_toggle="true"
+	 tab_stop="false"
+	/>
+	<check_box
+	 name="collisions_audio_play_btn"
+	 tool_tip="Enable default sounds from collisions"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 layout="topleft"
+	 control_name="FSPlayCollisionSounds"
+	 disabled_control="MuteAudio"
+	/>
+	<slider
+	 name="SFX Volume"
+	 label="Sounds"
+	 top_pad="4"
+	 left="10"
+	 height="15"
+	 width="160"
+	 follows="left|top"
+	 layout="topleft"
+	 control_name="AudioLevelSFX"
+	 disabled_control="MuteAudio"
+	 increment="0.025"
+	 initial_value="0.5"
+	 label_width="60"
+	 show_text="false"
+	 volume="true"
+	>
+		<slider.commit_callback
+		 function="Vol.setControlFalse"
+		 parameter="MuteSounds"
+		/>
+	</slider>
+	<button
+	 name="mute_audio"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 follows="top|left"
+	 layout="topleft"
+	 control_name="MuteSounds"
+	 disabled_control="MuteAudio"
+	 image_selected="AudioMute_Off"
+	 image_unselected="Audio_Off"
+	 is_toggle="true"
+	 tab_stop="false"
+	>
+		<button.commit_callback
+		 function="Vol.SetSounds"
+		/>
+	</button>
+	<check_box
+	 name="gesture_audio_play_btn"
+	 tool_tip="Enable sounds from gestures"
+	 top_delta="2"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 layout="topleft"
+	 control_name="EnableGestureSounds"
+	 disabled_control="MuteAudio"
+	/>
+	<slider
+	 name="Music Volume"
+	 label="Music"
+	 top_pad="4"
+	 left="10"
+	 height="15"
+	 width="160"
+	 follows="left|top"
+	 layout="topleft"
+	 control_name="AudioLevelMusic"
+	 disabled_control="MuteAudio"
+	 increment="0.025"
+	 initial_value="0.5"
+	 label_width="60"
+	 show_text="false"
+	 volume="true"
+	>
+		<slider.commit_callback
+		 function="Vol.setControlFalse"
+		 parameter="MuteMusic"
+		/>
+	</slider>
+	<button
+	 name="mute_audio"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 follows="top|left"
+	 layout="topleft"
+	 control_name="MuteMusic"
+	 disabled_control="MuteAudio"
+	 image_selected="AudioMute_Off"
+	 image_unselected="Audio_Off"
+	 is_toggle="true"
+	 tab_stop="false"
+	/>
+	<check_box
+	 name="enable_music"
+	 tool_tip="Enable Streaming Music"
+	 top_delta="2"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 layout="topleft"
+	 control_name="AudioStreamingMusic"
+	/>
+	<slider
+	 name="Media Volume"
+	 label="Media"
+	 top_pad="4"
+	 left="10"
+	 height="15"
+	 width="160"
+	 follows="left|top"
+	 layout="topleft"
+	 control_name="AudioLevelMedia"
+	 disabled_control="MuteAudio"
+	 increment="0.025"
+	 initial_value="0.5"
+	 label_width="60"
+	 show_text="false"
+	 volume="true"
+	>
+		<slider.commit_callback
+		 function="Vol.setControlFalse"
+		 parameter="MuteMedia"
+		/>
+	</slider>
+	<button
+	 name="mute_audio"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 follows="top|left"
+	 layout="topleft"
+	 control_name="MuteMedia"
+	 disabled_control="MuteAudio"
+	 image_selected="AudioMute_Off"
+	 image_unselected="Audio_Off"
+	 is_toggle="true"
+	 tab_stop="false"
+	/>
+	<check_box
+	 name="enable_media"
+	 tool_tip="Enable Streaming Media"
+	 top_delta="2"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 follows="left|top"
+	 layout="topleft"
+	 control_name="AudioStreamingMedia"
+	 label_text.halign="left"
+	/>
+	<slider
+	 name="Voice Volume"
+	 label="Voice"
+	 top_pad="4"
+	 left="10"
+	 height="15"
+	 width="160"
+	 follows="left|top"
+	 layout="topleft"
+	 control_name="AudioLevelVoice"
+	 disabled_control="MuteAudio"
+	 increment="0.025"
+	 initial_value="0.5"
+	 label_width="60"
+	 show_text="false"
+	 volume="true"
+	>
+		<slider.commit_callback
+		 function="Vol.setControlFalse"
+		 parameter="MuteVoice"
+		/>
+	</slider>
+	<button
+	 name="mute_audio"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 follows="top|left"
+	 layout="topleft"
+	 control_name="MuteVoice"
+	 disabled_control="MuteAudio"
+	 image_selected="AudioMute_Off"
+	 image_unselected="Audio_Off"
+	 is_toggle="true"
+	 tab_stop="false"
+	/>
+	<check_box
+	 name="enable_voice_check"
+	 tool_tip="Enable Voice Chat"
+	 top_delta="2"
+	 left_pad="5"
+	 height="16"
+	 width="16"
+	 follows="left|top"
+	 layout="topleft"
+	 control_name="EnableVoiceChat"
+	 disabled_control="CmdLineDisableVoice"
+	 label_text.halign="left"
+	/>
+</panel>