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

SL-18102 Remove 'Translate chat' checkbox from chat

master
Mnikolenko Productengine 2022-09-07 19:24:12 +03:00
parent 2f81ce5cbd
commit eba7d0cb58
6 changed files with 1 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloaterimnearbychat.cpp
View File

@ -307,7 +307,6 @@ void LLFloaterIMNearbyChat::onOpen(const LLSD& key)
restoreFloater();
onCollapseToLine(this);
}
showTranslationCheckbox(LLTranslate::isTranslationConfigured());
}
// virtual

8
indra/newview/llfloaterimsessiontab.cpp
View File

@ -253,7 +253,6 @@ BOOL LLFloaterIMSessionTab::postBuild()
mGearBtn = getChild<LLButton>("gear_btn");
mAddBtn = getChild<LLButton>("add_btn");
mVoiceButton = getChild<LLButton>("voice_call_btn");
mTranslationCheckBox = getChild<LLUICtrl>("translate_chat_checkbox_lp");
mParticipantListPanel = getChild<LLLayoutPanel>("speakers_list_panel");
mRightPartPanel = getChild<LLLayoutPanel>("right_part_holder");
@ -811,8 +810,6 @@ void LLFloaterIMSessionTab::updateHeaderAndToolbar()
mCloseBtn->setVisible(is_not_torn_off && !mIsNearbyChat);
enableDisableCallBtn();
showTranslationCheckbox();
}
void LLFloaterIMSessionTab::forceReshape()
@ -829,11 +826,6 @@ void LLFloaterIMSessionTab::reshapeChatLayoutPanel()
mChatLayoutPanel->reshape(mChatLayoutPanel->getRect().getWidth(), mInputEditor->getRect().getHeight() + mInputEditorPad, FALSE);
}
void LLFloaterIMSessionTab::showTranslationCheckbox(BOOL show)
{
mTranslationCheckBox->setVisible(mIsNearbyChat && show);
}
// static
void LLFloaterIMSessionTab::processChatHistoryStyleUpdate(bool clean_messages/* = false*/)
{

3
indra/newview/llfloaterimsessiontab.h
View File

@ -71,8 +71,6 @@ public:
static LLFloaterIMSessionTab* findConversation(const LLUUID& uuid);
static LLFloaterIMSessionTab* getConversation(const LLUUID& uuid);
// show/hide the translation check box
void showTranslationCheckbox(const BOOL visible = FALSE);
bool isNearbyChat() {return mIsNearbyChat;}
@ -187,7 +185,6 @@ protected:
LLButton* mGearBtn;
LLButton* mAddBtn;
LLButton* mVoiceButton;
LLUICtrl* mTranslationCheckBox;
private:
// Handling selection and contextual menu

6
indra/newview/llfloatertranslationsettings.cpp
View File

@ -289,10 +289,6 @@ void LLFloaterTranslationSettings::onBtnOK()
gSavedSettings.setString("TranslationService", getSelectedService());
gSavedSettings.setString("BingTranslateAPIKey", getEnteredBingKey());
gSavedSettings.setString("GoogleTranslateAPIKey", getEnteredGoogleKey());
LLFloaterIMNearbyChat* nearby_chat = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat");
if (nearby_chat)
{
nearby_chat->showTranslationCheckbox(LLTranslate::isTranslationConfigured());
}
closeFloater(false);
}

14
indra/newview/skins/default/xui/en/floater_im_session.xml
View File

@ -220,20 +220,6 @@
left="1"
right="-1"
bottom="-1">
<layout_panel
auto_resize="false"
height="26"
name="translate_chat_checkbox_lp">
<check_box
top="10"
control_name="TranslateChat"
enabled="true"
height="16"
label="Translate chat"
left="5"
name="translate_chat_checkbox"
width="230" />
</layout_panel>
<layout_panel
name="chat_holder">
<chat_history

20
indra/newview/skins/default/xui/en/panel_nearby_chat.xml
View File

@ -17,26 +17,6 @@
top="5"
orientation="vertical"
width="242">
<layout_panel
auto_resize="false"
height="26"
layout="topleft"
left_delta="0"
name="translate_chat_checkbox_lp"
top_delta="0"
visible="true"
width="230">
<check_box
top="10"
control_name="TranslateChat"
enabled="true"
height="16"
label="Translate chat"
layout="topleft"
left="5"
name="translate_chat_checkbox"
width="230" />
</layout_panel>
<layout_panel
auto_resize="true"
height="138"