summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpresetspulldown.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-05-15 09:07:21 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-05-15 09:07:21 -0400
commit5d43bc166d011e911e0492579b2f4f8bf015b48f (patch)
treeccc4cda5c2c2c3a5689f4a33dcfda2a896f21b8c /indra/newview/llpanelpresetspulldown.cpp
parenta3f2cacf542e1d770698ef6c7e6ea1c0a5cd3368 (diff)
parente7eced3c87310b15ac20cc3cd470d67686104a14 (diff)
Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.
Diffstat (limited to 'indra/newview/llpanelpresetspulldown.cpp')
-rw-r--r--indra/newview/llpanelpresetspulldown.cpp144
1 files changed, 72 insertions, 72 deletions
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp
index f6e501f147..61331aad95 100644
--- a/indra/newview/llpanelpresetspulldown.cpp
+++ b/indra/newview/llpanelpresetspulldown.cpp
@@ -1,25 +1,25 @@
-/**
+/**
* @file llpanelpresetspulldown.cpp
* @brief A panel showing a quick way to pick presets
*
* $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2014, 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$
*/
@@ -48,92 +48,92 @@
// Default constructor
LLPanelPresetsPulldown::LLPanelPresetsPulldown()
{
- mHoverTimer.stop();
+ mHoverTimer.stop();
- mCommitCallbackRegistrar.add("Presets.GoGraphicsPrefs", boost::bind(&LLPanelPresetsPulldown::onGraphicsButtonClick, this, _2));
+ mCommitCallbackRegistrar.add("Presets.GoGraphicsPrefs", boost::bind(&LLPanelPresetsPulldown::onGraphicsButtonClick, this, _2));
mCommitCallbackRegistrar.add("Presets.GoAutofpsPrefs", boost::bind(&LLPanelPresetsPulldown::onAutofpsButtonClick, this, _2));
- mCommitCallbackRegistrar.add("Presets.RowClick", boost::bind(&LLPanelPresetsPulldown::onRowClick, this, _2));
+ mCommitCallbackRegistrar.add("Presets.RowClick", boost::bind(&LLPanelPresetsPulldown::onRowClick, this, _2));
- buildFromFile( "panel_presets_pulldown.xml");
+ buildFromFile( "panel_presets_pulldown.xml");
}
BOOL LLPanelPresetsPulldown::postBuild()
{
- LLPresetsManager* presetsMgr = LLPresetsManager::getInstance();
+ LLPresetsManager* presetsMgr = LLPresetsManager::getInstance();
presetsMgr->setPresetListChangeCallback(boost::bind(&LLPanelPresetsPulldown::populatePanel, this));
- // Make sure there is a default preference file
+ // Make sure there is a default preference file
presetsMgr->createMissingDefault(PRESETS_GRAPHIC);
- populatePanel();
+ populatePanel();
- return LLPanelPulldown::postBuild();
+ return LLPanelPulldown::postBuild();
}
void LLPanelPresetsPulldown::populatePanel()
{
- LLPresetsManager::getInstance()->loadPresetNamesFromDir(PRESETS_GRAPHIC, mPresetNames, DEFAULT_TOP);
+ LLPresetsManager::getInstance()->loadPresetNamesFromDir(PRESETS_GRAPHIC, mPresetNames, DEFAULT_TOP);
- LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");
+ LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");
- if (scroll && mPresetNames.begin() != mPresetNames.end())
- {
- scroll->clearRows();
+ if (scroll && mPresetNames.begin() != mPresetNames.end())
+ {
+ scroll->clearRows();
- std::string active_preset = gSavedSettings.getString("PresetGraphicActive");
- if (active_preset == PRESETS_DEFAULT)
- {
- active_preset = LLTrans::getString(PRESETS_DEFAULT);
- }
+ std::string active_preset = gSavedSettings.getString("PresetGraphicActive");
+ if (active_preset == PRESETS_DEFAULT)
+ {
+ active_preset = LLTrans::getString(PRESETS_DEFAULT);
+ }
- for (std::list<std::string>::const_iterator it = mPresetNames.begin(); it != mPresetNames.end(); ++it)
- {
- const std::string& name = *it;
+ for (std::list<std::string>::const_iterator it = mPresetNames.begin(); it != mPresetNames.end(); ++it)
+ {
+ const std::string& name = *it;
LL_DEBUGS() << "adding '" << name << "'" << LL_ENDL;
-
- LLSD row;
- row["columns"][0]["column"] = "preset_name";
- row["columns"][0]["value"] = name;
-
- bool is_selected_preset = false;
- if (name == active_preset)
- {
- row["columns"][1]["column"] = "icon";
- row["columns"][1]["type"] = "icon";
- row["columns"][1]["value"] = "Check_Mark";
-
- is_selected_preset = true;
- }
-
- LLScrollListItem* new_item = scroll->addElement(row);
- new_item->setSelected(is_selected_preset);
- }
- }
+
+ LLSD row;
+ row["columns"][0]["column"] = "preset_name";
+ row["columns"][0]["value"] = name;
+
+ bool is_selected_preset = false;
+ if (name == active_preset)
+ {
+ row["columns"][1]["column"] = "icon";
+ row["columns"][1]["type"] = "icon";
+ row["columns"][1]["value"] = "Check_Mark";
+
+ is_selected_preset = true;
+ }
+
+ LLScrollListItem* new_item = scroll->addElement(row);
+ new_item->setSelected(is_selected_preset);
+ }
+ }
}
void LLPanelPresetsPulldown::onRowClick(const LLSD& user_data)
{
- LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");
+ LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");
- if (scroll)
- {
- LLScrollListItem* item = scroll->getFirstSelected();
- if (item)
- {
- std::string name = item->getColumn(1)->getValue().asString();
+ if (scroll)
+ {
+ LLScrollListItem* item = scroll->getFirstSelected();
+ if (item)
+ {
+ std::string name = item->getColumn(1)->getValue().asString();
LL_DEBUGS() << "selected '" << name << "'" << LL_ENDL;
- LLPresetsManager::getInstance()->loadPreset(PRESETS_GRAPHIC, name);
+ LLPresetsManager::getInstance()->loadPreset(PRESETS_GRAPHIC, name);
// Scroll grabbed focus, drop it to prevent selection of parent menu
setFocus(FALSE);
- setVisible(FALSE);
- }
+ setVisible(FALSE);
+ }
else
{
LL_DEBUGS() << "none selected" << LL_ENDL;
}
- }
+ }
else
{
LL_DEBUGS() << "no scroll" << LL_ENDL;
@@ -142,22 +142,22 @@ void LLPanelPresetsPulldown::onRowClick(const LLSD& user_data)
void LLPanelPresetsPulldown::onGraphicsButtonClick(const LLSD& user_data)
{
- // close the minicontrol, we're bringing up the big one
- setVisible(FALSE);
-
- // bring up the prefs floater
- LLFloater* prefsfloater = LLFloaterReg::showInstance("preferences");
- if (prefsfloater)
- {
- // grab the 'graphics' panel from the preferences floater and
- // bring it the front!
- LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
- LLPanel* graphicspanel = prefsfloater->getChild<LLPanel>("display");
- if (tabcontainer && graphicspanel)
- {
- tabcontainer->selectTabPanel(graphicspanel);
- }
- }
+ // close the minicontrol, we're bringing up the big one
+ setVisible(FALSE);
+
+ // bring up the prefs floater
+ LLFloater* prefsfloater = LLFloaterReg::showInstance("preferences");
+ if (prefsfloater)
+ {
+ // grab the 'graphics' panel from the preferences floater and
+ // bring it the front!
+ LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
+ LLPanel* graphicspanel = prefsfloater->getChild<LLPanel>("display");
+ if (tabcontainer && graphicspanel)
+ {
+ tabcontainer->selectTabPanel(graphicspanel);
+ }
+ }
}
void LLPanelPresetsPulldown::onAutofpsButtonClick(const LLSD& user_data)