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/llpreviewgesture.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llpreviewgesture.h') diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h index f5c47d71b8..a9a0ecc452 100644 --- a/indra/newview/llpreviewgesture.h +++ b/indra/newview/llpreviewgesture.h @@ -52,18 +52,18 @@ public: // LLView /*virtual*/ void draw(); - /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask); - /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, + /*virtual*/ bool handleKeyHere(KEY key, MASK mask); + /*virtual*/ bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept, std::string& tooltip_msg); // LLPanel - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); // LLFloater - /*virtual*/ BOOL canClose(); + /*virtual*/ bool canClose(); /*virtual*/ void onClose(bool app_quitting); /*virtual*/ void onUpdateSucceeded(); /*virtual*/ void refresh(); -- 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/llpreviewgesture.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpreviewgesture.h') diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h index a9a0ecc452..818879335a 100644 --- a/indra/newview/llpreviewgesture.h +++ b/indra/newview/llpreviewgesture.h @@ -163,7 +163,7 @@ private: LLButton* mPreviewBtn; LLMultiGesture* mPreviewGesture; - BOOL mDirty; + bool mDirty; }; #endif // LL_LLPREVIEWGESTURE_H -- 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/llpreviewgesture.h | 340 +++++++++++++++++++-------------------- 1 file changed, 170 insertions(+), 170 deletions(-) (limited to 'indra/newview/llpreviewgesture.h') diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h index c78ca5cd68..75f22df76f 100644 --- a/indra/newview/llpreviewgesture.h +++ b/indra/newview/llpreviewgesture.h @@ -1,170 +1,170 @@ -/** - * @file llpreviewgesture.h - * @brief Editing UI for inventory-based gestures. - * - * $LicenseInfo:firstyear=2004&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 LL_LLPREVIEWGESTURE_H -#define LL_LLPREVIEWGESTURE_H - -#include "llassettype.h" -#include "llpreview.h" -#include "llmultigesture.h" - -class LLLineEditor; -class LLTextBox; -class LLCheckBoxCtrl; -class LLComboBox; -class LLScrollListCtrl; -class LLScrollListItem; -class LLButton; -class LLRadioGroup; - -class LLPreviewGesture : public LLPreview -{ -public: - // Pass an object_id if this gesture is inside an object in the world, - // otherwise use LLUUID::null. - static LLPreviewGesture* show(const LLUUID& item_id, const LLUUID& object_id); - - LLPreviewGesture(const LLSD& key); - virtual ~LLPreviewGesture(); - - // LLView - /*virtual*/ void draw(); - /*virtual*/ bool handleKeyHere(KEY key, MASK mask); - /*virtual*/ bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, - EDragAndDropType cargo_type, - void* cargo_data, - EAcceptance* accept, - std::string& tooltip_msg); - - // LLPanel - /*virtual*/ bool postBuild(); - - // LLFloater - /*virtual*/ bool canClose(); - /*virtual*/ void onClose(bool app_quitting); - /*virtual*/ void onUpdateSucceeded(); - /*virtual*/ void refresh(); - -protected: - // Populate various comboboxes - void addModifiers(); - void addKeys(); - void addAnimations(); - void addSounds(); - - void initDefaultGesture(); - - void loadAsset(); - - static void onLoadComplete(const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status); - - void loadUIFromGesture(LLMultiGesture* gesture); - - void saveIfNeeded(); - - static void onSaveComplete(const LLUUID& asset_uuid, - void* user_data, - S32 status, LLExtStat ext_status); - - bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response); - - // Write UI back into gesture - LLMultiGesture* createGesture(); - - // Add a step. Pass the name of the step, like "Animation", - // "Sound", "Chat", or "Wait" - LLScrollListItem* addStep(const enum EStepType step_type); - - void onVisibilityChanged ( const LLSD& new_visibility ); - - void onCommitKeyorModifier(); - - static std::string getLabel(std::vector labels); - static void updateLabel(LLScrollListItem* item); - - static void onCommitSetDirty(LLUICtrl* ctrl, void* data); - static void onCommitLibrary(LLUICtrl* ctrl, void* data); - static void onCommitStep(LLUICtrl* ctrl, void* data); - static void onCommitAnimation(LLUICtrl* ctrl, void* data); - static void onCommitSound(LLUICtrl* ctrl, void* data); - static void onCommitChat(LLUICtrl* ctrl, void* data); - static void onCommitWait(LLUICtrl* ctrl, void* data); - static void onCommitWaitTime(LLUICtrl* ctrl, void* data); - - static void onCommitAnimationTrigger(LLUICtrl* ctrl, void *data); - - // Handy function to commit each keystroke - static void onKeystrokeCommit(LLLineEditor* caller, void* data); - - static void onClickAdd(void* data); - static void onClickUp(void* data); - static void onClickDown(void* data); - static void onClickDelete(void* data); - - static void onCommitActive(LLUICtrl* ctrl, void* data); - static void onClickSave(void* data); - static void onClickPreview(void* data); - - static void onDonePreview(LLMultiGesture* gesture, void* data); - - static void finishInventoryUpload(LLUUID itemId, LLUUID newAssetId); -private: - // LLPreview contains mDescEditor - LLLineEditor* mTriggerEditor; - LLTextBox* mReplaceText; - LLLineEditor* mReplaceEditor; - LLComboBox* mModifierCombo; - LLComboBox* mKeyCombo; - - LLScrollListCtrl* mLibraryList; - LLButton* mAddBtn; - LLButton* mUpBtn; - LLButton* mDownBtn; - LLButton* mDeleteBtn; - LLScrollListCtrl* mStepList; - - // Options panels for items in gesture list - LLTextBox* mOptionsText; - LLRadioGroup* mAnimationRadio; - LLComboBox* mAnimationCombo; - LLComboBox* mSoundCombo; - LLLineEditor* mChatEditor; - LLCheckBoxCtrl* mWaitKeyReleaseCheck; - LLCheckBoxCtrl* mWaitAnimCheck; - LLCheckBoxCtrl* mWaitTimeCheck; - LLLineEditor* mWaitTimeEditor; - - LLCheckBoxCtrl* mActiveCheck; - LLButton* mSaveBtn; - LLButton* mPreviewBtn; - - LLMultiGesture* mPreviewGesture; - bool mDirty; -}; - -#endif // LL_LLPREVIEWGESTURE_H +/** + * @file llpreviewgesture.h + * @brief Editing UI for inventory-based gestures. + * + * $LicenseInfo:firstyear=2004&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 LL_LLPREVIEWGESTURE_H +#define LL_LLPREVIEWGESTURE_H + +#include "llassettype.h" +#include "llpreview.h" +#include "llmultigesture.h" + +class LLLineEditor; +class LLTextBox; +class LLCheckBoxCtrl; +class LLComboBox; +class LLScrollListCtrl; +class LLScrollListItem; +class LLButton; +class LLRadioGroup; + +class LLPreviewGesture : public LLPreview +{ +public: + // Pass an object_id if this gesture is inside an object in the world, + // otherwise use LLUUID::null. + static LLPreviewGesture* show(const LLUUID& item_id, const LLUUID& object_id); + + LLPreviewGesture(const LLSD& key); + virtual ~LLPreviewGesture(); + + // LLView + /*virtual*/ void draw(); + /*virtual*/ bool handleKeyHere(KEY key, MASK mask); + /*virtual*/ bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, + EDragAndDropType cargo_type, + void* cargo_data, + EAcceptance* accept, + std::string& tooltip_msg); + + // LLPanel + /*virtual*/ bool postBuild(); + + // LLFloater + /*virtual*/ bool canClose(); + /*virtual*/ void onClose(bool app_quitting); + /*virtual*/ void onUpdateSucceeded(); + /*virtual*/ void refresh(); + +protected: + // Populate various comboboxes + void addModifiers(); + void addKeys(); + void addAnimations(); + void addSounds(); + + void initDefaultGesture(); + + void loadAsset(); + + static void onLoadComplete(const LLUUID& asset_uuid, + LLAssetType::EType type, + void* user_data, S32 status, LLExtStat ext_status); + + void loadUIFromGesture(LLMultiGesture* gesture); + + void saveIfNeeded(); + + static void onSaveComplete(const LLUUID& asset_uuid, + void* user_data, + S32 status, LLExtStat ext_status); + + bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response); + + // Write UI back into gesture + LLMultiGesture* createGesture(); + + // Add a step. Pass the name of the step, like "Animation", + // "Sound", "Chat", or "Wait" + LLScrollListItem* addStep(const enum EStepType step_type); + + void onVisibilityChanged ( const LLSD& new_visibility ); + + void onCommitKeyorModifier(); + + static std::string getLabel(std::vector labels); + static void updateLabel(LLScrollListItem* item); + + static void onCommitSetDirty(LLUICtrl* ctrl, void* data); + static void onCommitLibrary(LLUICtrl* ctrl, void* data); + static void onCommitStep(LLUICtrl* ctrl, void* data); + static void onCommitAnimation(LLUICtrl* ctrl, void* data); + static void onCommitSound(LLUICtrl* ctrl, void* data); + static void onCommitChat(LLUICtrl* ctrl, void* data); + static void onCommitWait(LLUICtrl* ctrl, void* data); + static void onCommitWaitTime(LLUICtrl* ctrl, void* data); + + static void onCommitAnimationTrigger(LLUICtrl* ctrl, void *data); + + // Handy function to commit each keystroke + static void onKeystrokeCommit(LLLineEditor* caller, void* data); + + static void onClickAdd(void* data); + static void onClickUp(void* data); + static void onClickDown(void* data); + static void onClickDelete(void* data); + + static void onCommitActive(LLUICtrl* ctrl, void* data); + static void onClickSave(void* data); + static void onClickPreview(void* data); + + static void onDonePreview(LLMultiGesture* gesture, void* data); + + static void finishInventoryUpload(LLUUID itemId, LLUUID newAssetId); +private: + // LLPreview contains mDescEditor + LLLineEditor* mTriggerEditor; + LLTextBox* mReplaceText; + LLLineEditor* mReplaceEditor; + LLComboBox* mModifierCombo; + LLComboBox* mKeyCombo; + + LLScrollListCtrl* mLibraryList; + LLButton* mAddBtn; + LLButton* mUpBtn; + LLButton* mDownBtn; + LLButton* mDeleteBtn; + LLScrollListCtrl* mStepList; + + // Options panels for items in gesture list + LLTextBox* mOptionsText; + LLRadioGroup* mAnimationRadio; + LLComboBox* mAnimationCombo; + LLComboBox* mSoundCombo; + LLLineEditor* mChatEditor; + LLCheckBoxCtrl* mWaitKeyReleaseCheck; + LLCheckBoxCtrl* mWaitAnimCheck; + LLCheckBoxCtrl* mWaitTimeCheck; + LLLineEditor* mWaitTimeEditor; + + LLCheckBoxCtrl* mActiveCheck; + LLButton* mSaveBtn; + LLButton* mPreviewBtn; + + LLMultiGesture* mPreviewGesture; + bool mDirty; +}; + +#endif // LL_LLPREVIEWGESTURE_H -- cgit v1.2.3