livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preferences clean up in advance of qa beta branch

master
Erica 2010-02-01 17:24:03 -08:00
parent f99a7b23ae
commit 84e985e255
4 changed files with 229 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

307
indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<panel
border="true"
follows="left|top|right|bottom"
follows="all"
height="408"
label="Advanced"
layout="topleft"
left="102"
name="advanced"
@ -13,130 +13,29 @@
name="aspect_ratio_text">
[NUM]:[DEN]
</panel.string>
<check_box
control_name="UseChatBubbles"
follows="left|top"
height="16"
label="Bubble chat"
layout="topleft"
left="30"
top="10"
name="bubble_text_chat"
width="150" />
<color_swatch
can_apply_immediately="true"
color="0 0 0 1"
control_name="BackgroundChatColor"
follows="left|top"
height="47"
layout="topleft"
left_delta="280"
name="background"
tool_tip="Choose color for bubble chat"
top_delta="1"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="BackgroundChatColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="BackgroundChatColor" />
</color_swatch>
<slider
control_name="ChatBubbleOpacity"
follows="left|top"
height="16"
increment="0.05"
initial_value="1"
label="Opacity"
layout="topleft"
left_delta="-230"
top_pad="-28"
label_width="50"
name="bubble_chat_opacity"
width="200" />
<text
follows="left|top"
type="string"
length="1"
height="25"
layout="topleft"
left="30"
top_pad="5"
name="AspectRatioLabel1"
tool_tip="width / height"
label_width="50"
width="120">
Aspect ratio
</text>
<combo_box
allow_text_entry="true"
height="23"
follows="left|top"
layout="topleft"
left_pad="0"
max_chars="100"
name="aspect_ratio"
tool_tip="width / height"
top_delta="0"
width="150">
<combo_box.item
enabled="true"
label=" 4:3 (Standard CRT)"
name="item1"
value="1.333333" />
<combo_box.item
enabled="true"
label=" 5:4 (1280x1024 LCD)"
name="item2"
value="1.25" />
<combo_box.item
enabled="true"
label=" 8:5 (Widescreen)"
name="item3"
value="1.6" />
<combo_box.item
enabled="true"
label=" 16:9 (Widescreen)"
name="item4"
value="1.7777777" />
</combo_box>
<check_box
control_name="FullScreenAutoDetectAspectRatio"
follows="left|top"
height="25"
label="Auto-detect"
layout="topleft"
left_pad="10"
name="aspect_auto_detect"
width="256">
<check_box.commit_callback
function="Pref.AutoDetectAspect" />
</check_box>
<text
follows="left|top"
type="string"
length="1"
height="10"
left="30"
name="heading1"
top_pad="5"
width="270">
Camera:
</text>
<icon
follows="left|top"
height="18"
image_name="Cam_FreeCam_Off"
layout="topleft"
name="camera_icon"
mouse_opaque="false"
visible="true"
width="18"
left="30"
top="10"/>
<slider
can_edit_text="true"
control_name="CameraAngle"
control_name="CameraAngle"
decimal_digits="2"
top_pad="5"
follows="left|top"
height="16"
increment="0.025"
initial_value="1.57"
layout="topleft"
label_width="100"
label="View Angle"
left_delta="50"
label="View angle"
left_pad="30"
max_val="2.97"
min_val="0.17"
name="camera_fov"
@ -165,11 +64,11 @@ Camera:
type="string"
length="1"
height="10"
left="30"
left="80"
name="heading2"
width="270"
top_pad="5">
Automatic positioning for:
Automatic position for:
</text>
<check_box
control_name="EditCameraMovement"
@ -177,7 +76,7 @@ Automatic positioning for:
follows="left|top"
label="Build/Edit"
layout="topleft"
left_delta="50"
left_delta="30"
name="edit_camera_movement"
tool_tip="Use automatic camera positioning when entering and exiting edit mode"
width="280"
@ -191,27 +90,27 @@ Automatic positioning for:
name="appearance_camera_movement"
tool_tip="Use automatic camera positioning while in edit mode"
width="242" />
<text
follows="left|top"
type="string"
length="1"
height="10"
left="30"
name="heading3"
top_pad="5"
width="270">
Avatars:
</text>
<icon
follows="left|top"
height="18"
image_name="Move_Walk_Off"
layout="topleft"
name="avatar_icon"
mouse_opaque="false"
visible="true"
width="18"
top_pad="2"
left="30"
/>
<check_box
control_name="FirstPersonAvatarVisible"
follows="left|top"
height="20"
label="Show me in Mouselook"
layout="topleft"
left_delta="50"
left_pad="30"
name="first_person_avatar_visible"
width="256"
top_pad="0"/>
width="256" />
<check_box
control_name="ArrowKeysAlwaysMove"
follows="left|top"
@ -242,22 +141,61 @@ Avatars:
name="enable_lip_sync"
width="237"
top_pad="0" />
<check_box
control_name="UseChatBubbles"
follows="left|top"
height="16"
label="Bubble chat"
layout="topleft"
left="78"
top_pad="6"
name="bubble_text_chat"
width="150" />
<slider
control_name="ChatBubbleOpacity"
follows="left|top"
height="16"
increment="0.05"
initial_value="1"
label="Opacity"
layout="topleft"
left="80"
label_width="50"
name="bubble_chat_opacity"
width="200" />
<color_swatch
can_apply_immediately="true"
color="0 0 0 1"
control_name="BackgroundChatColor"
follows="left|top"
height="50"
layout="topleft"
left_pad="10"
name="background"
tool_tip="Choose color for bubble chat"
width="38">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="BackgroundChatColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="BackgroundChatColor" />
</color_swatch>
<check_box
control_name="ShowScriptErrors"
follows="left|top"
height="20"
label="Show script errors"
label="Show script errors in:"
layout="topleft"
left="30"
name="show_script_errors"
width="256"
top_pad="5"/>
width="256" />
<radio_group
enabled_control="ShowScriptErrors"
control_name="ShowScriptErrorsLocation"
follows="top|left"
draw_border="false"
height="40"
height="16"
layout="topleft"
left_delta="50"
name="show_location"
@ -265,7 +203,7 @@ Avatars:
width="364">
<radio_item
height="16"
label="In chat"
label="Nearby chat"
layout="topleft"
left="3"
name="0"
@ -273,7 +211,7 @@ Avatars:
width="315" />
<radio_item
height="16"
label="In a window"
label="Separate window"
layout="topleft"
left_delta="175"
name="1"
@ -284,50 +222,105 @@ Avatars:
follows="top|left"
enabled_control="EnableVoiceChat"
control_name="PushToTalkToggle"
height="20"
label="Toggle mode for microphone when I press the Speak trigger key:"
height="15"
label="Toggle speak on/off when I press:"
layout="topleft"
left="30"
name="push_to_talk_toggle_check"
width="237"
top_pad="-25"
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="false"
enabled_control="EnableVoiceChat"
height="19"
left_delta="50"
max_length="254"
height="23"
left="80"
max_length="200"
name="modifier_combo"
label="Push-to-Speak trigger"
top_pad="0"
width="280" />
top_pad="5"
width="200" />
<button
follows="top|left"
enabled_control="EnableVoiceChat"
height="23"
label="Set Key"
left_delta="0"
left_pad="5"
name="set_voice_hotkey_button"
width="115"
top_pad="5">
width="100">
<button.commit_callback
function="Pref.VoiceSetKey" />
</button>
<button
bottom_delta="0"
enabled_control="EnableVoiceChat"
follows="left"
follows="top|left"
halign="center"
height="23"
label="Middle Mouse Button"
left_delta="120"
image_overlay="Refresh_Off"
tool_tip="Reset to Middle Mouse Button"
mouse_opaque="true"
name="set_voice_middlemouse_button"
width="160">
left_pad="5"
width="25">
<button.commit_callback
function="Pref.VoiceSetMiddleMouse" />
</button>
<text
follows="left|top"
type="string"
length="1"
height="13"
layout="topleft"
left="30"
top_pad="8"
name="AspectRatioLabel1"
tool_tip="width / height"
label_width="50"
width="120">
Aspect ratio
</text>
<combo_box
allow_text_entry="true"
height="23"
follows="left|top"
layout="topleft"
left="80"
max_chars="100"
name="aspect_ratio"
tool_tip="width / height"
width="150">
<combo_box.item
enabled="true"
label=" 4:3 (Standard CRT)"
name="item1"
value="1.333333" />
<combo_box.item
enabled="true"
label=" 5:4 (1280x1024 LCD)"
name="item2"
value="1.25" />
<combo_box.item
enabled="true"
label=" 8:5 (Widescreen)"
name="item3"
value="1.6" />
<combo_box.item
enabled="true"
label=" 16:9 (Widescreen)"
name="item4"
value="1.7777777" />
</combo_box>
<check_box
control_name="FullScreenAutoDetectAspectRatio"
follows="left|top"
height="25"
label="Automatic"
layout="topleft"
left_pad="10"
name="aspect_auto_detect"
width="256">
<check_box.commit_callback
function="Pref.AutoDetectAspect" />
</check_box>
</panel>

46
indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
height="500"
height="408"
label="Popups"
layout="topleft"
left="0"
@ -14,7 +14,7 @@
follows="top|left"
height="12"
layout="topleft"
left="30"
left="10"
name="tell_me_label"
top="10"
width="300">
@ -32,7 +32,7 @@
<check_box
control_name="ChatOnlineNotification"
height="16"
label="When my friends log out or in"
label="When my friends log in or out"
layout="topleft"
left_delta="0"
name="friends_online_notify_checkbox"
@ -42,38 +42,33 @@
type="string"
length="1"
follows="top|left"
font="SansSerifBold"
height="12"
layout="topleft"
left="30"
left="10"
name="show_label"
top_pad="14"
top_pad="8"
width="450">
Always show these notifications:
Always show:
</text>
<scroll_list
follows="top|left"
height="92"
height="140"
layout="topleft"
left="10"
multi_select="true"
multi_select="true"
name="enabled_popups"
width="475" />
<button
enabled_control="FirstSelectedDisabledPopups"
follows="top|left"
height="23"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_overlay="Arrow_Up"
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
hover_glow_amount="0.15"
layout="topleft"
left_delta="137"
left="180"
name="enable_this_popup"
top_pad="10"
width="43">
top_pad="5"
width="40">
<button.commit_callback
function="Pref.ClickEnablePopup" />
</button>
@ -81,17 +76,13 @@
enabled_control="FirstSelectedEnabledPopups"
follows="top|left"
height="23"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_overlay="Arrow_Down"
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
hover_glow_amount="0.15"
layout="topleft"
left_pad="50"
left_pad="40"
name="disable_this_popup"
top_delta="0"
width="43">
width="40">
<button.commit_callback
function="Pref.ClickDisablePopup" />
</button>
@ -99,21 +90,20 @@
type="string"
length="1"
follows="top|left"
font="SansSerifBold"
height="12"
layout="topleft"
left="30"
left="10"
name="dont_show_label"
top_pad="10"
top_pad="-10"
width="450">
Never show these notifications:
Never show:
</text>
<scroll_list
follows="top|left"
height="92"
height="140"
layout="topleft"
left="10"
multi_select="true"
multi_select="true"
name="disabled_popups"
width="475" />
</panel>

24
indra/newview/skins/default/xui/en/panel_preferences_general.xml
View File

@ -89,11 +89,12 @@
<text
font="SansSerifSmall"
type="string"
text_color="White_50"
length="1"
follows="left|top"
height="18"
layout="topleft"
left_pad="5"
left_pad="10"
name="language_textbox2"
width="200">
(Requires restart)
@ -179,7 +180,7 @@
left_pad="5"
name="show_location_checkbox"
top_delta="5"
width="256" />
width="256" />
<text
type="string"
length="1"
@ -203,21 +204,21 @@
layout="topleft"
name="radio"
value="0"
width="100" />
width="75" />
<radio_item
label="On"
layout="topleft"
left_pad="12"
name="radio2"
value="1"
width="100" />
width="75" />
<radio_item
label="Show briefly"
layout="topleft"
left_pad="12"
name="radio3"
value="2"
width="100" />
value="2"
width="160" />
</radio_group>
<check_box
enabled_control="AvatarNameTagMode"
@ -323,11 +324,10 @@
follows="left|top"
height="13"
layout="topleft"
text_color="white"
left="30"
mouse_opaque="false"
name="text_box3"
top_pad="15"
top_pad="10"
width="240">
Busy mode response:
</text>
@ -336,18 +336,16 @@
text_readonly_color="LabelDisabledColor"
bg_writeable_color="LtGray"
use_ellipses="false"
bg_visible="true"
border_visible="true"
hover="false"
commit_on_focus_lost = "true"
follows="left|top"
height="50"
height="60"
layout="topleft"
left="50"
name="busy_response"
width="400"
width="440"
word_wrap="true">
log_in_to_change
</text_editor>
</panel>

109
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View File

@ -33,16 +33,15 @@
<button
control_name="MuteAudio"
follows="top|right"
height="18"
image_selected="Parcel_VoiceNo_Dark"
image_unselected="Parcel_Voice_Dark"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
left_pad="10"
name="mute_audio"
tab_stop="false"
top_delta="-2"
width="22" />
width="16" />
<check_box
control_name="MuteWhenMinimized"
height="15"
@ -74,20 +73,19 @@
function="Pref.setControlFalse"
parameter="MuteAmbient" />
</slider>
<button
control_name="MuteAmbient"
<button
control_name="MuteAmbient"
disabled_control="MuteAudio"
follows="top|right"
height="18"
image_selected="Parcel_VoiceNo_Dark"
image_unselected="Parcel_Voice_Dark"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
name="mute_wind"
left_pad="10"
name="mute_audio"
tab_stop="false"
top_delta="-2"
width="22" />
width="16" />
<slider
control_name="AudioLevelUI"
disabled_control="MuteAudio"
@ -113,16 +111,15 @@
control_name="MuteUI"
disabled_control="MuteAudio"
follows="top|right"
height="18"
image_selected="Parcel_VoiceNo_Dark"
image_unselected="Parcel_Voice_Dark"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
name="mute_ui"
left_pad="10"
name="mute_audio"
tab_stop="false"
top_delta="-2"
width="22" />
width="16" />
<slider
control_name="AudioLevelMedia"
disabled_control="MuteAudio"
@ -144,20 +141,19 @@
function="Pref.setControlFalse"
parameter="MuteMedia" />
</slider>
<button
<button
control_name="MuteMedia"
disabled_control="MuteAudio"
follows="top|right"
height="18"
image_selected="Parcel_VoiceNo_Dark"
image_unselected="Parcel_Voice_Dark"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
name="mute_media"
left_pad="10"
name="mute_audio"
tab_stop="false"
top_delta="-2"
width="22" />
width="16" />
<slider
control_name="AudioLevelSFX"
disabled_control="MuteAudio"
@ -179,20 +175,19 @@
function="Pref.setControlFalse"
parameter="MuteSounds" />
</slider>
<button
<button
control_name="MuteSounds"
disabled_control="MuteAudio"
follows="top|right"
height="18"
image_selected="Parcel_VoiceNo_Dark"
image_unselected="Parcel_Voice_Dark"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
name="mute_sfx"
left_pad="10"
name="mute_audio"
tab_stop="false"
top_delta="-2"
width="22" />
width="16" />
<slider
control_name="AudioLevelMusic"
disabled_control="MuteAudio"
@ -214,20 +209,19 @@
function="Pref.setControlFalse"
parameter="MuteMusic" />
</slider>
<button
<button
control_name="MuteMusic"
disabled_control="MuteAudio"
follows="top|right"
height="18"
image_selected="Parcel_VoiceNo_Dark"
image_unselected="Parcel_Voice_Dark"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
name="mute_music"
left_pad="10"
name="mute_audio"
tab_stop="false"
top_delta="-2"
width="22" />
width="16" />
<check_box
label_text.halign="left"
follows="left|top"
@ -236,10 +230,9 @@
disabled_control="CmdLineDisableVoice"
label="Enable voice"
layout="topleft"
font.style="BOLD"
left="101"
left="28"
name="enable_voice_check"
top_pad="13"
top_pad="5"
width="110"
>
</check_box>
@ -265,21 +258,19 @@
function="Pref.setControlFalse"
parameter="MuteVoice" />
</slider>
<button
<button
control_name="MuteVoice"
enabled_control="EnableVoiceChat"
disabled_control="MuteAudio"
follows="top|right"
height="18"
image_selected="Parcel_VoiceNo_Dark"
image_unselected="Parcel_Voice_Dark"
height="16"
image_selected="AudioMute_Off"
image_unselected="Audio_Off"
is_toggle="true"
layout="topleft"
left_pad="16"
name="mute_voice"
left_pad="10"
name="mute_audio"
tab_stop="false"
top_delta="-2"
width="22" />
width="16" />
<text
type="string"
length="1"
@ -366,7 +357,7 @@
name="device_settings_panel"
class="panel_voice_device_settings"
width="501"
top="280">
top="285">
<panel.string
name="default_text">
Default