summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertoybox.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloatertoybox.cpp')
-rw-r--r--indra/newview/llfloatertoybox.cpp190
1 files changed, 95 insertions, 95 deletions
diff --git a/indra/newview/llfloatertoybox.cpp b/indra/newview/llfloatertoybox.cpp
index a025a859e7..635d1e2bc4 100644
--- a/indra/newview/llfloatertoybox.cpp
+++ b/indra/newview/llfloatertoybox.cpp
@@ -1,25 +1,25 @@
-/**
+/**
* @file llfloatertoybox.cpp
* @brief The toybox for flexibilizing the UI.
*
* $LicenseInfo:firstyear=2002&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$
*/
@@ -38,11 +38,11 @@
#include "lltrans.h"
LLFloaterToybox::LLFloaterToybox(const LLSD& key)
- : LLFloater(key)
- , mToolBar(NULL)
+ : LLFloater(key)
+ , mToolBar(NULL)
{
- mCommitCallbackRegistrar.add("Toybox.RestoreDefaults", boost::bind(&LLFloaterToybox::onBtnRestoreDefaults, this));
- mCommitCallbackRegistrar.add("Toybox.ClearAll", boost::bind(&LLFloaterToybox::onBtnClearAll, this));
+ mCommitCallbackRegistrar.add("Toybox.RestoreDefaults", boost::bind(&LLFloaterToybox::onBtnRestoreDefaults, this));
+ mCommitCallbackRegistrar.add("Toybox.ClearAll", boost::bind(&LLFloaterToybox::onBtnClearAll, this));
}
LLFloaterToybox::~LLFloaterToybox()
@@ -51,91 +51,91 @@ LLFloaterToybox::~LLFloaterToybox()
bool compare_localized_command_labels(LLCommand * cmd1, LLCommand * cmd2)
{
- std::string lab1 = LLTrans::getString(cmd1->labelRef());
- std::string lab2 = LLTrans::getString(cmd2->labelRef());
+ std::string lab1 = LLTrans::getString(cmd1->labelRef());
+ std::string lab2 = LLTrans::getString(cmd2->labelRef());
- return (lab1 < lab2);
+ return (lab1 < lab2);
}
BOOL LLFloaterToybox::postBuild()
-{
- mToolBar = getChild<LLToolBar>("toybox_toolbar");
-
- mToolBar->setStartDragCallback(boost::bind(LLToolBarView::startDragTool,_1,_2,_3));
- mToolBar->setHandleDragCallback(boost::bind(LLToolBarView::handleDragTool,_1,_2,_3,_4));
- mToolBar->setHandleDropCallback(boost::bind(LLToolBarView::handleDropTool,_1,_2,_3,_4));
- mToolBar->setButtonEnterCallback(boost::bind(&LLFloaterToybox::onToolBarButtonEnter,this,_1));
-
- //
- // Sort commands by localized labels so they will appear alphabetized in all languages
- //
-
- std::list<LLCommand *> alphabetized_commands;
-
- LLCommandManager& cmdMgr = LLCommandManager::instance();
- for (U32 i = 0; i < cmdMgr.commandCount(); i++)
- {
- LLCommand * command = cmdMgr.getCommand(i);
-
- if (command->availableInToybox())
- {
- alphabetized_commands.push_back(command);
- }
- }
-
- alphabetized_commands.sort(compare_localized_command_labels);
-
- //
- // Create Buttons
- //
-
- for (std::list<LLCommand *>::iterator it = alphabetized_commands.begin(); it != alphabetized_commands.end(); ++it)
- {
- mToolBar->addCommand((*it)->id());
- }
-
- return TRUE;
+{
+ mToolBar = getChild<LLToolBar>("toybox_toolbar");
+
+ mToolBar->setStartDragCallback(boost::bind(LLToolBarView::startDragTool,_1,_2,_3));
+ mToolBar->setHandleDragCallback(boost::bind(LLToolBarView::handleDragTool,_1,_2,_3,_4));
+ mToolBar->setHandleDropCallback(boost::bind(LLToolBarView::handleDropTool,_1,_2,_3,_4));
+ mToolBar->setButtonEnterCallback(boost::bind(&LLFloaterToybox::onToolBarButtonEnter,this,_1));
+
+ //
+ // Sort commands by localized labels so they will appear alphabetized in all languages
+ //
+
+ std::list<LLCommand *> alphabetized_commands;
+
+ LLCommandManager& cmdMgr = LLCommandManager::instance();
+ for (U32 i = 0; i < cmdMgr.commandCount(); i++)
+ {
+ LLCommand * command = cmdMgr.getCommand(i);
+
+ if (command->availableInToybox())
+ {
+ alphabetized_commands.push_back(command);
+ }
+ }
+
+ alphabetized_commands.sort(compare_localized_command_labels);
+
+ //
+ // Create Buttons
+ //
+
+ for (std::list<LLCommand *>::iterator it = alphabetized_commands.begin(); it != alphabetized_commands.end(); ++it)
+ {
+ mToolBar->addCommand((*it)->id());
+ }
+
+ return TRUE;
}
void LLFloaterToybox::draw()
{
- llassert(gToolBarView != NULL);
+ llassert(gToolBarView != NULL);
- const command_id_list_t& command_list = mToolBar->getCommandsList();
+ const command_id_list_t& command_list = mToolBar->getCommandsList();
- for (command_id_list_t::const_iterator it = command_list.begin(); it != command_list.end(); ++it)
- {
- const LLCommandId& id = *it;
+ for (command_id_list_t::const_iterator it = command_list.begin(); it != command_list.end(); ++it)
+ {
+ const LLCommandId& id = *it;
- const bool command_not_present = (gToolBarView->hasCommand(id) == LLToolBarEnums::TOOLBAR_NONE);
- mToolBar->enableCommand(id, command_not_present);
- }
+ const bool command_not_present = (gToolBarView->hasCommand(id) == LLToolBarEnums::TOOLBAR_NONE);
+ mToolBar->enableCommand(id, command_not_present);
+ }
- LLFloater::draw();
+ LLFloater::draw();
}
static bool finish_restore_toybox(const LLSD& notification, const LLSD& response)
{
- S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+ S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
- if (option == 0)
- {
- LLToolBarView::loadDefaultToolbars();
- }
+ if (option == 0)
+ {
+ LLToolBarView::loadDefaultToolbars();
+ }
- return false;
+ return false;
}
static bool finish_clear_all_toybox(const LLSD& notification, const LLSD& response)
{
- S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+ S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
- if (option == 0)
- {
- LLToolBarView::clearAllToolbars();
- }
+ if (option == 0)
+ {
+ LLToolBarView::clearAllToolbars();
+ }
- return false;
+ return false;
}
static LLNotificationFunctorRegistration finish_restore_toybox_reg("ConfirmRestoreToybox", finish_restore_toybox);
@@ -143,48 +143,48 @@ static LLNotificationFunctorRegistration finish_clear_all_toybox_reg("ConfirmCle
void LLFloaterToybox::onBtnRestoreDefaults()
{
- LLNotificationsUtil::add("ConfirmRestoreToybox");
+ LLNotificationsUtil::add("ConfirmRestoreToybox");
}
void LLFloaterToybox::onBtnClearAll()
{
- LLNotificationsUtil::add("ConfirmClearAllToybox");
+ LLNotificationsUtil::add("ConfirmClearAllToybox");
}
BOOL LLFloaterToybox::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
- EDragAndDropType cargo_type,
- void* cargo_data,
- EAcceptance* accept,
- std::string& tooltip_msg)
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg)
{
- S32 local_x = x - mToolBar->getRect().mLeft;
- S32 local_y = y - mToolBar->getRect().mBottom;
- return mToolBar->handleDragAndDrop(local_x, local_y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
+ S32 local_x = x - mToolBar->getRect().mLeft;
+ S32 local_y = y - mToolBar->getRect().mBottom;
+ return mToolBar->handleDragAndDrop(local_x, local_y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
}
void LLFloaterToybox::onToolBarButtonEnter(LLView* button)
{
- std::string suffix = "";
+ std::string suffix = "";
- LLCommandId commandId(button->getName());
- LLCommand* command = LLCommandManager::instance().getCommand(commandId);
+ LLCommandId commandId(button->getName());
+ LLCommand* command = LLCommandManager::instance().getCommand(commandId);
- if (command)
- {
- S32 command_loc = gToolBarView->hasCommand(commandId);
+ if (command)
+ {
+ S32 command_loc = gToolBarView->hasCommand(commandId);
- switch(command_loc)
- {
- case LLToolBarEnums::TOOLBAR_BOTTOM: suffix = LLTrans::getString("Toolbar_Bottom_Tooltip"); break;
- case LLToolBarEnums::TOOLBAR_LEFT: suffix = LLTrans::getString("Toolbar_Left_Tooltip"); break;
- case LLToolBarEnums::TOOLBAR_RIGHT: suffix = LLTrans::getString("Toolbar_Right_Tooltip"); break;
+ switch(command_loc)
+ {
+ case LLToolBarEnums::TOOLBAR_BOTTOM: suffix = LLTrans::getString("Toolbar_Bottom_Tooltip"); break;
+ case LLToolBarEnums::TOOLBAR_LEFT: suffix = LLTrans::getString("Toolbar_Left_Tooltip"); break;
+ case LLToolBarEnums::TOOLBAR_RIGHT: suffix = LLTrans::getString("Toolbar_Right_Tooltip"); break;
- default:
- break;
- }
- }
+ default:
+ break;
+ }
+ }
- mToolBar->setTooltipButtonSuffix(suffix);
+ mToolBar->setTooltipButtonSuffix(suffix);
}