Skip to content
Snippets Groups Projects
Commit f429decb authored by Gilbert Gonzales's avatar Gilbert Gonzales
Browse files

CHUI-486: Now the new chat preferences in drop down lists and checkboxes are... 

CHUI-486: Now the new chat preferences in drop down lists and checkboxes are storable. These values are accessible globally using gSavedSettings.
parent 908f8735
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
indra/llui/llcheckboxctrl.cpp
+ 1
− 13
View file @ f429decb
......@@ -107,7 +107,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLCheckBoxCtrl::Params& p)
LLButton::Params params = p.check_button;
params.rect(btn_rect);
//params.control_name(p.control_name);
params.click_callback.function(boost::bind(&LLCheckBoxCtrl::onButtonPress, this, _2));
params.click_callback.function(boost::bind(&LLCheckBoxCtrl::onCommit, this));
params.commit_on_return(false);
// Checkboxes only allow boolean initial values, but buttons can
// take any LLSD.
......@@ -123,18 +123,6 @@ LLCheckBoxCtrl::~LLCheckBoxCtrl()
// Children all cleaned up by default view destructor.
}
// static
void LLCheckBoxCtrl::onButtonPress( const LLSD& data )
{
//if (mRadioStyle)
//{
// setValue(TRUE);
//}
onCommit();
}
void LLCheckBoxCtrl::onCommit()
{
if( getEnabled() )
......
indra/llui/llcheckboxctrl.h
+ 0
− 2
View file @ f429decb
......@@ -103,8 +103,6 @@ class LLCheckBoxCtrl
virtual void setControlName(const std::string& control_name, LLView* context);
void onButtonPress(const LLSD& data);
virtual BOOL isDirty() const; // Returns TRUE if the user has modified this control.
virtual void resetDirty(); // Clear dirty state
......
indra/newview/app_settings/settings.xml
+ 121
− 0
View file @ f429decb
......@@ -4667,6 +4667,17 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>KeepConversationLogTranscripts</key>
<map>
<key>Comment</key>
<string>Keep a conversation log and transcripts</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LandBrushSize</key>
<map>
<key>Comment</key>
......@@ -6285,6 +6296,61 @@
<key>Value</key>
<integer>305</integer>
</map>
<key>NotificationConferenceIMOptions</key>
<map>
<key>Comment</key>
<string>Specifies how the UI responds to Conference IM Notifications.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>0</string>
</map>
<key>NotificationFriendIMOptions</key>
<map>
<key>Comment</key>
<string>Specifies how the UI responds to Friend IM Notifications.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>0</string>
</map>
<key>NotificationGroupChatOptions</key>
<map>
<key>Comment</key>
<string>Specifies how the UI responds to Group Chat Notifications.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>0</string>
</map>
<key>NotificationNearbyChatOptions</key>
<map>
<key>Comment</key>
<string>Specifies how the UI responds to Nearby Chat Notifications.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>0</string>
</map>
<key>NotificationNonFriendIMOptions</key>
<map>
<key>Comment</key>
<string>Specifies how the UI responds to Non Friend IM Notifications.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>0</string>
</map>
<key>NotificationToastLifeTime</key>
<map>
<key>Comment</key>
......@@ -6801,6 +6867,61 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>PlaySoundGroupChatMessages</key>
<map>
<key>Comment</key>
<string>Plays a sound when have a group chat message.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>PlaySoundIncomingVoiceCall</key>
<map>
<key>Comment</key>
<string>Plays a sound when have an incoming voice call.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>PlaySoundInventoryOffer</key>
<map>
<key>Comment</key>
<string>Plays a sound when have an inventory offer.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>PlaySoundNewConversation</key>
<map>
<key>Comment</key>
<string>Plays a sound when have a new conversation.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>PlaySoundTeleportOffer</key>
<map>
<key>Comment</key>
<string>Plays a sound when have a teleport offer.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>PluginAttachDebuggerToPlugins</key>
<map>
<key>Comment</key>
......
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+ 21
− 25
View file @ f429decb
......@@ -37,6 +37,7 @@
top_pad="6"
width="330" />
<check_box
control_name="KeepConversationLogTranscripts"
height="16"
label="Keep a conversation log and transcripts"
layout="topleft"
......@@ -135,15 +136,15 @@
width="223">
<combo_box.item
label="Pop up the message"
name="0"
name="PopUpMessage"
value="0"/>
<combo_box.item
label="Flash toolbar button"
name="1"
name="FlashToolbarButton"
value="1"/>
<combo_box.item
label="None"
name="2"
name="None"
value="2"/>
</combo_box>
<text
......@@ -166,15 +167,15 @@
width="223">
<combo_box.item
label="Pop up the message"
name="0"
name="PopUpMessage"
value="0"/>
<combo_box.item
label="Flash toolbar button"
name="1"
name="FlashToolbarButton"
value="1"/>
<combo_box.item
label="None"
name="2"
name="None"
value="2"/>
</combo_box>
<text
......@@ -197,15 +198,15 @@
width="223">
<combo_box.item
label="Pop up the message"
name="0"
name="PopUpMessage"
value="0"/>
<combo_box.item
label="Flash toolbar button"
name="1"
name="FlashToolbarButton"
value="1"/>
<combo_box.item
label="None"
name="2"
name="None"
value="2"/>
</combo_box>
<text
......@@ -228,15 +229,15 @@
width="223">
<combo_box.item
label="Pop up the message"
name="0"
name="PopUpMessage"
value="0"/>
<combo_box.item
label="Flash toolbar button"
name="1"
name="FlashToolbarButton"
value="1"/>
<combo_box.item
label="None"
name="2"
name="None"
value="2"/>
</combo_box>
<text
......@@ -259,15 +260,15 @@
width="223">
<combo_box.item
label="Pop up the message"
name="0"
name="PopUpMessage"
value="0"/>
<combo_box.item
label="Flash toolbar button"
name="1"
name="FlashToolBarButton"
value="1"/>
<combo_box.item
label="None"
name="2"
name="None"
value="2"/>
</combo_box>
<text
......@@ -304,9 +305,8 @@
Play sound:
</text>
<check_box
control_name="NewConversation"
control_name="PlaySoundNewConversation"
height="16"
initial_value="true"
label="New conversation"
layout="topleft"
left_pad="15"
......@@ -314,27 +314,24 @@
name="new_conversation"
width="150" />
<check_box
control_name="IncomingVoiceCall"
control_name="PlaySoundIncomingVoiceCall"
height="16"
initial_value="true"
label="Incoming voice call"
layout="topleft"
top_pad="6"
name="incoming_voice_call"
width="150" />
<check_box
control_name="GroupChatMessages"
control_name="PlaySoundGroupChatMessages"
height="16"
initial_value="false"
label="Group chat messages"
layout="topleft"
top_pad="6"
name="group_chat_messages"
width="150" />
<check_box
control_name="TeleportOffer"
control_name="PlaySoundTeleportOffer"
height="16"
initial_value="true"
label="Teleport offer"
layout="topleft"
left_pad="35"
......@@ -342,9 +339,8 @@
name="teleport_offer"
width="150" />
<check_box
control_name="InventoryOffer"
control_name="PlaySoundInventoryOffer"
height="16"
initial_value="false"
label="Inventory offer"
layout="topleft"
top_pad="6"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment