STORM-571 FIXED Moved voice prefs from advanced to Sound&Media and changed layout accordingly.
This changeset also covers STORM-572 (note that design in this fix differs a little from the one proposed in there because there was not enough space to make it that way).meow-7.2.2
Andrew Productengine
parent
5711bb02ed
commit
29a36c21db
|
|
@ -13,10 +13,6 @@
|
|||
name="aspect_ratio_text">
|
||||
[NUM]:[DEN]
|
||||
</panel.string>
|
||||
<panel.string
|
||||
name="middle_mouse">
|
||||
Middle Mouse
|
||||
</panel.string>
|
||||
<text
|
||||
type="string"
|
||||
length="1"
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@
|
|||
name="Preference Media panel"
|
||||
top="1"
|
||||
width="517">
|
||||
<panel.string
|
||||
name="middle_mouse">
|
||||
Middle Mouse
|
||||
</panel.string>
|
||||
<slider
|
||||
control_name="AudioLevelMaster"
|
||||
follows="left|top"
|
||||
|
|
@ -66,7 +70,7 @@
|
|||
name="UI Volume"
|
||||
show_text="false"
|
||||
slider_label.halign="right"
|
||||
top_pad="7"
|
||||
top_pad="5"
|
||||
volume="true"
|
||||
width="300">
|
||||
<slider.commit_callback
|
||||
|
|
@ -100,7 +104,7 @@
|
|||
name="Wind Volume"
|
||||
show_text="false"
|
||||
slider_label.halign="right"
|
||||
top_pad="7"
|
||||
top_pad="5"
|
||||
volume="true"
|
||||
width="300">
|
||||
<slider.commit_callback
|
||||
|
|
@ -168,7 +172,7 @@
|
|||
name="Music Volume"
|
||||
slider_label.halign="right"
|
||||
show_text="false"
|
||||
top_pad="7"
|
||||
top_pad="5"
|
||||
volume="true"
|
||||
width="300">
|
||||
<slider.commit_callback
|
||||
|
|
@ -211,7 +215,7 @@
|
|||
name="Media Volume"
|
||||
show_text="false"
|
||||
slider_label.halign="right"
|
||||
top_pad="7"
|
||||
top_pad="5"
|
||||
volume="true"
|
||||
width="300">
|
||||
<slider.commit_callback
|
||||
|
|
@ -253,7 +257,7 @@
|
|||
label_width="120"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
top_delta="20"
|
||||
top_pad="5"
|
||||
name="Voice Volume"
|
||||
show_text="false"
|
||||
slider_label.halign="right"
|
||||
|
|
@ -307,7 +311,18 @@
|
|||
height="15"
|
||||
tool_tip="Uncheck this to hide media attached to other avatars nearby"
|
||||
label="Play media attached to other avatars"
|
||||
left="25"/>
|
||||
left="25"
|
||||
width="230"/>
|
||||
<check_box
|
||||
control_name="LipSyncEnabled"
|
||||
follows="left|top"
|
||||
height="20"
|
||||
label="Move avatar lips when speaking"
|
||||
layout="topleft"
|
||||
left_pad="0"
|
||||
name="enable_lip_sync"
|
||||
width="237"
|
||||
top_delta="-4" />
|
||||
|
||||
<text
|
||||
type="string"
|
||||
|
|
@ -317,8 +332,8 @@
|
|||
layout="topleft"
|
||||
left="25"
|
||||
name="voice_chat_settings"
|
||||
width="200"
|
||||
top="210">
|
||||
width="180"
|
||||
top_pad="10">
|
||||
Voice Chat Settings
|
||||
</text>
|
||||
<text
|
||||
|
|
@ -329,7 +344,7 @@
|
|||
left="80"
|
||||
top_delta="16"
|
||||
name="Listen from"
|
||||
width="142">
|
||||
width="102">
|
||||
Listen from:
|
||||
</text>
|
||||
<icon
|
||||
|
|
@ -341,43 +356,96 @@
|
|||
mouse_opaque="false"
|
||||
visible="true"
|
||||
width="18"
|
||||
left_pad="0"
|
||||
left_pad="-4"
|
||||
top_delta="-5"/>
|
||||
<icon
|
||||
follows="left|top"
|
||||
height="18"
|
||||
image_name="Move_Walk_Off"
|
||||
layout="topleft"
|
||||
left_pad="130"
|
||||
name="avatar_icon"
|
||||
mouse_opaque="false"
|
||||
visible="true"
|
||||
width="18"
|
||||
top_delta="20" />
|
||||
top_delta="0" />
|
||||
<radio_group
|
||||
enabled_control="EnableVoiceChat"
|
||||
control_name="VoiceEarLocation"
|
||||
draw_border="false"
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
left_pad="2"
|
||||
left_delta="-128"
|
||||
width="221"
|
||||
height="38"
|
||||
height="20"
|
||||
name="ear_location">
|
||||
<radio_item
|
||||
height="16"
|
||||
height="19"
|
||||
label="Camera position"
|
||||
follows="left|top"
|
||||
layout="topleft"
|
||||
name="0"
|
||||
width="200"/>
|
||||
<radio_item
|
||||
height="16"
|
||||
height="19"
|
||||
follows="left|top"
|
||||
label="Avatar position"
|
||||
layout="topleft"
|
||||
left_pad="-54"
|
||||
name="1"
|
||||
top_delta ="0"
|
||||
width="200" />
|
||||
</radio_group>
|
||||
<check_box
|
||||
follows="top|left"
|
||||
enabled_control="EnableVoiceChat"
|
||||
control_name="PushToTalkToggle"
|
||||
height="15"
|
||||
label="Toggle speak on/off when I press:"
|
||||
layout="topleft"
|
||||
left="30"
|
||||
name="push_to_talk_toggle_check"
|
||||
width="237"
|
||||
tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/>
|
||||
<line_editor
|
||||
follows="top|left"
|
||||
control_name="PushToTalkButton"
|
||||
enabled="false"
|
||||
enabled_control="EnableVoiceChat"
|
||||
height="23"
|
||||
left="80"
|
||||
max_length_bytes="200"
|
||||
name="modifier_combo"
|
||||
label="Push-to-Speak trigger"
|
||||
top_pad="3"
|
||||
width="200" />
|
||||
<button
|
||||
layout="topleft"
|
||||
follows="top|left"
|
||||
enabled_control="EnableVoiceChat"
|
||||
height="23"
|
||||
label="Set Key"
|
||||
left_pad="5"
|
||||
name="set_voice_hotkey_button"
|
||||
width="100">
|
||||
<button.commit_callback
|
||||
function="Pref.VoiceSetKey" />
|
||||
</button>
|
||||
<button
|
||||
enabled_control="EnableVoiceChat"
|
||||
follows="top|left"
|
||||
halign="center"
|
||||
height="23"
|
||||
image_overlay="Refresh_Off"
|
||||
layout="topleft"
|
||||
tool_tip="Reset to Middle Mouse Button"
|
||||
mouse_opaque="true"
|
||||
name="set_voice_middlemouse_button"
|
||||
left_pad="5"
|
||||
width="25">
|
||||
<button.commit_callback
|
||||
function="Pref.VoiceSetMiddleMouse" />
|
||||
</button>
|
||||
<button
|
||||
control_name="ShowDeviceSettings"
|
||||
follows="left|top"
|
||||
|
|
@ -385,8 +453,8 @@
|
|||
is_toggle="true"
|
||||
label="Input/Output devices"
|
||||
layout="topleft"
|
||||
left="80"
|
||||
top_pad="5"
|
||||
left="20"
|
||||
top_pad="8"
|
||||
name="device_settings_btn"
|
||||
width="190">
|
||||
</button>
|
||||
|
|
@ -396,14 +464,14 @@
|
|||
visiblity_control="ShowDeviceSettings"
|
||||
border="false"
|
||||
follows="top|left"
|
||||
height="120"
|
||||
height="100"
|
||||
label="Device Settings"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
left_delta="-2"
|
||||
name="device_settings_panel"
|
||||
class="panel_voice_device_settings"
|
||||
width="501"
|
||||
top="285">
|
||||
width="470"
|
||||
top_pad="0">
|
||||
<panel.string
|
||||
name="default_text">
|
||||
Default
|
||||
|
|
@ -419,7 +487,7 @@
|
|||
<icon
|
||||
height="18"
|
||||
image_name="Microphone_On"
|
||||
left="80"
|
||||
left_delta="4"
|
||||
name="microphone_icon"
|
||||
mouse_opaque="false"
|
||||
top="7"
|
||||
|
|
@ -434,17 +502,17 @@
|
|||
layout="topleft"
|
||||
left_pad="3"
|
||||
name="Input"
|
||||
width="200">
|
||||
width="70">
|
||||
Input
|
||||
</text>
|
||||
<combo_box
|
||||
height="23"
|
||||
control_name="VoiceInputAudioDevice"
|
||||
layout="topleft"
|
||||
left="165"
|
||||
left_pad="0"
|
||||
max_chars="128"
|
||||
name="voice_input_device"
|
||||
top_pad="-2"
|
||||
top_delta="-5"
|
||||
width="200" />
|
||||
<text
|
||||
type="string"
|
||||
|
|
@ -452,9 +520,9 @@
|
|||
follows="left|top"
|
||||
height="16"
|
||||
layout="topleft"
|
||||
left="165"
|
||||
left_delta="-70"
|
||||
name="My volume label"
|
||||
top_pad="5"
|
||||
top_pad="4"
|
||||
width="200">
|
||||
My volume:
|
||||
</text>
|
||||
|
|
@ -465,11 +533,11 @@
|
|||
increment="0.025"
|
||||
initial_value="1.0"
|
||||
layout="topleft"
|
||||
left="160"
|
||||
left_delta="-6"
|
||||
max_val="2"
|
||||
name="mic_volume_slider"
|
||||
tool_tip="Change the volume using this slider"
|
||||
top_pad="-2"
|
||||
top_pad="-1"
|
||||
width="220" />
|
||||
<text
|
||||
type="string"
|
||||
|
|
@ -480,7 +548,7 @@
|
|||
layout="topleft"
|
||||
left_pad="5"
|
||||
name="wait_text"
|
||||
top_delta="0"
|
||||
top_delta="-1"
|
||||
width="110">
|
||||
Please wait
|
||||
</text>
|
||||
|
|
@ -489,7 +557,7 @@
|
|||
layout="topleft"
|
||||
left_delta="0"
|
||||
name="bar0"
|
||||
top_delta="0"
|
||||
top_delta="-2"
|
||||
width="20" />
|
||||
<locate
|
||||
height="20"
|
||||
|
|
@ -522,10 +590,10 @@
|
|||
<icon
|
||||
height="18"
|
||||
image_name="Parcel_Voice_Light"
|
||||
left="80"
|
||||
left="5"
|
||||
name="speaker_icon"
|
||||
mouse_opaque="false"
|
||||
top_pad="-8"
|
||||
top_pad="3"
|
||||
visible="true"
|
||||
width="22" />
|
||||
<text
|
||||
|
|
@ -537,17 +605,17 @@
|
|||
layout="topleft"
|
||||
left_pad="0"
|
||||
name="Output"
|
||||
width="200">
|
||||
width="70">
|
||||
Output
|
||||
</text>
|
||||
<combo_box
|
||||
control_name="VoiceOutputAudioDevice"
|
||||
height="23"
|
||||
layout="topleft"
|
||||
left="165"
|
||||
left_pad="0"
|
||||
max_chars="128"
|
||||
name="voice_output_device"
|
||||
top_pad="-2"
|
||||
top_delta="-3"
|
||||
width="200" />
|
||||
</panel>
|
||||
</panel>
|
||||
|
|
|
|||
Loading…
Reference in New Issue