diff options
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 365 | 
1 files changed, 56 insertions, 309 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 4ed81394fe..a1082d9c32 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -23,7 +23,7 @@       height="30"       layout="topleft"       left="40" -	   control_name="ChatFontSize" +	 control_name="ChatFontSize"       name="chat_font_size"       top_pad="0"       width="440"> @@ -55,291 +55,7 @@           top_delta="0"           width="125" />      </radio_group> - -    <text -      follows="left|top" -      layout="topleft" -      left="30" -      height="12" -      name="font_colors"  -      top_pad="10"  -      width="120" -      > -    Font colors: -    </text>   -   -    <color_swatch -     can_apply_immediately="true" -     follows="left|top" -     height="47" -     layout="topleft" -     left="40" -     name="user" -     top_pad="10" -     width="44" > -		<color_swatch.init_callback -		 function="Pref.getUIColor" -		 parameter="UserChatColor" /> -		<color_swatch.commit_callback -		 function="Pref.applyUIColor" -		 parameter="UserChatColor" /> -	</color_swatch> -    <text -     type="string" -     length="1" -     follows="left|top" -     height="10" -     layout="topleft" -     left_pad="5" -     mouse_opaque="false" -     name="text_box1" -     top_delta="5" -     width="95"> -        Me -    </text> -    <color_swatch -     can_apply_immediately="true" -     follows="left|top" -     height="47" -     layout="topleft" -     left="190" -     name="agent" -     top_pad="-15" -     width="44" > -		<color_swatch.init_callback -		 function="Pref.getUIColor" -		 parameter="AgentChatColor" /> -		<color_swatch.commit_callback -		 function="Pref.applyUIColor" -		 parameter="AgentChatColor" /> -	</color_swatch> -    <text -     type="string" -     length="1" -     follows="left|top" -     height="10" -     layout="topleft" -     left_pad="5" -     mouse_opaque="false" -     name="text_box2" -     top_delta="5" -     width="95"> -        Others -    </text> -    <color_swatch -     can_apply_immediately="true" -     color="LtGray" -     follows="left|top" -     height="47" -     label_width="60" -     layout="topleft" -     left="360" -     name="im" -     top_pad="-15" -     width="44"> -		<color_swatch.init_callback -		 function="Pref.getUIColor" -		 parameter="IMChatColor" /> -		<color_swatch.commit_callback -		 function="Pref.applyUIColor" -		 parameter="IMChatColor" /> -	</color_swatch> -	<text -     type="string" -     length="1" -     follows="left|top" -     height="10" -     layout="topleft" -     left_pad="5" -     mouse_opaque="false" -     name="text_box3" -     top_delta="5" -     width="95"> -        IM -    </text> -    <color_swatch -     can_apply_immediately="true" -     color="LtGray" -     follows="left|top" -     height="47" -     label_width="44" -     layout="topleft" -     left="40" -     name="system" -     top_pad="22" -     width="44" > -		<color_swatch.init_callback -		 function="Pref.getUIColor" -		 parameter="SystemChatColor" /> -		<color_swatch.commit_callback -		 function="Pref.applyUIColor" -		 parameter="SystemChatColor" /> -	</color_swatch> -    <text -     type="string" -     length="1" -     follows="left|top" -     height="10" -     layout="topleft" -     left_pad="5" -     mouse_opaque="false" -     name="text_box4" -     top_delta="5" -     width="95"> -        System -    </text> -    <color_swatch -     can_apply_immediately="true" -     color="Red" -     follows="left|top" -     height="47" -     layout="topleft" -     left="190" -     name="script_error" -     top_pad="-15" -     width="44"> -		<color_swatch.init_callback -		 function="Pref.getUIColor" -		 parameter="ScriptErrorColor" /> -		<color_swatch.commit_callback -		 function="Pref.applyUIColor" -		 parameter="ScriptErrorColor" /> -	</color_swatch> -    <text -     type="string" -     length="1" -     follows="left|top" -     height="10" -     layout="topleft" -     left_pad="5" -     mouse_opaque="false" -     name="text_box5" -     top_delta="5" -     width="95"> -        Errors -    </text> -    <color_swatch -     can_apply_immediately="true" -     color="EmphasisColor_35" -     follows="left|top" -     height="47" -     layout="topleft" -     left="360" -     name="objects" -     top_pad="-15" -     width="44" > -		<color_swatch.init_callback -		 function="Pref.getUIColor" -		 parameter="ObjectChatColor" /> -		<color_swatch.commit_callback -		 function="Pref.applyUIColor" -		 parameter="ObjectChatColor" /> -	</color_swatch> -    <text -     type="string" -     length="1" -     follows="left|top" -     height="10" -     layout="topleft" -     left_pad="5" -     mouse_opaque="false" -     name="text_box6" -     top_delta="5" -     width="95"> -        Objects -    </text> -    <color_swatch -     can_apply_immediately="true" -     color="LtYellow" -     follows="left|top" -     height="47" -     layout="topleft" -     left="40" -     name="owner" -     top_pad="22" -     width="44" > -		<color_swatch.init_callback -		 function="Pref.getUIColor" -		 parameter="llOwnerSayChatColor" /> -		<color_swatch.commit_callback -		 function="Pref.applyUIColor" -		 parameter="llOwnerSayChatColor" /> -	</color_swatch> -    <text -     type="string" -     length="1" -     follows="left|top" -     height="10" -     layout="topleft" -     left_pad="5" -     mouse_opaque="false" -     name="text_box7" -     top_delta="5" -     width="95"> -        Owner -    </text> -    <color_swatch -     can_apply_immediately="true" -     color="EmphasisColor" -     follows="left|top" -     height="47" -     layout="topleft" -     left="190" -     name="links" -     top_pad="-15" -     width="44" > -		<color_swatch.init_callback -		 function="Pref.getUIColor" -		 parameter="HTMLLinkColor" /> -		<color_swatch.commit_callback -		 function="Pref.applyUIColor" -		 parameter="HTMLLinkColor" /> -	</color_swatch> -    <text -     type="string" -     length="1" -     follows="left|top" -     height="10" -     layout="topleft" -     left_pad="5" -     mouse_opaque="false" -     name="text_box9" -     top_delta="5" -     width="95"> -        URLs -    </text> -    <spinner -     control_name="NearbyToastLifeTime" -     decimal_digits="0" -     follows="left|top" -     height="23" -     increment="1" -     initial_value="23" -     label="Nearby chat toasts life time:" -     label_width="190" -     layout="topleft" -     left="290" -     max_val="60" -     min_val="1" -     name="nearby_toasts_lifetime" -     top_pad="33" -     width="210" /> -    <spinner -     control_name="NearbyToastFadingTime" -     decimal_digits="0" -     follows="left|top" -     height="23" -     increment="1" -     initial_value="3" -     label="Nearby chat toasts fading time:" -     label_width="190" -     layout="topleft" -     left_delta="00" -     max_val="60" -     min_val="0" -     name="nearby_toasts_fadingtime" -     top_pad="15" -     width="210" /> +          <check_box       control_name="PlayTypingAnim"       height="16" @@ -348,7 +64,7 @@       layout="topleft"       left="30"       name="play_typing_animation" -     top="205" +     top_pad="10"       width="400" />      <check_box       enabled="false" @@ -368,6 +84,16 @@       name="plain_text_chat_history"       top_pad="5"       width="400" /> +    <check_box +     control_name="UseChatBubbles" +     follows="left|top" +     height="16" +     label="Bubble Chat" +     layout="topleft" +     left_delta="0" +     top_pad="5" +     name="bubble_text_chat" +     width="150" />           <text       name="show_ims_in_label"       follows="left|top" @@ -375,7 +101,7 @@       left="30"       height="20"       width="170" -     top_pad="7"> +     top_pad="15">       Show IMs in:      </text>      <text @@ -385,9 +111,8 @@       top_delta="0"        left="170"     	 height="20" -	   width="130" -     text_color="White_25" -	  > +	 width="130" +     text_color="White_25">        (requires restart)        </text>      <radio_group @@ -401,7 +126,7 @@       width="150">       <radio_item        height="16" -      label="Separate windows" +      label="Separate Windows"        layout="topleft"        left="0"        name="radio" @@ -422,19 +147,19 @@       name="disable_toast_label"       follows="left|top"       layout="topleft" -     top_delta="-22"  -     left="280"  +     top_pad="20"  +     left="30"        height="10"       width="180"> -      Enable Incoming Chat popups: +      Enable incoming chat popups:        </text>      <check_box       control_name="EnableGroupChatPopups"       name="EnableGroupChatPopups"       label="Group Chats"        layout="topleft" -     top_delta="18"  -     left="295"  +     top_pad="5"  +     left_delta="10"        height="20"       tool_tip="Check to see popups when a Group Chat message arrives"       width="400" /> @@ -443,21 +168,43 @@       name="EnableIMChatPopups"       label="IM Chats"        layout="topleft" -     top_delta="22"  -     left="295"  -     height="20" +     top_pad="5" +     height="16"       tool_tip="Check to see popups when an instant message arrives"       width="400" /> -    <check_box -     control_name="UseChatBubbles" +    <spinner +     control_name="NearbyToastLifeTime" +     decimal_digits="0"       follows="left|top" -     height="16" -     label="Bubble Chat" +     height="23" +     increment="1" +     initial_value="23" +     label="Nearby chat toasts life time:" +     label_width="190"       layout="topleft" -     left="30" -     top_pad="4" -     name="bubble_text_chat" -     width="150" /> +     left="45" +     max_val="60" +     min_val="1" +     name="nearby_toasts_lifetime" +     top_pad="10" +     width="230" /> +    <spinner +     control_name="NearbyToastFadingTime" +     decimal_digits="0" +     follows="left|top" +     height="23" +     increment="1" +     initial_value="3" +     label="Nearby chat toasts fading time:" +     label_width="190" +     layout="topleft" +     left_delta="0" +     max_val="60" +     min_val="0" +     name="nearby_toasts_fadingtime" +     top_pad="3" +     width="230" /> +          <check_box       control_name="TranslateChat"       enabled="true" @@ -466,7 +213,7 @@       layout="topleft"       left="30"       name="translate_chat_checkbox" -     bottom_delta="20" +     bottom_delta="30"       width="400" />      <text       bottom_delta="30"  | 
