Optionally, have IM buttons on the same line as the person's name.
Adds UseConciseIMButtons. Adds floater_instant_message_concisebuttons.xml Adds Have buttons on the same line as name for IMs (Affects new IMs) checkbox to Adv. Chat's Chat UI tab.
This commit is contained in:
Lirusaito
@@ -760,6 +760,17 @@ Found in Advanced->Rendering->Info Displays</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>UseConciseIMButtons</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether or not IMs use buttons concisely on the same line as the name of the receiver, changes apply to new IMs only.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>ConciseIMButtons
|
||||
<key>ShowLocalChatFloaterBar</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
||||
@@ -377,6 +377,7 @@ void LLPrefsAscentChat::refreshValues()
|
||||
mOtherChatsTornOff = gSavedSettings.getBOOL("OtherChatsTornOff");
|
||||
mShowLocalChatFloaterBar = gSavedSettings.getBOOL("ShowLocalChatFloaterBar");
|
||||
mHorizButt = gSavedSettings.getBOOL("ContactsUseHorizontalButtons");
|
||||
mOneLineIMButt = gSavedSettings.getBOOL("UseConciseIMButtons");
|
||||
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
|
||||
|
||||
//Spam --------------------------------------------------------------------------------
|
||||
@@ -602,6 +603,7 @@ void LLPrefsAscentChat::cancel()
|
||||
gSavedSettings.setBOOL("OtherChatsTornOff", mOtherChatsTornOff);
|
||||
gSavedSettings.setBOOL("ShowLocalChatFloaterBar", mShowLocalChatFloaterBar);
|
||||
gSavedSettings.setBOOL("ContactsUseHorizontalButtons", mHorizButt);
|
||||
gSavedSettings.setBOOL("UseConciseIMButtons", mOneLineIMButt);
|
||||
gSavedSettings.setBOOL("CommunicateSpecificShortcut", mOnlyComm);
|
||||
|
||||
//Spam --------------------------------------------------------------------------------
|
||||
|
||||
@@ -1184,7 +1184,8 @@ void LLFloaterIMPanel::init(const std::string& session_label)
|
||||
// [Ansariel: Display name support]
|
||||
mProfileButtonEnabled = FALSE;
|
||||
// [/Ansariel: Display name support]
|
||||
|
||||
|
||||
static LLCachedControl<bool> concisebuttons("UseConciseIMButtons");
|
||||
std::string xml_filename;
|
||||
switch(mDialog)
|
||||
{
|
||||
@@ -1206,7 +1207,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
|
||||
mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
|
||||
break;
|
||||
case IM_SESSION_P2P_INVITE:
|
||||
xml_filename = "floater_instant_message.xml";
|
||||
xml_filename = concisebuttons ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
|
||||
mVoiceChannel = new LLVoiceChannelP2P(mSessionUUID, mSessionLabel, mOtherParticipantUUID);
|
||||
break;
|
||||
case IM_SESSION_CONFERENCE_START:
|
||||
@@ -1217,7 +1218,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
|
||||
// just received text from another user
|
||||
case IM_NOTHING_SPECIAL:
|
||||
|
||||
xml_filename = "floater_instant_message.xml";
|
||||
xml_filename = concisebuttons ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
|
||||
|
||||
mTextIMPossible = LLVoiceClient::getInstance()->isSessionTextIMPossible(mSessionUUID);
|
||||
mProfileButtonEnabled = LLVoiceClient::getInstance()->isParticipantAvatar(mSessionUUID);
|
||||
@@ -1227,7 +1228,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
|
||||
break;
|
||||
default:
|
||||
llwarns << "Unknown session type" << llendl;
|
||||
xml_filename = "floater_instant_message.xml";
|
||||
xml_filename = concisebuttons ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater border="true" bottom="-298" can_close="true" can_resize="true" default_tab_group="1" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="155" min_width="425" name="im_floater" rect_control="" title="(unknown)" width="501">
|
||||
<string name="answering">Connecting...</string>
|
||||
<string name="ringing">Calling...</string>
|
||||
<string name="connected">Connected, click End Call to hang up</string>
|
||||
<string name="hang_up">Call ended</string>
|
||||
<string name="voice_icon">icn_voice-pvtfocus.tga</string>
|
||||
<string name="title_string">Instant Message with [NAME]</string>
|
||||
<string name="typing_start_string">[NAME] is typing...</string>
|
||||
<string name="session_start_string">Starting session with [NAME], please wait.</string>
|
||||
<string name="default_text_label">Click here to instant message.</string>
|
||||
<string name="unavailable_text_label">Text chat is not available for this call.</string>
|
||||
<string name="inventory_item_offered">Inventory item offered</string>
|
||||
<button bottom="-20" follows="right|top" height="20" label="Profile" left="135" name="profile_callee_btn" width="60"/>
|
||||
<button bottom="-20" follows="right|top" halign="center" height="20" label="History" left_delta="60" name="history_btn" visible="true" width="60"/>
|
||||
<button bottom="-20" follows="right|top" height="20" label="Teleport" left_delta="60" name="profile_tele_btn" width="70"/>
|
||||
<check_box bottom="-20" follows="right|top" height="20" left_delta="70" name="rp_mode">RP Mode</check_box>
|
||||
<button bottom="-20" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="67" name="start_call_btn" width="60"/>
|
||||
<button bottom="-20" follows="right|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" scale_image="true" label="End" name="end_call_btn" width="24"/>
|
||||
<panel mouse_opaque="false" border="false" bottom="-20" follows="right|top" height="20" left_delta="16" name="speaker_controls" width="60">
|
||||
<volume_slider bottom="0" follows="bottom" height="20" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="48"/>
|
||||
<button bottom="0" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="true" label="" left_delta="42" name="mute_btn" tool_tip="Mute voice" width="25"/>
|
||||
</panel>
|
||||
<text_editor bottom="28" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" height="245" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="488" word_wrap="true"/>
|
||||
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right" font="SansSerif" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="423" spell_check="true"/>
|
||||
<button bottom="5" follows="right|bottom" height="20" label="Send" left="433" name="send_btn" scale_image="true" width="60"/>
|
||||
<string name="live_help_dialog">*** Welcome to Help Request ***
|
||||
Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/
|
||||
If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
|
||||
-=-=- Response times will vary, especially during peak times -=-=-</string>
|
||||
</floater>
|
||||
@@ -72,6 +72,7 @@
|
||||
<check_box bottom_delta="-20" follows="top" control_name="OtherChatsTornOff" label="Open new IMs in separate floaters" name="chats_torn_off"/>
|
||||
<check_box bottom_delta="-20" follows="left|top" control_name="ShowLocalChatFloaterBar" label="Show local chat bar in floater (Needs restart)" tool_tip="Whether or not to display the input bar at the bottom of the local chat floater." name="show_local_chat_floater_bar"/>
|
||||
<check_box bottom_delta="-20" control_name="ContactsUseHorizontalButtons" follows="top" height="16" label="Use horizontal buttons for contacts floater (Needs restart)" tool_tip="When enabled, the buttons on the Friends and Groups panels will be at the bottom, horizontally arranged, instead of vertically arranged on the right." name="horiz_butt"/>
|
||||
<check_box bottom_delta="-20" control_name="UseConciseIMButtons" follows="top" height="16" label="Have buttons on the same line as name for IMs (Affects new IMs)" name="im_concise_butt"/>
|
||||
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Disallow communicate shortcut opening detached friends list" control_name="CommunicateSpecificShortcut" name="only_comm"/>
|
||||
</panel>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user