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.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloatertranslationsettings.h') diff --git a/indra/newview/llfloatertranslationsettings.h b/indra/newview/llfloatertranslationsettings.h index eff0803fdd..64b21e078d 100644 --- a/indra/newview/llfloatertranslationsettings.h +++ b/indra/newview/llfloatertranslationsettings.h @@ -39,8 +39,8 @@ class LLFloaterTranslationSettings : public LLFloater { public: LLFloaterTranslationSettings(const LLSD& key); - /*virtual*/ BOOL postBuild(); - /*virtual*/ void onOpen(const LLSD& key); + bool postBuild() override; + void onOpen(const LLSD& key) override; void setAzureVerified(bool ok, bool alert, S32 status); void setGoogleVerified(bool ok, bool alert, S32 status); -- cgit v1.2.3 From 0fb52bd372aad468c890fc57f4ae3b8be7dad463 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 21 Feb 2024 03:31:20 +0200 Subject: viewer#848 Xcode buildfix --- indra/newview/llfloatertranslationsettings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloatertranslationsettings.h') diff --git a/indra/newview/llfloatertranslationsettings.h b/indra/newview/llfloatertranslationsettings.h index 64b21e078d..a111d531da 100644 --- a/indra/newview/llfloatertranslationsettings.h +++ b/indra/newview/llfloatertranslationsettings.h @@ -45,7 +45,7 @@ public: void setAzureVerified(bool ok, bool alert, S32 status); void setGoogleVerified(bool ok, bool alert, S32 status); void setDeepLVerified(bool ok, bool alert, S32 status); - void onClose(bool app_quitting); + void onClose(bool app_quitting) override; private: std::string getSelectedService() const; -- 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.h | 178 +++++++++++++-------------- 1 file changed, 89 insertions(+), 89 deletions(-) (limited to 'indra/newview/llfloatertranslationsettings.h') diff --git a/indra/newview/llfloatertranslationsettings.h b/indra/newview/llfloatertranslationsettings.h index 36ac333c53..3995059900 100644 --- a/indra/newview/llfloatertranslationsettings.h +++ b/indra/newview/llfloatertranslationsettings.h @@ -1,89 +1,89 @@ -/** - * @file llfloatertranslationsettings.h - * @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$ - */ - -#ifndef LL_LLFLOATERTRANSLATIONSETTINGS_H -#define LL_LLFLOATERTRANSLATIONSETTINGS_H - -#include "llfloater.h" - -class LLButton; -class LLCheckBoxCtrl; -class LLComboBox; -class LLLineEditor; -class LLRadioGroup; - -class LLFloaterTranslationSettings : public LLFloater -{ -public: - LLFloaterTranslationSettings(const LLSD& key); - bool postBuild() override; - void onOpen(const LLSD& key) override; - - void setAzureVerified(bool ok, bool alert, S32 status); - void setGoogleVerified(bool ok, bool alert, S32 status); - void setDeepLVerified(bool ok, bool alert, S32 status); - void onClose(bool app_quitting) override; - -private: - std::string getSelectedService() const; - LLSD getEnteredAzureKey() const; - std::string getEnteredGoogleKey() const; - LLSD getEnteredDeepLKey() const; - void showAlert(const std::string& msg_name, S32 status) const; - void updateControlsEnabledState(); - void verifyKey(int service, const LLSD& key, bool alert = true); - - void onEditorFocused(LLFocusableElement* control); - void onAzureKeyEdited(); - void onGoogleKeyEdited(); - void onDeepLKeyEdited(); - void onBtnAzureVerify(); - void onBtnGoogleVerify(); - void onBtnDeepLVerify(); - void onBtnOK(); - - static void setVerificationStatus(int service, bool alert, bool ok, S32 status); - - LLCheckBoxCtrl* mMachineTranslationCB; - LLComboBox* mLanguageCombo; - LLComboBox* mAzureAPIEndpointEditor; - LLLineEditor* mAzureAPIKeyEditor; - LLLineEditor* mAzureAPIRegionEditor; - LLLineEditor* mGoogleAPIKeyEditor; - LLComboBox* mDeepLAPIDomainCombo; - LLLineEditor* mDeepLAPIKeyEditor; - LLRadioGroup* mTranslationServiceRadioGroup; - LLButton* mAzureVerifyBtn; - LLButton* mGoogleVerifyBtn; - LLButton* mDeepLVerifyBtn; - LLButton* mOKBtn; - - bool mAzureKeyVerified; - bool mGoogleKeyVerified; - bool mDeepLKeyVerified; -}; - -#endif // LL_LLFLOATERTRANSLATIONSETTINGS_H +/** + * @file llfloatertranslationsettings.h + * @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$ + */ + +#ifndef LL_LLFLOATERTRANSLATIONSETTINGS_H +#define LL_LLFLOATERTRANSLATIONSETTINGS_H + +#include "llfloater.h" + +class LLButton; +class LLCheckBoxCtrl; +class LLComboBox; +class LLLineEditor; +class LLRadioGroup; + +class LLFloaterTranslationSettings : public LLFloater +{ +public: + LLFloaterTranslationSettings(const LLSD& key); + bool postBuild() override; + void onOpen(const LLSD& key) override; + + void setAzureVerified(bool ok, bool alert, S32 status); + void setGoogleVerified(bool ok, bool alert, S32 status); + void setDeepLVerified(bool ok, bool alert, S32 status); + void onClose(bool app_quitting) override; + +private: + std::string getSelectedService() const; + LLSD getEnteredAzureKey() const; + std::string getEnteredGoogleKey() const; + LLSD getEnteredDeepLKey() const; + void showAlert(const std::string& msg_name, S32 status) const; + void updateControlsEnabledState(); + void verifyKey(int service, const LLSD& key, bool alert = true); + + void onEditorFocused(LLFocusableElement* control); + void onAzureKeyEdited(); + void onGoogleKeyEdited(); + void onDeepLKeyEdited(); + void onBtnAzureVerify(); + void onBtnGoogleVerify(); + void onBtnDeepLVerify(); + void onBtnOK(); + + static void setVerificationStatus(int service, bool alert, bool ok, S32 status); + + LLCheckBoxCtrl* mMachineTranslationCB; + LLComboBox* mLanguageCombo; + LLComboBox* mAzureAPIEndpointEditor; + LLLineEditor* mAzureAPIKeyEditor; + LLLineEditor* mAzureAPIRegionEditor; + LLLineEditor* mGoogleAPIKeyEditor; + LLComboBox* mDeepLAPIDomainCombo; + LLLineEditor* mDeepLAPIKeyEditor; + LLRadioGroup* mTranslationServiceRadioGroup; + LLButton* mAzureVerifyBtn; + LLButton* mGoogleVerifyBtn; + LLButton* mDeepLVerifyBtn; + LLButton* mOKBtn; + + bool mAzureKeyVerified; + bool mGoogleKeyVerified; + bool mDeepLKeyVerified; +}; + +#endif // LL_LLFLOATERTRANSLATIONSETTINGS_H -- cgit v1.2.3