Commits

Anonymous committed d199bcc

Add individual volume controls to pannel_volume_pulldown
Also includes translations for some of the other languages

  • Participants
  • Parent commits 29143d1

Comments (0)

Files changed (6)

File doc/contributions.txt

 Takeda Terrawyng
 TankMaster Finesmith
 	STORM-1100
+	STORM-1258
 	STORM-1602
-	STORM-1258
+	STORM-1868
     VWR-26622
 Talamasca
 Tali Rosca

File indra/newview/skins/default/xui/de/panel_volume_pulldown.xml

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="volumepulldown_floater" width="240">
+	<button left="217" name="prefs_btn"/>
+	<slider label="Master" name="System Volume" label_width="80" width="180"/>
+    <slider label="Schaltflächen" label_width="80" width="180" name="UI Volume"/>
+    <slider label="Umgebung" label_width="80" width="180" name="Wind Volume"/>
+    <slider label="Soundeffekte" label_width="80" width="180" name="SFX Volume"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Sounds von Gesten abspielen"/>
+    <slider label="Musikstream" label_width="80" width="180" name="Music Volume"/>
+	<check_box tool_tip="Musikstream aktivieren" name="enable_music"/>
+    <slider label="Medien" label_width="80" width="180" name="Media Volume"/>
+	<check_box tool_tip="Medienstream aktivieren" name="enable_media"/>
+    <slider label="Voice-Chat" label_width="80" width="180" name="Voice Volume"/>
+	<check_box tool_tip="Voice-Chat aktivieren" name="enable_voice_check"/>
+</panel>

File indra/newview/skins/default/xui/en/panel_volume_pulldown.xml

  border="false"
  chrome="true"
  follows="bottom"
- height="150"
+ height="155"
  layout="topleft"
  name="volumepulldown_floater"
- width="32">
- <slider
-  control_name="AudioLevelMaster"
-  follows="left|top"
-  left="0"
-  top="1"
-  orientation="vertical"
-  height="120"
-  increment="0.05"
-  initial_value="0.5"
-  layout="topleft"
-  name="mastervolume"
-  show_text="false"
-  slider_label.halign="right"
-  top_pad="2"
-  volume="true">
-  <slider.commit_callback
-   function="Vol.setControlFalse"
-   parameter="MuteAudio" />
-  </slider>
-  <button
-    left="10"
+ width="210">
+   <button
+    left="187"
     top_pad="9"
     width="12"
     height="12"
     scale_image="false">
     <button.commit_callback
        function="Vol.GoAudioPrefs" />
-  </button>
+  </button> 
+      <slider
+     control_name="AudioLevelMaster"
+     follows="top|left"
+     font.style="BOLD"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Master"
+     label_width="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="System Volume"
+     show_text="false"
+     top="10"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.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="50"
+        left="10"
+        width="150"
+        layout="topleft"
+        name="UI Volume"
+        show_text="false"
+        top_pad="4"
+        volume="true">
+    <slider.commit_callback
+        function="Pref.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="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="Wind Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.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" />
+    <slider
+     control_name="AudioLevelSFX"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Sounds"
+     label_width="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="SFX Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.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="Pref.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="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="Music Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.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">
+        <check_box.commit_callback
+            function="Pref.updateMediaAutoPlayCheckbox"/>
+    </check_box>
+    <slider
+        control_name="AudioLevelMedia"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="16"
+        increment="0.025"
+        initial_value="0.5"
+        label="Media"
+        label_width="50"
+        left="10"
+        width="150"
+        layout="topleft"
+        name="Media Volume"
+        show_text="false"
+        top_pad="4"
+        volume="true">
+      <slider.commit_callback
+        function="Pref.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">
+        <check_box.commit_callback
+            function="Pref.updateMediaAutoPlayCheckbox"/>
+    </check_box>
+    <slider
+        control_name="AudioLevelVoice"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="16"
+        increment="0.025"
+        initial_value="0.5"
+        label="Voice"
+        label_width="50"
+        left="10"
+        width="150"
+        layout="topleft"
+        top_pad="4"
+        name="Voice Volume"
+        show_text="false"
+        volume="true">
+    <slider.commit_callback
+        function="Pref.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>

File indra/newview/skins/default/xui/es/panel_volume_pulldown.xml

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="volumepulldown_floater" width="215">
+	<slider label="Maestro" name="System Volume" label_width="55" width="155"/>
+	<slider label="Botones" name="UI Volume" label_width="55" width="155"/>
+	<slider label="Ambiente" name="Wind Volume" label_width="55" width="155"/>
+	<slider label="Sonidos" name="SFX Volume" label_width="55" width="155"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Activa el sonido de los gestos"/>
+	<slider label="Música" name="Music Volume" label_width="55" width="155"/>
+	<check_box tool_tip="Activa el flujo de audio" name="enable_music"/>
+	<slider label="Medios" name="Media Volume" label_width="55" width="155"/>
+	<check_box tool_tip="Activa el flujo de medios" name="enable_media"/>
+	<slider label="Voz" name="Voice Volume" label_width="55" width="155"/>
+	<check_box tool_tip="Activar chat de voz" name="enable_voice_check"/>
+</panel>

File indra/newview/skins/default/xui/it/panel_volume_pulldown.xml

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="volumepulldown_floater" width="220">
+    <button left="197" name="prefs_btn"/>
+    <slider label="Generale" name="System Volume" label_width="60" width="160"/>
+    <slider label="Interfaccia" name="UI Volume" label_width="60" width="160"/>
+    <slider label="Ambiente" name="Wind Volume" label_width="60" width="160"/>
+    <slider label="Suoni" name="SFX Volume" label_width="60" width="160"/>
+    <check_box name="gesture_audio_play_btn" tool_tip="Attiva suoni Gesture"/>
+    <slider label="Musica" name="Music Volume" label_width="60" width="160"/>
+    <check_box tool_tip="Abilita musica in streaming" name="enable_music"/>
+    <slider label="Media" name="Media Volume" label_width="60" width="160"/>
+    <check_box tool_tip="Abilita riproduzione media" name="enable_media"/>
+    <slider label="Voice" name="Voice Volume" label_width="60" width="160"/>
+    <check_box tool_tip="Abilita il voice" name="enable_voice_check"/>
+</panel>

File indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="volumepulldown_floater">
+    <slider label="Główny" name="System Volume"/>
+    <slider label="Przyciski" name="UI Volume"/>
+    <slider label="Okolica" name="Wind Volume"/>
+    <slider label="Efekty" name="SFX Volume"/>
+    <check_box name="gesture_audio_play_btn" tool_tip="Włącz dźwięki gestów"/>
+    <slider label="Muzyka" name="Music Volume"/>
+    <check_box tool_tip="Włącz muzykę strumieniową" name="enable_music"/>
+    <slider label="Media" name="Media Volume"/>
+    <check_box tool_tip="Włącz media strumieniowe" name="enable_media"/>
+    <slider label="Głos" name="Voice Volume"/>
+    <check_box tool_tip="Włącz rozmowy głosowe" name="enable_voice_check"/>
+</panel>