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/lltoastgroupnotifypanel.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview/lltoastgroupnotifypanel.cpp') diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp index 817d1dd7b4..047aa5192c 100644 --- a/indra/newview/lltoastgroupnotifypanel.cpp +++ b/indra/newview/lltoastgroupnotifypanel.cpp @@ -64,7 +64,7 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notifi } //group icon - LLGroupIconCtrl* pGroupIcon = getChild("group_icon", TRUE); + LLGroupIconCtrl* pGroupIcon = getChild("group_icon", true); // We should already have this data preloaded, so no sense in setting icon through setValue(group_id) pGroupIcon->setIconId(groupData.mInsigniaID); @@ -106,23 +106,23 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notifi LLFontGL* subject_font = LLFontGL::getFontByName(getString("subject_font")); if (subject_font) style.font = subject_font; - pMessageText->appendText(subject, FALSE, style); + pMessageText->appendText(subject, false, style); LLFontGL* date_font = LLFontGL::getFontByName(getString("date_font")); if (date_font) style.font = date_font; - pMessageText->appendText(timeStr + "\n", TRUE, style); + pMessageText->appendText(timeStr + "\n", true, style); style.font = pMessageText->getFont(); - pMessageText->appendText(message, TRUE, style); + pMessageText->appendText(message, true, style); //attachment - BOOL hasInventory = payload["inventory_offer"].isDefined(); + bool hasInventory = payload["inventory_offer"].isDefined(); //attachment text LLTextBox * pAttachLink = getChild("attachment"); //attachment icon - LLIconCtrl* pAttachIcon = getChild("attachment_icon", TRUE); + LLIconCtrl* pAttachIcon = getChild("attachment_icon", true); //If attachment is empty let it be invisible and not take place at the panel pAttachLink->setVisible(hasInventory); @@ -190,8 +190,8 @@ void LLToastGroupNotifyPanel::onClickAttachment() pAttachLink->setColor(textColor); LLIconCtrl* pAttachIcon = - getChild ("attachment_icon", TRUE); - pAttachIcon->setEnabled(FALSE); + getChild ("attachment_icon", true); + pAttachIcon->setEnabled(false); //if attachment isn't openable - notify about saving if (!isAttachmentOpenable(mInventoryOffer->mType)) { -- 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/lltoastgroupnotifypanel.cpp | 442 +++++++++++++++--------------- 1 file changed, 221 insertions(+), 221 deletions(-) (limited to 'indra/newview/lltoastgroupnotifypanel.cpp') diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp index b6e912bd84..3c3440d41a 100644 --- a/indra/newview/lltoastgroupnotifypanel.cpp +++ b/indra/newview/lltoastgroupnotifypanel.cpp @@ -1,221 +1,221 @@ -/** - * @file lltoastgroupnotifypanel.cpp - * @brief Panel for group notify toasts. - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, 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 "lltoastgroupnotifypanel.h" - -#include "llfocusmgr.h" - -#include "llbutton.h" -#include "llgroupiconctrl.h" -#include "llinventoryfunctions.h" -#include "llinventoryicon.h" -#include "llnotifications.h" -#include "llviewertexteditor.h" - -#include "llavatarnamecache.h" -#include "lluiconstants.h" -#include "llui.h" -#include "llviewercontrol.h" -#include "lltrans.h" -#include "llstyle.h" - -#include "llglheaders.h" -#include "llagent.h" -#include "llavatariconctrl.h" -#include "llinventorytype.h" - -const S32 LLToastGroupNotifyPanel::DEFAULT_MESSAGE_MAX_LINE_COUNT = 7; - -LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notification) -: LLToastPanel(notification), - mInventoryOffer(NULL) -{ - buildFromFile( "panel_group_notify.xml"); - const LLSD& payload = notification->getPayload(); - LLGroupData groupData; - if (!gAgent.getGroupData(payload["group_id"].asUUID(),groupData)) - { - LL_WARNS() << "Group notice for unknown group: " << payload["group_id"].asUUID() << LL_ENDL; - } - - //group icon - LLGroupIconCtrl* pGroupIcon = getChild("group_icon", true); - - // We should already have this data preloaded, so no sense in setting icon through setValue(group_id) - pGroupIcon->setIconId(groupData.mInsigniaID); - - //header title - std::string from_name = payload["sender_name"].asString(); - from_name = LLCacheName::buildUsername(from_name); - - std::stringstream from; - from << from_name << "/" << groupData.mName; - LLTextBox* pTitleText = getChild("title"); - pTitleText->setValue(from.str()); - pTitleText->setToolTip(from.str()); - - //message subject - const std::string& subject = payload["subject"].asString(); - //message body - const std::string& message = payload["message"].asString(); - - std::string timeStr = "[" + LLTrans::getString("TimeWeek") + "], [" - + LLTrans::getString("TimeMonth") + "]/[" - + LLTrans::getString("TimeDay") + "]/[" - + LLTrans::getString("TimeYear") + "] [" - + LLTrans::getString("TimeHour") + "]:[" - + LLTrans::getString("TimeMin") + "] [" - + LLTrans::getString("TimeTimezone") + "]"; - - const LLDate timeStamp = notification->getDate(); - LLDate notice_date = timeStamp.notNull() ? timeStamp : payload["received_time"].asDate(); - LLSD substitution; - substitution["datetime"] = (S32) notice_date.secondsSinceEpoch(); - LLStringUtil::format(timeStr, substitution); - - LLViewerTextEditor* pMessageText = getChild("message"); - pMessageText->setContentTrusted(false); - pMessageText->clear(); - - LLStyle::Params style; - LLFontGL* subject_font = LLFontGL::getFontByName(getString("subject_font")); - if (subject_font) - style.font = subject_font; - pMessageText->appendText(subject, false, style); - - LLFontGL* date_font = LLFontGL::getFontByName(getString("date_font")); - if (date_font) - style.font = date_font; - pMessageText->appendText(timeStr + "\n", true, style); - - style.font = pMessageText->getFont(); - pMessageText->appendText(message, true, style); - - //attachment - bool hasInventory = payload["inventory_offer"].isDefined(); - - //attachment text - LLTextBox * pAttachLink = getChild("attachment"); - //attachment icon - LLIconCtrl* pAttachIcon = getChild("attachment_icon", true); - - //If attachment is empty let it be invisible and not take place at the panel - pAttachLink->setVisible(hasInventory); - pAttachIcon->setVisible(hasInventory); - if (hasInventory) { - pAttachLink->setValue(payload["inventory_name"]); - - mInventoryOffer = new LLOfferInfo(payload["inventory_offer"]); - getChild("attachment")->setClickedCallback(boost::bind( - &LLToastGroupNotifyPanel::onClickAttachment, this)); - - LLUIImagePtr attachIconImg = LLInventoryIcon::getIcon(mInventoryOffer->mType, - LLInventoryType::IT_TEXTURE); - pAttachIcon->setValue(attachIconImg->getName()); - } - - //ok button - LLButton* pOkBtn = getChild("btn_ok"); - pOkBtn->setClickedCallback((boost::bind(&LLToastGroupNotifyPanel::onClickOk, this))); - setDefaultBtn(pOkBtn); - - S32 maxLinesCount; - std::istringstream ss( getString("message_max_lines_count") ); - if (!(ss >> maxLinesCount)) - { - maxLinesCount = DEFAULT_MESSAGE_MAX_LINE_COUNT; - } - snapToMessageHeight(pMessageText, maxLinesCount); -} - -// virtual -LLToastGroupNotifyPanel::~LLToastGroupNotifyPanel() -{ -} - -void LLToastGroupNotifyPanel::close() -{ - // The group notice dialog may be an inventory offer. - // If it has an inventory save button and that button is still enabled - // Then we need to send the inventory declined message - if(mInventoryOffer != NULL) - { - mInventoryOffer->forceResponse(IOR_DECLINE); - mInventoryOffer = NULL; - } - - die(); -} - -void LLToastGroupNotifyPanel::onClickOk() -{ - LLSD response = mNotification->getResponseTemplate(); - mNotification->respond(response); - close(); -} - -void LLToastGroupNotifyPanel::onClickAttachment() -{ - if (mInventoryOffer != NULL) { - mInventoryOffer->forceResponse(IOR_ACCEPT); - - LLTextBox * pAttachLink = getChild ("attachment"); - static const LLUIColor textColor = LLUIColorTable::instance().getColor( - "GroupNotifyDimmedTextColor"); - pAttachLink->setColor(textColor); - - LLIconCtrl* pAttachIcon = - getChild ("attachment_icon", true); - pAttachIcon->setEnabled(false); - - //if attachment isn't openable - notify about saving - if (!isAttachmentOpenable(mInventoryOffer->mType)) { - LLNotifications::instance().add("AttachmentSaved", LLSD(), LLSD()); - } - - mInventoryOffer = NULL; - } -} - -//static -bool LLToastGroupNotifyPanel::isAttachmentOpenable(LLAssetType::EType type) -{ - switch(type) - { - case LLAssetType::AT_LANDMARK: - case LLAssetType::AT_NOTECARD: - case LLAssetType::AT_IMAGE_JPEG: - case LLAssetType::AT_IMAGE_TGA: - case LLAssetType::AT_TEXTURE: - case LLAssetType::AT_TEXTURE_TGA: - return true; - default: - return false; - } -} - +/** + * @file lltoastgroupnotifypanel.cpp + * @brief Panel for group notify toasts. + * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, 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 "lltoastgroupnotifypanel.h" + +#include "llfocusmgr.h" + +#include "llbutton.h" +#include "llgroupiconctrl.h" +#include "llinventoryfunctions.h" +#include "llinventoryicon.h" +#include "llnotifications.h" +#include "llviewertexteditor.h" + +#include "llavatarnamecache.h" +#include "lluiconstants.h" +#include "llui.h" +#include "llviewercontrol.h" +#include "lltrans.h" +#include "llstyle.h" + +#include "llglheaders.h" +#include "llagent.h" +#include "llavatariconctrl.h" +#include "llinventorytype.h" + +const S32 LLToastGroupNotifyPanel::DEFAULT_MESSAGE_MAX_LINE_COUNT = 7; + +LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notification) +: LLToastPanel(notification), + mInventoryOffer(NULL) +{ + buildFromFile( "panel_group_notify.xml"); + const LLSD& payload = notification->getPayload(); + LLGroupData groupData; + if (!gAgent.getGroupData(payload["group_id"].asUUID(),groupData)) + { + LL_WARNS() << "Group notice for unknown group: " << payload["group_id"].asUUID() << LL_ENDL; + } + + //group icon + LLGroupIconCtrl* pGroupIcon = getChild("group_icon", true); + + // We should already have this data preloaded, so no sense in setting icon through setValue(group_id) + pGroupIcon->setIconId(groupData.mInsigniaID); + + //header title + std::string from_name = payload["sender_name"].asString(); + from_name = LLCacheName::buildUsername(from_name); + + std::stringstream from; + from << from_name << "/" << groupData.mName; + LLTextBox* pTitleText = getChild("title"); + pTitleText->setValue(from.str()); + pTitleText->setToolTip(from.str()); + + //message subject + const std::string& subject = payload["subject"].asString(); + //message body + const std::string& message = payload["message"].asString(); + + std::string timeStr = "[" + LLTrans::getString("TimeWeek") + "], [" + + LLTrans::getString("TimeMonth") + "]/[" + + LLTrans::getString("TimeDay") + "]/[" + + LLTrans::getString("TimeYear") + "] [" + + LLTrans::getString("TimeHour") + "]:[" + + LLTrans::getString("TimeMin") + "] [" + + LLTrans::getString("TimeTimezone") + "]"; + + const LLDate timeStamp = notification->getDate(); + LLDate notice_date = timeStamp.notNull() ? timeStamp : payload["received_time"].asDate(); + LLSD substitution; + substitution["datetime"] = (S32) notice_date.secondsSinceEpoch(); + LLStringUtil::format(timeStr, substitution); + + LLViewerTextEditor* pMessageText = getChild("message"); + pMessageText->setContentTrusted(false); + pMessageText->clear(); + + LLStyle::Params style; + LLFontGL* subject_font = LLFontGL::getFontByName(getString("subject_font")); + if (subject_font) + style.font = subject_font; + pMessageText->appendText(subject, false, style); + + LLFontGL* date_font = LLFontGL::getFontByName(getString("date_font")); + if (date_font) + style.font = date_font; + pMessageText->appendText(timeStr + "\n", true, style); + + style.font = pMessageText->getFont(); + pMessageText->appendText(message, true, style); + + //attachment + bool hasInventory = payload["inventory_offer"].isDefined(); + + //attachment text + LLTextBox * pAttachLink = getChild("attachment"); + //attachment icon + LLIconCtrl* pAttachIcon = getChild("attachment_icon", true); + + //If attachment is empty let it be invisible and not take place at the panel + pAttachLink->setVisible(hasInventory); + pAttachIcon->setVisible(hasInventory); + if (hasInventory) { + pAttachLink->setValue(payload["inventory_name"]); + + mInventoryOffer = new LLOfferInfo(payload["inventory_offer"]); + getChild("attachment")->setClickedCallback(boost::bind( + &LLToastGroupNotifyPanel::onClickAttachment, this)); + + LLUIImagePtr attachIconImg = LLInventoryIcon::getIcon(mInventoryOffer->mType, + LLInventoryType::IT_TEXTURE); + pAttachIcon->setValue(attachIconImg->getName()); + } + + //ok button + LLButton* pOkBtn = getChild("btn_ok"); + pOkBtn->setClickedCallback((boost::bind(&LLToastGroupNotifyPanel::onClickOk, this))); + setDefaultBtn(pOkBtn); + + S32 maxLinesCount; + std::istringstream ss( getString("message_max_lines_count") ); + if (!(ss >> maxLinesCount)) + { + maxLinesCount = DEFAULT_MESSAGE_MAX_LINE_COUNT; + } + snapToMessageHeight(pMessageText, maxLinesCount); +} + +// virtual +LLToastGroupNotifyPanel::~LLToastGroupNotifyPanel() +{ +} + +void LLToastGroupNotifyPanel::close() +{ + // The group notice dialog may be an inventory offer. + // If it has an inventory save button and that button is still enabled + // Then we need to send the inventory declined message + if(mInventoryOffer != NULL) + { + mInventoryOffer->forceResponse(IOR_DECLINE); + mInventoryOffer = NULL; + } + + die(); +} + +void LLToastGroupNotifyPanel::onClickOk() +{ + LLSD response = mNotification->getResponseTemplate(); + mNotification->respond(response); + close(); +} + +void LLToastGroupNotifyPanel::onClickAttachment() +{ + if (mInventoryOffer != NULL) { + mInventoryOffer->forceResponse(IOR_ACCEPT); + + LLTextBox * pAttachLink = getChild ("attachment"); + static const LLUIColor textColor = LLUIColorTable::instance().getColor( + "GroupNotifyDimmedTextColor"); + pAttachLink->setColor(textColor); + + LLIconCtrl* pAttachIcon = + getChild ("attachment_icon", true); + pAttachIcon->setEnabled(false); + + //if attachment isn't openable - notify about saving + if (!isAttachmentOpenable(mInventoryOffer->mType)) { + LLNotifications::instance().add("AttachmentSaved", LLSD(), LLSD()); + } + + mInventoryOffer = NULL; + } +} + +//static +bool LLToastGroupNotifyPanel::isAttachmentOpenable(LLAssetType::EType type) +{ + switch(type) + { + case LLAssetType::AT_LANDMARK: + case LLAssetType::AT_NOTECARD: + case LLAssetType::AT_IMAGE_JPEG: + case LLAssetType::AT_IMAGE_TGA: + case LLAssetType::AT_TEXTURE: + case LLAssetType::AT_TEXTURE_TGA: + return true; + default: + return false; + } +} + -- cgit v1.2.3