From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llfloatertranslationsettings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloatertranslationsettings.cpp') diff --git a/indra/newview/llfloatertranslationsettings.cpp b/indra/newview/llfloatertranslationsettings.cpp index d29ecbbf95..e9b7a4a815 100644 --- a/indra/newview/llfloatertranslationsettings.cpp +++ b/indra/newview/llfloatertranslationsettings.cpp @@ -52,7 +52,7 @@ LLFloaterTranslationSettings::LLFloaterTranslationSettings(const LLSD& key) } // virtual -BOOL LLFloaterTranslationSettings::postBuild() +bool LLFloaterTranslationSettings::postBuild() { mMachineTranslationCB = getChild("translate_chat_checkbox"); mLanguageCombo = getChild("translate_language_combo"); @@ -106,7 +106,7 @@ BOOL LLFloaterTranslationSettings::postBuild() }); center(); - return TRUE; + return true; } // virtual -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/llfloatertranslationsettings.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'indra/newview/llfloatertranslationsettings.cpp') diff --git a/indra/newview/llfloatertranslationsettings.cpp b/indra/newview/llfloatertranslationsettings.cpp index e9b7a4a815..b9b845fde5 100644 --- a/indra/newview/llfloatertranslationsettings.cpp +++ b/indra/newview/llfloatertranslationsettings.cpp @@ -113,8 +113,8 @@ bool LLFloaterTranslationSettings::postBuild() void LLFloaterTranslationSettings::onOpen(const LLSD& key) { mMachineTranslationCB->setValue(gSavedSettings.getBOOL("TranslateChat")); - mLanguageCombo->setSelectedByValue(gSavedSettings.getString("TranslateLanguage"), TRUE); - mTranslationServiceRadioGroup->setSelectedByValue(gSavedSettings.getString("TranslationService"), TRUE); + mLanguageCombo->setSelectedByValue(gSavedSettings.getString("TranslateLanguage"), true); + mTranslationServiceRadioGroup->setSelectedByValue(gSavedSettings.getString("TranslationService"), true); LLSD azure_key = gSavedSettings.getLLSD("AzureTranslateAPIKey"); if (azure_key.isMap() && !azure_key["id"].asString().empty()) @@ -135,22 +135,22 @@ void LLFloaterTranslationSettings::onOpen(const LLSD& key) } else { - mAzureAPIKeyEditor->setTentative(TRUE); + mAzureAPIKeyEditor->setTentative(true); mAzureAPIRegionEditor->setTentative(true); - mAzureKeyVerified = FALSE; + mAzureKeyVerified = false; } std::string google_key = gSavedSettings.getString("GoogleTranslateAPIKey"); if (!google_key.empty()) { mGoogleAPIKeyEditor->setText(google_key); - mGoogleAPIKeyEditor->setTentative(FALSE); + mGoogleAPIKeyEditor->setTentative(false); verifyKey(LLTranslate::SERVICE_GOOGLE, google_key, false); } else { - mGoogleAPIKeyEditor->setTentative(TRUE); - mGoogleKeyVerified = FALSE; + mGoogleAPIKeyEditor->setTentative(true); + mGoogleKeyVerified = false; } LLSD deepl_key = gSavedSettings.getLLSD("DeepLTranslateAPIKey"); @@ -163,8 +163,8 @@ void LLFloaterTranslationSettings::onOpen(const LLSD& key) } else { - mDeepLAPIKeyEditor->setTentative(TRUE); - mDeepLKeyVerified = FALSE; + mDeepLAPIKeyEditor->setTentative(true); + mDeepLKeyVerified = false; } updateControlsEnabledState(); @@ -340,7 +340,7 @@ void LLFloaterTranslationSettings::onEditorFocused(LLFocusableElement* control) if (editor->getTentative()) { editor->setText(LLStringUtil::null); - editor->setTentative(FALSE); + editor->setTentative(false); } } } -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llfloatertranslationsettings.cpp | 848 ++++++++++++------------- 1 file changed, 424 insertions(+), 424 deletions(-) (limited to 'indra/newview/llfloatertranslationsettings.cpp') diff --git a/indra/newview/llfloatertranslationsettings.cpp b/indra/newview/llfloatertranslationsettings.cpp index 7d8fb847dc..71fd7fbb41 100644 --- a/indra/newview/llfloatertranslationsettings.cpp +++ b/indra/newview/llfloatertranslationsettings.cpp @@ -1,424 +1,424 @@ -/** - * @file llfloatertranslationsettings.cpp - * @brief Machine translation settings for chat - * - * $LicenseInfo:firstyear=2011&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2011, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llfloatertranslationsettings.h" - -// Viewer includes -#include "llfloaterimnearbychat.h" -#include "lltranslate.h" -#include "llviewercontrol.h" // for gSavedSettings - -// Linden library includes -#include "llbutton.h" -#include "llcheckboxctrl.h" -#include "llcombobox.h" -#include "llfloaterreg.h" -#include "lllineeditor.h" -#include "llnotificationsutil.h" -#include "llradiogroup.h" - -LLFloaterTranslationSettings::LLFloaterTranslationSettings(const LLSD& key) -: LLFloater(key) -, mMachineTranslationCB(NULL) -, mAzureKeyVerified(false) -, mGoogleKeyVerified(false) -, mDeepLKeyVerified(false) -{ -} - -// virtual -bool LLFloaterTranslationSettings::postBuild() -{ - mMachineTranslationCB = getChild("translate_chat_checkbox"); - mLanguageCombo = getChild("translate_language_combo"); - mTranslationServiceRadioGroup = getChild("translation_service_rg"); - mAzureAPIEndpointEditor = getChild("azure_api_endpoint_combo"); - mAzureAPIKeyEditor = getChild("azure_api_key"); - mAzureAPIRegionEditor = getChild("azure_api_region"); - mGoogleAPIKeyEditor = getChild("google_api_key"); - mDeepLAPIDomainCombo = getChild("deepl_api_domain_combo"); - mDeepLAPIKeyEditor = getChild("deepl_api_key"); - mAzureVerifyBtn = getChild("verify_azure_api_key_btn"); - mGoogleVerifyBtn = getChild("verify_google_api_key_btn"); - mDeepLVerifyBtn = getChild("verify_deepl_api_key_btn"); - mOKBtn = getChild("ok_btn"); - - mMachineTranslationCB->setCommitCallback(boost::bind(&LLFloaterTranslationSettings::updateControlsEnabledState, this)); - mTranslationServiceRadioGroup->setCommitCallback(boost::bind(&LLFloaterTranslationSettings::updateControlsEnabledState, this)); - mOKBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnOK, this)); - getChild("cancel_btn")->setClickedCallback(boost::bind(&LLFloater::closeFloater, this, false)); - mAzureVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnAzureVerify, this)); - mGoogleVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnGoogleVerify, this)); - mDeepLVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnDeepLVerify, this)); - - mAzureAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1)); - mAzureAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this), NULL); - mAzureAPIRegionEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1)); - mAzureAPIRegionEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this), NULL); - - mAzureAPIEndpointEditor->setFocusLostCallback([this](LLFocusableElement*) - { - setAzureVerified(false, false, 0); - }); - mAzureAPIEndpointEditor->setCommitCallback([this](LLUICtrl* ctrl, const LLSD& param) - { - setAzureVerified(false, false, 0); - }); - - mGoogleAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1)); - mGoogleAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onGoogleKeyEdited, this), NULL); - - mDeepLAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1)); - mDeepLAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onDeepLKeyEdited, this), NULL); - - mDeepLAPIDomainCombo->setFocusLostCallback([this](LLFocusableElement*) - { - setDeepLVerified(false, false, 0); - }); - mDeepLAPIDomainCombo->setCommitCallback([this](LLUICtrl* ctrl, const LLSD& param) - { - setDeepLVerified(false, false, 0); - }); - - center(); - return true; -} - -// virtual -void LLFloaterTranslationSettings::onOpen(const LLSD& key) -{ - mMachineTranslationCB->setValue(gSavedSettings.getBOOL("TranslateChat")); - mLanguageCombo->setSelectedByValue(gSavedSettings.getString("TranslateLanguage"), true); - mTranslationServiceRadioGroup->setSelectedByValue(gSavedSettings.getString("TranslationService"), true); - - LLSD azure_key = gSavedSettings.getLLSD("AzureTranslateAPIKey"); - if (azure_key.isMap() && !azure_key["id"].asString().empty()) - { - mAzureAPIKeyEditor->setText(azure_key["id"].asString()); - mAzureAPIKeyEditor->setTentative(false); - if (azure_key.has("region") && !azure_key["region"].asString().empty()) - { - mAzureAPIRegionEditor->setText(azure_key["region"].asString()); - mAzureAPIRegionEditor->setTentative(false); - } - else - { - mAzureAPIRegionEditor->setTentative(true); - } - mAzureAPIEndpointEditor->setValue(azure_key["endpoint"]); - verifyKey(LLTranslate::SERVICE_AZURE, azure_key, false); - } - else - { - mAzureAPIKeyEditor->setTentative(true); - mAzureAPIRegionEditor->setTentative(true); - mAzureKeyVerified = false; - } - - std::string google_key = gSavedSettings.getString("GoogleTranslateAPIKey"); - if (!google_key.empty()) - { - mGoogleAPIKeyEditor->setText(google_key); - mGoogleAPIKeyEditor->setTentative(false); - verifyKey(LLTranslate::SERVICE_GOOGLE, google_key, false); - } - else - { - mGoogleAPIKeyEditor->setTentative(true); - mGoogleKeyVerified = false; - } - - LLSD deepl_key = gSavedSettings.getLLSD("DeepLTranslateAPIKey"); - if (deepl_key.isMap() && !deepl_key["id"].asString().empty()) - { - mDeepLAPIKeyEditor->setText(deepl_key["id"].asString()); - mDeepLAPIKeyEditor->setTentative(false); - mDeepLAPIDomainCombo->setValue(deepl_key["domain"]); - verifyKey(LLTranslate::SERVICE_DEEPL, deepl_key, false); - } - else - { - mDeepLAPIKeyEditor->setTentative(true); - mDeepLKeyVerified = false; - } - - updateControlsEnabledState(); -} - -void LLFloaterTranslationSettings::setAzureVerified(bool ok, bool alert, S32 status) -{ - if (alert) - { - showAlert(ok ? "azure_api_key_verified" : "azure_api_key_not_verified", status); - } - - mAzureKeyVerified = ok; - updateControlsEnabledState(); -} - -void LLFloaterTranslationSettings::setGoogleVerified(bool ok, bool alert, S32 status) -{ - if (alert) - { - showAlert(ok ? "google_api_key_verified" : "google_api_key_not_verified", status); - } - - mGoogleKeyVerified = ok; - updateControlsEnabledState(); -} - -void LLFloaterTranslationSettings::setDeepLVerified(bool ok, bool alert, S32 status) -{ - if (alert) - { - showAlert(ok ? "deepl_api_key_verified" : "deepl_api_key_not_verified", status); - } - - mDeepLKeyVerified = ok; - updateControlsEnabledState(); -} - -std::string LLFloaterTranslationSettings::getSelectedService() const -{ - return mTranslationServiceRadioGroup->getSelectedValue().asString(); -} - -LLSD LLFloaterTranslationSettings::getEnteredAzureKey() const -{ - LLSD key; - if (!mAzureAPIKeyEditor->getTentative()) - { - key["endpoint"] = mAzureAPIEndpointEditor->getValue(); - key["id"] = mAzureAPIKeyEditor->getText(); - if (!mAzureAPIRegionEditor->getTentative()) - { - key["region"] = mAzureAPIRegionEditor->getText(); - } - } - return key; -} - -std::string LLFloaterTranslationSettings::getEnteredGoogleKey() const -{ - return mGoogleAPIKeyEditor->getTentative() ? LLStringUtil::null : mGoogleAPIKeyEditor->getText(); -} - -LLSD LLFloaterTranslationSettings::getEnteredDeepLKey() const -{ - LLSD key; - if (!mDeepLAPIKeyEditor->getTentative()) - { - key["domain"] = mDeepLAPIDomainCombo->getValue(); - key["id"] = mDeepLAPIKeyEditor->getText(); - } - return key; -} - -void LLFloaterTranslationSettings::showAlert(const std::string& msg_name, S32 status) const -{ - LLStringUtil::format_map_t string_args; - // For now just show an http error code, whole 'reason' string might be added later - string_args["[STATUS]"] = llformat("%d", status); - std::string message = getString(msg_name, string_args); - - LLSD args; - args["MESSAGE"] = message; - LLNotificationsUtil::add("GenericAlert", args); -} - -void LLFloaterTranslationSettings::updateControlsEnabledState() -{ - // Enable/disable controls based on the checkbox value. - bool on = mMachineTranslationCB->getValue().asBoolean(); - std::string service = getSelectedService(); - bool azure_selected = service == "azure"; - bool google_selected = service == "google"; - bool deepl_selected = service == "deepl"; - - mTranslationServiceRadioGroup->setEnabled(on); - mLanguageCombo->setEnabled(on); - - // MS Azure - getChild("azure_api_endoint_label")->setEnabled(on); - mAzureAPIEndpointEditor->setEnabled(on && azure_selected); - getChild("azure_api_key_label")->setEnabled(on); - mAzureAPIKeyEditor->setEnabled(on && azure_selected); - getChild("azure_api_region_label")->setEnabled(on); - mAzureAPIRegionEditor->setEnabled(on && azure_selected); - - mAzureVerifyBtn->setEnabled(on && azure_selected && - !mAzureKeyVerified && getEnteredAzureKey().isMap()); - - // Google - getChild("google_api_key_label")->setEnabled(on); - mGoogleAPIKeyEditor->setEnabled(on && google_selected); - - mGoogleVerifyBtn->setEnabled(on && google_selected && - !mGoogleKeyVerified && !getEnteredGoogleKey().empty()); - - // DeepL - getChild("deepl_api_domain_label")->setEnabled(on); - mDeepLAPIDomainCombo->setEnabled(on && deepl_selected); - getChild("deepl_api_key_label")->setEnabled(on); - mDeepLAPIKeyEditor->setEnabled(on && deepl_selected); - - mDeepLVerifyBtn->setEnabled(on && deepl_selected && - !mDeepLKeyVerified && getEnteredDeepLKey().isMap()); - - bool service_verified = - (azure_selected && mAzureKeyVerified) - || (google_selected && mGoogleKeyVerified) - || (deepl_selected && mDeepLKeyVerified); - gSavedPerAccountSettings.setBOOL("TranslatingEnabled", service_verified); - - mOKBtn->setEnabled(!on || service_verified); -} - -/*static*/ -void LLFloaterTranslationSettings::setVerificationStatus(int service, bool ok, bool alert, S32 status) -{ - LLFloaterTranslationSettings* floater = - LLFloaterReg::getTypedInstance("prefs_translation"); - - if (!floater) - { - LL_WARNS() << "Cannot find translation settings floater" << LL_ENDL; - return; - } - - switch (service) - { - case LLTranslate::SERVICE_AZURE: - floater->setAzureVerified(ok, alert, status); - break; - case LLTranslate::SERVICE_GOOGLE: - floater->setGoogleVerified(ok, alert, status); - break; - case LLTranslate::SERVICE_DEEPL: - floater->setDeepLVerified(ok, alert, status); - break; - } -} - - -void LLFloaterTranslationSettings::verifyKey(int service, const LLSD& key, bool alert) -{ - LLTranslate::verifyKey(static_cast(service), key, - boost::bind(&LLFloaterTranslationSettings::setVerificationStatus, _1, _2, alert, _3)); -} - -void LLFloaterTranslationSettings::onEditorFocused(LLFocusableElement* control) -{ - LLLineEditor* editor = dynamic_cast(control); - if (editor && editor->hasTabStop()) // if enabled. getEnabled() doesn't work - { - if (editor->getTentative()) - { - editor->setText(LLStringUtil::null); - editor->setTentative(false); - } - } -} - -void LLFloaterTranslationSettings::onAzureKeyEdited() -{ - if (mAzureAPIKeyEditor->isDirty() - || mAzureAPIRegionEditor->isDirty()) - { - // todo: verify mAzureAPIEndpointEditor url - setAzureVerified(false, false, 0); - } -} - -void LLFloaterTranslationSettings::onGoogleKeyEdited() -{ - if (mGoogleAPIKeyEditor->isDirty()) - { - setGoogleVerified(false, false, 0); - } -} - -void LLFloaterTranslationSettings::onDeepLKeyEdited() -{ - if (mDeepLAPIKeyEditor->isDirty()) - { - setDeepLVerified(false, false, 0); - } -} - -void LLFloaterTranslationSettings::onBtnAzureVerify() -{ - LLSD key = getEnteredAzureKey(); - if (key.isMap()) - { - verifyKey(LLTranslate::SERVICE_AZURE, key); - } -} - -void LLFloaterTranslationSettings::onBtnGoogleVerify() -{ - std::string key = getEnteredGoogleKey(); - if (!key.empty()) - { - verifyKey(LLTranslate::SERVICE_GOOGLE, LLSD(key)); - } -} - -void LLFloaterTranslationSettings::onBtnDeepLVerify() -{ - LLSD key = getEnteredDeepLKey(); - if (key.isMap()) - { - verifyKey(LLTranslate::SERVICE_DEEPL, key); - } -} - -void LLFloaterTranslationSettings::onClose(bool app_quitting) -{ - std::string service = gSavedSettings.getString("TranslationService"); - bool azure_selected = service == "azure"; - bool google_selected = service == "google"; - bool deepl_selected = service == "deepl"; - - bool service_verified = - (azure_selected && mAzureKeyVerified) - || (google_selected && mGoogleKeyVerified) - || (deepl_selected && mDeepLKeyVerified); - gSavedPerAccountSettings.setBOOL("TranslatingEnabled", service_verified); -} -void LLFloaterTranslationSettings::onBtnOK() -{ - gSavedSettings.setBOOL("TranslateChat", mMachineTranslationCB->getValue().asBoolean()); - gSavedSettings.setString("TranslateLanguage", mLanguageCombo->getSelectedValue().asString()); - gSavedSettings.setString("TranslationService", getSelectedService()); - gSavedSettings.setLLSD("AzureTranslateAPIKey", getEnteredAzureKey()); - gSavedSettings.setString("GoogleTranslateAPIKey", getEnteredGoogleKey()); - gSavedSettings.setLLSD("DeepLTranslateAPIKey", getEnteredDeepLKey()); - - closeFloater(false); -} +/** + * @file llfloatertranslationsettings.cpp + * @brief Machine translation settings for chat + * + * $LicenseInfo:firstyear=2011&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2011, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "llfloatertranslationsettings.h" + +// Viewer includes +#include "llfloaterimnearbychat.h" +#include "lltranslate.h" +#include "llviewercontrol.h" // for gSavedSettings + +// Linden library includes +#include "llbutton.h" +#include "llcheckboxctrl.h" +#include "llcombobox.h" +#include "llfloaterreg.h" +#include "lllineeditor.h" +#include "llnotificationsutil.h" +#include "llradiogroup.h" + +LLFloaterTranslationSettings::LLFloaterTranslationSettings(const LLSD& key) +: LLFloater(key) +, mMachineTranslationCB(NULL) +, mAzureKeyVerified(false) +, mGoogleKeyVerified(false) +, mDeepLKeyVerified(false) +{ +} + +// virtual +bool LLFloaterTranslationSettings::postBuild() +{ + mMachineTranslationCB = getChild("translate_chat_checkbox"); + mLanguageCombo = getChild("translate_language_combo"); + mTranslationServiceRadioGroup = getChild("translation_service_rg"); + mAzureAPIEndpointEditor = getChild("azure_api_endpoint_combo"); + mAzureAPIKeyEditor = getChild("azure_api_key"); + mAzureAPIRegionEditor = getChild("azure_api_region"); + mGoogleAPIKeyEditor = getChild("google_api_key"); + mDeepLAPIDomainCombo = getChild("deepl_api_domain_combo"); + mDeepLAPIKeyEditor = getChild("deepl_api_key"); + mAzureVerifyBtn = getChild("verify_azure_api_key_btn"); + mGoogleVerifyBtn = getChild("verify_google_api_key_btn"); + mDeepLVerifyBtn = getChild("verify_deepl_api_key_btn"); + mOKBtn = getChild("ok_btn"); + + mMachineTranslationCB->setCommitCallback(boost::bind(&LLFloaterTranslationSettings::updateControlsEnabledState, this)); + mTranslationServiceRadioGroup->setCommitCallback(boost::bind(&LLFloaterTranslationSettings::updateControlsEnabledState, this)); + mOKBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnOK, this)); + getChild("cancel_btn")->setClickedCallback(boost::bind(&LLFloater::closeFloater, this, false)); + mAzureVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnAzureVerify, this)); + mGoogleVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnGoogleVerify, this)); + mDeepLVerifyBtn->setClickedCallback(boost::bind(&LLFloaterTranslationSettings::onBtnDeepLVerify, this)); + + mAzureAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1)); + mAzureAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this), NULL); + mAzureAPIRegionEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1)); + mAzureAPIRegionEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onAzureKeyEdited, this), NULL); + + mAzureAPIEndpointEditor->setFocusLostCallback([this](LLFocusableElement*) + { + setAzureVerified(false, false, 0); + }); + mAzureAPIEndpointEditor->setCommitCallback([this](LLUICtrl* ctrl, const LLSD& param) + { + setAzureVerified(false, false, 0); + }); + + mGoogleAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1)); + mGoogleAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onGoogleKeyEdited, this), NULL); + + mDeepLAPIKeyEditor->setFocusReceivedCallback(boost::bind(&LLFloaterTranslationSettings::onEditorFocused, this, _1)); + mDeepLAPIKeyEditor->setKeystrokeCallback(boost::bind(&LLFloaterTranslationSettings::onDeepLKeyEdited, this), NULL); + + mDeepLAPIDomainCombo->setFocusLostCallback([this](LLFocusableElement*) + { + setDeepLVerified(false, false, 0); + }); + mDeepLAPIDomainCombo->setCommitCallback([this](LLUICtrl* ctrl, const LLSD& param) + { + setDeepLVerified(false, false, 0); + }); + + center(); + return true; +} + +// virtual +void LLFloaterTranslationSettings::onOpen(const LLSD& key) +{ + mMachineTranslationCB->setValue(gSavedSettings.getBOOL("TranslateChat")); + mLanguageCombo->setSelectedByValue(gSavedSettings.getString("TranslateLanguage"), true); + mTranslationServiceRadioGroup->setSelectedByValue(gSavedSettings.getString("TranslationService"), true); + + LLSD azure_key = gSavedSettings.getLLSD("AzureTranslateAPIKey"); + if (azure_key.isMap() && !azure_key["id"].asString().empty()) + { + mAzureAPIKeyEditor->setText(azure_key["id"].asString()); + mAzureAPIKeyEditor->setTentative(false); + if (azure_key.has("region") && !azure_key["region"].asString().empty()) + { + mAzureAPIRegionEditor->setText(azure_key["region"].asString()); + mAzureAPIRegionEditor->setTentative(false); + } + else + { + mAzureAPIRegionEditor->setTentative(true); + } + mAzureAPIEndpointEditor->setValue(azure_key["endpoint"]); + verifyKey(LLTranslate::SERVICE_AZURE, azure_key, false); + } + else + { + mAzureAPIKeyEditor->setTentative(true); + mAzureAPIRegionEditor->setTentative(true); + mAzureKeyVerified = false; + } + + std::string google_key = gSavedSettings.getString("GoogleTranslateAPIKey"); + if (!google_key.empty()) + { + mGoogleAPIKeyEditor->setText(google_key); + mGoogleAPIKeyEditor->setTentative(false); + verifyKey(LLTranslate::SERVICE_GOOGLE, google_key, false); + } + else + { + mGoogleAPIKeyEditor->setTentative(true); + mGoogleKeyVerified = false; + } + + LLSD deepl_key = gSavedSettings.getLLSD("DeepLTranslateAPIKey"); + if (deepl_key.isMap() && !deepl_key["id"].asString().empty()) + { + mDeepLAPIKeyEditor->setText(deepl_key["id"].asString()); + mDeepLAPIKeyEditor->setTentative(false); + mDeepLAPIDomainCombo->setValue(deepl_key["domain"]); + verifyKey(LLTranslate::SERVICE_DEEPL, deepl_key, false); + } + else + { + mDeepLAPIKeyEditor->setTentative(true); + mDeepLKeyVerified = false; + } + + updateControlsEnabledState(); +} + +void LLFloaterTranslationSettings::setAzureVerified(bool ok, bool alert, S32 status) +{ + if (alert) + { + showAlert(ok ? "azure_api_key_verified" : "azure_api_key_not_verified", status); + } + + mAzureKeyVerified = ok; + updateControlsEnabledState(); +} + +void LLFloaterTranslationSettings::setGoogleVerified(bool ok, bool alert, S32 status) +{ + if (alert) + { + showAlert(ok ? "google_api_key_verified" : "google_api_key_not_verified", status); + } + + mGoogleKeyVerified = ok; + updateControlsEnabledState(); +} + +void LLFloaterTranslationSettings::setDeepLVerified(bool ok, bool alert, S32 status) +{ + if (alert) + { + showAlert(ok ? "deepl_api_key_verified" : "deepl_api_key_not_verified", status); + } + + mDeepLKeyVerified = ok; + updateControlsEnabledState(); +} + +std::string LLFloaterTranslationSettings::getSelectedService() const +{ + return mTranslationServiceRadioGroup->getSelectedValue().asString(); +} + +LLSD LLFloaterTranslationSettings::getEnteredAzureKey() const +{ + LLSD key; + if (!mAzureAPIKeyEditor->getTentative()) + { + key["endpoint"] = mAzureAPIEndpointEditor->getValue(); + key["id"] = mAzureAPIKeyEditor->getText(); + if (!mAzureAPIRegionEditor->getTentative()) + { + key["region"] = mAzureAPIRegionEditor->getText(); + } + } + return key; +} + +std::string LLFloaterTranslationSettings::getEnteredGoogleKey() const +{ + return mGoogleAPIKeyEditor->getTentative() ? LLStringUtil::null : mGoogleAPIKeyEditor->getText(); +} + +LLSD LLFloaterTranslationSettings::getEnteredDeepLKey() const +{ + LLSD key; + if (!mDeepLAPIKeyEditor->getTentative()) + { + key["domain"] = mDeepLAPIDomainCombo->getValue(); + key["id"] = mDeepLAPIKeyEditor->getText(); + } + return key; +} + +void LLFloaterTranslationSettings::showAlert(const std::string& msg_name, S32 status) const +{ + LLStringUtil::format_map_t string_args; + // For now just show an http error code, whole 'reason' string might be added later + string_args["[STATUS]"] = llformat("%d", status); + std::string message = getString(msg_name, string_args); + + LLSD args; + args["MESSAGE"] = message; + LLNotificationsUtil::add("GenericAlert", args); +} + +void LLFloaterTranslationSettings::updateControlsEnabledState() +{ + // Enable/disable controls based on the checkbox value. + bool on = mMachineTranslationCB->getValue().asBoolean(); + std::string service = getSelectedService(); + bool azure_selected = service == "azure"; + bool google_selected = service == "google"; + bool deepl_selected = service == "deepl"; + + mTranslationServiceRadioGroup->setEnabled(on); + mLanguageCombo->setEnabled(on); + + // MS Azure + getChild("azure_api_endoint_label")->setEnabled(on); + mAzureAPIEndpointEditor->setEnabled(on && azure_selected); + getChild("azure_api_key_label")->setEnabled(on); + mAzureAPIKeyEditor->setEnabled(on && azure_selected); + getChild("azure_api_region_label")->setEnabled(on); + mAzureAPIRegionEditor->setEnabled(on && azure_selected); + + mAzureVerifyBtn->setEnabled(on && azure_selected && + !mAzureKeyVerified && getEnteredAzureKey().isMap()); + + // Google + getChild("google_api_key_label")->setEnabled(on); + mGoogleAPIKeyEditor->setEnabled(on && google_selected); + + mGoogleVerifyBtn->setEnabled(on && google_selected && + !mGoogleKeyVerified && !getEnteredGoogleKey().empty()); + + // DeepL + getChild("deepl_api_domain_label")->setEnabled(on); + mDeepLAPIDomainCombo->setEnabled(on && deepl_selected); + getChild("deepl_api_key_label")->setEnabled(on); + mDeepLAPIKeyEditor->setEnabled(on && deepl_selected); + + mDeepLVerifyBtn->setEnabled(on && deepl_selected && + !mDeepLKeyVerified && getEnteredDeepLKey().isMap()); + + bool service_verified = + (azure_selected && mAzureKeyVerified) + || (google_selected && mGoogleKeyVerified) + || (deepl_selected && mDeepLKeyVerified); + gSavedPerAccountSettings.setBOOL("TranslatingEnabled", service_verified); + + mOKBtn->setEnabled(!on || service_verified); +} + +/*static*/ +void LLFloaterTranslationSettings::setVerificationStatus(int service, bool ok, bool alert, S32 status) +{ + LLFloaterTranslationSettings* floater = + LLFloaterReg::getTypedInstance("prefs_translation"); + + if (!floater) + { + LL_WARNS() << "Cannot find translation settings floater" << LL_ENDL; + return; + } + + switch (service) + { + case LLTranslate::SERVICE_AZURE: + floater->setAzureVerified(ok, alert, status); + break; + case LLTranslate::SERVICE_GOOGLE: + floater->setGoogleVerified(ok, alert, status); + break; + case LLTranslate::SERVICE_DEEPL: + floater->setDeepLVerified(ok, alert, status); + break; + } +} + + +void LLFloaterTranslationSettings::verifyKey(int service, const LLSD& key, bool alert) +{ + LLTranslate::verifyKey(static_cast(service), key, + boost::bind(&LLFloaterTranslationSettings::setVerificationStatus, _1, _2, alert, _3)); +} + +void LLFloaterTranslationSettings::onEditorFocused(LLFocusableElement* control) +{ + LLLineEditor* editor = dynamic_cast(control); + if (editor && editor->hasTabStop()) // if enabled. getEnabled() doesn't work + { + if (editor->getTentative()) + { + editor->setText(LLStringUtil::null); + editor->setTentative(false); + } + } +} + +void LLFloaterTranslationSettings::onAzureKeyEdited() +{ + if (mAzureAPIKeyEditor->isDirty() + || mAzureAPIRegionEditor->isDirty()) + { + // todo: verify mAzureAPIEndpointEditor url + setAzureVerified(false, false, 0); + } +} + +void LLFloaterTranslationSettings::onGoogleKeyEdited() +{ + if (mGoogleAPIKeyEditor->isDirty()) + { + setGoogleVerified(false, false, 0); + } +} + +void LLFloaterTranslationSettings::onDeepLKeyEdited() +{ + if (mDeepLAPIKeyEditor->isDirty()) + { + setDeepLVerified(false, false, 0); + } +} + +void LLFloaterTranslationSettings::onBtnAzureVerify() +{ + LLSD key = getEnteredAzureKey(); + if (key.isMap()) + { + verifyKey(LLTranslate::SERVICE_AZURE, key); + } +} + +void LLFloaterTranslationSettings::onBtnGoogleVerify() +{ + std::string key = getEnteredGoogleKey(); + if (!key.empty()) + { + verifyKey(LLTranslate::SERVICE_GOOGLE, LLSD(key)); + } +} + +void LLFloaterTranslationSettings::onBtnDeepLVerify() +{ + LLSD key = getEnteredDeepLKey(); + if (key.isMap()) + { + verifyKey(LLTranslate::SERVICE_DEEPL, key); + } +} + +void LLFloaterTranslationSettings::onClose(bool app_quitting) +{ + std::string service = gSavedSettings.getString("TranslationService"); + bool azure_selected = service == "azure"; + bool google_selected = service == "google"; + bool deepl_selected = service == "deepl"; + + bool service_verified = + (azure_selected && mAzureKeyVerified) + || (google_selected && mGoogleKeyVerified) + || (deepl_selected && mDeepLKeyVerified); + gSavedPerAccountSettings.setBOOL("TranslatingEnabled", service_verified); +} +void LLFloaterTranslationSettings::onBtnOK() +{ + gSavedSettings.setBOOL("TranslateChat", mMachineTranslationCB->getValue().asBoolean()); + gSavedSettings.setString("TranslateLanguage", mLanguageCombo->getSelectedValue().asString()); + gSavedSettings.setString("TranslationService", getSelectedService()); + gSavedSettings.setLLSD("AzureTranslateAPIKey", getEnteredAzureKey()); + gSavedSettings.setString("GoogleTranslateAPIKey", getEnteredGoogleKey()); + gSavedSettings.setLLSD("DeepLTranslateAPIKey", getEnteredDeepLKey()); + + closeFloater(false); +} -- cgit v1.2.3