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/lltoastnotifypanel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lltoastnotifypanel.h') diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h index a5a637c6fa..a3bd327681 100644 --- a/indra/newview/lltoastnotifypanel.h +++ b/indra/newview/lltoastnotifypanel.h @@ -154,7 +154,7 @@ public: ~LLIMToastNotifyPanel(); - /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); + /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true); protected: LLTextBase* mParentText; -- 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/lltoastnotifypanel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lltoastnotifypanel.h') diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h index a3bd327681..3593022a7d 100644 --- a/indra/newview/lltoastnotifypanel.h +++ b/indra/newview/lltoastnotifypanel.h @@ -72,7 +72,7 @@ public: bool isControlPanelEnabled() const; protected: - LLButton* createButton(const LLSD& form_element, BOOL is_option); + LLButton* createButton(const LLSD& form_element, bool is_option); // Used for callbacks struct InstanceAndS32 -- 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/lltoastnotifypanel.h | 336 ++++++++++++++++++------------------- 1 file changed, 168 insertions(+), 168 deletions(-) (limited to 'indra/newview/lltoastnotifypanel.h') diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h index b2dfc591fe..d694513aba 100644 --- a/indra/newview/lltoastnotifypanel.h +++ b/indra/newview/lltoastnotifypanel.h @@ -1,168 +1,168 @@ -/** - * @file lltoastnotifypanel.h - * @brief Panel for 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$ - */ - -#ifndef LLTOASTNOTIFYPANEL_H_ -#define LLTOASTNOTIFYPANEL_H_ - -#include "llpanel.h" -#include "llfontgl.h" -#include "llnotificationptr.h" -#include "llbutton.h" -#include "lltoastpanel.h" -#include "lliconctrl.h" -#include "lltexteditor.h" -#include "lltextbox.h" - -class LLNotificationForm; - -/** - * Toast panel for notification. - * Notification panel should be used for notifications that require a response from the user. - * - * Replaces class LLNotifyBox. - * - * @deprecated this class will be removed after all toast panel types are - * implemented in separate classes. - */ -class LLToastNotifyPanel: public LLCheckBoxToastPanel, public LLInstanceTracker -{ -public: - /** - * Constructor for LLToastNotifyPanel. - * - * @param pNotification a shared pointer to LLNotification - * @param rect an initial rectangle of the toast panel. - * If it is null then a loaded from xml rectangle will be used. - * @see LLNotification - * @deprecated if you intend to instantiate LLToastNotifyPanel - it's point to - * implement right class for desired toast panel. @see LLGenericTipPanel as example. - */ - LLToastNotifyPanel(const LLNotificationPtr& pNotification, const LLRect& rect = LLRect::null, bool show_images = true); - - virtual void init( LLRect rect, bool show_images ); - virtual void deleteAllChildren(); - - virtual ~LLToastNotifyPanel(); - LLPanel * getControlPanel() { return mControlPanel; } - - virtual void updateNotification() {} - - bool isControlPanelEnabled() const; - -protected: - LLButton* createButton(const LLSD& form_element, bool is_option); - - // Used for callbacks - struct InstanceAndS32 - { - LLToastNotifyPanel* mSelf; - std::string mButtonName; - }; - std::vector mBtnCallbackData; - - typedef std::pair index_button_pair_t; - void adjustPanelForScriptNotice(S32 max_width, S32 max_height); - void adjustPanelForTipNotice(); - void addDefaultButton(); - /* - * It lays out buttons of the notification in mControlPanel. - * Buttons will be placed from BOTTOM to TOP. - * @param h_pad horizontal space between buttons. It is depend on number of buttons. - * @param buttons vector of button to be added. - */ - void updateButtonsLayout(const std::vector& buttons, S32 h_pad); - - /** - * Disable specific button(s) based on notification name and clicked button - */ - //void disableButtons(const std::string& notification_name, const std::string& selected_button); - - //std::vector mButtons; - - // panel elements - LLTextBase* mTextBox { nullptr }; - LLPanel* mInfoPanel { nullptr }; // panel for text information - LLPanel* mControlPanel { nullptr }; // panel for buttons (if present) - - // internal handler for button being clicked - static void onClickButton(void* data); - - typedef boost::signals2::signal - button_click_signal_t; - static button_click_signal_t sButtonClickSignal; - boost::signals2::connection mButtonClickConnection; - - /** - * handle sButtonClickSignal (to disable buttons) across all panels with given notification_id - */ - void onToastPanelButtonClicked(const LLUUID& notification_id, const std::string btn_name); - - /** - * Process response data. Will disable selected options - */ - //void disableRespondedOptions(const LLNotificationPtr& notification); - - bool mIsTip { false }; - bool mAddedDefaultBtn { false }; - bool mIsScriptDialog { false }; - bool mIsCaution { false }; - - std::string mMessage; - S32 mNumOptions { 0 }; - S32 mNumButtons { 0 }; - - static const std::string sFontDefault; - static const std::string sFontScript; -}; - -class LLIMToastNotifyPanel : public LLToastNotifyPanel -{ -public: - - LLIMToastNotifyPanel(LLNotificationPtr& pNotification, - const LLUUID& session_id, - const LLRect& rect = LLRect::null, - bool show_images = true, - LLTextBase* parent_text = NULL); - - void compactButtons(); - - virtual void updateNotification(); - virtual void init( LLRect rect, bool show_images ); - - ~LLIMToastNotifyPanel(); - - /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true); - -protected: - LLTextBase* mParentText; - LLUUID mSessionID; - -private: - void snapToMessageHeight(); -}; - -#endif /* LLTOASTNOTIFYPANEL_H_ */ +/** + * @file lltoastnotifypanel.h + * @brief Panel for 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$ + */ + +#ifndef LLTOASTNOTIFYPANEL_H_ +#define LLTOASTNOTIFYPANEL_H_ + +#include "llpanel.h" +#include "llfontgl.h" +#include "llnotificationptr.h" +#include "llbutton.h" +#include "lltoastpanel.h" +#include "lliconctrl.h" +#include "lltexteditor.h" +#include "lltextbox.h" + +class LLNotificationForm; + +/** + * Toast panel for notification. + * Notification panel should be used for notifications that require a response from the user. + * + * Replaces class LLNotifyBox. + * + * @deprecated this class will be removed after all toast panel types are + * implemented in separate classes. + */ +class LLToastNotifyPanel: public LLCheckBoxToastPanel, public LLInstanceTracker +{ +public: + /** + * Constructor for LLToastNotifyPanel. + * + * @param pNotification a shared pointer to LLNotification + * @param rect an initial rectangle of the toast panel. + * If it is null then a loaded from xml rectangle will be used. + * @see LLNotification + * @deprecated if you intend to instantiate LLToastNotifyPanel - it's point to + * implement right class for desired toast panel. @see LLGenericTipPanel as example. + */ + LLToastNotifyPanel(const LLNotificationPtr& pNotification, const LLRect& rect = LLRect::null, bool show_images = true); + + virtual void init( LLRect rect, bool show_images ); + virtual void deleteAllChildren(); + + virtual ~LLToastNotifyPanel(); + LLPanel * getControlPanel() { return mControlPanel; } + + virtual void updateNotification() {} + + bool isControlPanelEnabled() const; + +protected: + LLButton* createButton(const LLSD& form_element, bool is_option); + + // Used for callbacks + struct InstanceAndS32 + { + LLToastNotifyPanel* mSelf; + std::string mButtonName; + }; + std::vector mBtnCallbackData; + + typedef std::pair index_button_pair_t; + void adjustPanelForScriptNotice(S32 max_width, S32 max_height); + void adjustPanelForTipNotice(); + void addDefaultButton(); + /* + * It lays out buttons of the notification in mControlPanel. + * Buttons will be placed from BOTTOM to TOP. + * @param h_pad horizontal space between buttons. It is depend on number of buttons. + * @param buttons vector of button to be added. + */ + void updateButtonsLayout(const std::vector& buttons, S32 h_pad); + + /** + * Disable specific button(s) based on notification name and clicked button + */ + //void disableButtons(const std::string& notification_name, const std::string& selected_button); + + //std::vector mButtons; + + // panel elements + LLTextBase* mTextBox { nullptr }; + LLPanel* mInfoPanel { nullptr }; // panel for text information + LLPanel* mControlPanel { nullptr }; // panel for buttons (if present) + + // internal handler for button being clicked + static void onClickButton(void* data); + + typedef boost::signals2::signal + button_click_signal_t; + static button_click_signal_t sButtonClickSignal; + boost::signals2::connection mButtonClickConnection; + + /** + * handle sButtonClickSignal (to disable buttons) across all panels with given notification_id + */ + void onToastPanelButtonClicked(const LLUUID& notification_id, const std::string btn_name); + + /** + * Process response data. Will disable selected options + */ + //void disableRespondedOptions(const LLNotificationPtr& notification); + + bool mIsTip { false }; + bool mAddedDefaultBtn { false }; + bool mIsScriptDialog { false }; + bool mIsCaution { false }; + + std::string mMessage; + S32 mNumOptions { 0 }; + S32 mNumButtons { 0 }; + + static const std::string sFontDefault; + static const std::string sFontScript; +}; + +class LLIMToastNotifyPanel : public LLToastNotifyPanel +{ +public: + + LLIMToastNotifyPanel(LLNotificationPtr& pNotification, + const LLUUID& session_id, + const LLRect& rect = LLRect::null, + bool show_images = true, + LLTextBase* parent_text = NULL); + + void compactButtons(); + + virtual void updateNotification(); + virtual void init( LLRect rect, bool show_images ); + + ~LLIMToastNotifyPanel(); + + /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true); + +protected: + LLTextBase* mParentText; + LLUUID mSessionID; + +private: + void snapToMessageHeight(); +}; + +#endif /* LLTOASTNOTIFYPANEL_H_ */ -- cgit v1.2.3