Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move duplicated logic out of NameBox and into new base class LLNameUI

Browse Source 
Also clean up includes.
This commit is contained in:
Liru Færs
2019-10-08 15:55:06 -04:00
parent 3c8a8efc03
commit 65ee3a5345
6 changed files with 157 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@@ -349,6 +349,7 @@ set(viewer_SOURCE_FILES
llnamebox.cpp
llnameeditor.cpp
llnamelistctrl.cpp
llnameui.cpp
llnetmap.cpp
llnotify.cpp
lloutfitobserver.cpp
@@ -886,6 +887,7 @@ set(viewer_HEADER_FILES
llnamebox.h
llnameeditor.h
llnamelistctrl.h
llnameui.h
llnetmap.h
llnotify.h
lloutfitobserver.h

61
indra/newview/llnamebox.cpp
View File

@@ -35,70 +35,17 @@
#include "llnamebox.h"
#include "llcachename.h"
#include "lltrans.h"
#include "llavataractions.h"
#include "llgroupactions.h"
// statics
std::set<LLNameBox*> LLNameBox::sInstances;
static LLRegisterWidget<LLNameBox> r("name_box");
LLNameBox::LLNameBox(const std::string& name)
: LLTextBox(name, LLRect(), LLStringUtil::null, nullptr, TRUE)
, mInitialValue(LLTrans::getString("LoadingData"))
: LLNameUI()
, LLTextBox(name, LLRect(), LLStringUtil::null, nullptr, TRUE)
{
sInstances.insert(this);
setText(LLStringUtil::null);
}
LLNameBox::~LLNameBox()
{
sInstances.erase(this);
}
void LLNameBox::setNameID(const LLUUID& name_id, BOOL is_group)
{
mNameID = name_id;
std::string name;
BOOL got_name = FALSE;
if (!is_group)
{
got_name = gCacheName->getFullName(name_id, name);
}
else
{
got_name = gCacheName->getGroupName(name_id, name);
}
// At this point, if no callback has been set, set one
if (!mClickedCallback)
setClickedCallback(boost::bind(&LLNameBox::showProfile, this));
mIsGroup = is_group;
// Got the name already? Set it.
// Otherwise it will be set later in refresh().
setText(got_name ? name : mInitialValue);
}
void LLNameBox::refresh(const LLUUID& id, const std::string& full_name, bool is_group)
{
if (id == mNameID)
{
setText(full_name);
}
}
void LLNameBox::refreshAll(const LLUUID& id, const std::string& full_name, bool is_group)
{
for (auto& box : sInstances)
{
box->refresh(id, full_name, is_group);
}
setClickedCallback(boost::bind(&LLNameBox::showProfile, this));
}
void LLNameBox::showProfile()
@@ -127,6 +74,7 @@ void LLNameBox::initFromXML(LLXMLNodePtr node, LLView* parent)
{
LLTextBox::initFromXML(node, parent);
node->getAttributeString("initial_value", mInitialValue);
setText(mInitialValue);
}
// static
@@ -136,4 +84,3 @@ LLView* LLNameBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
name_box->initFromXML(node,parent);
return name_box;
}

26
indra/newview/llnamebox.h
View File

@@ -33,32 +33,18 @@
#ifndef LL_LLNAMEBOX_H
#define LL_LLNAMEBOX_H
#include <set>
#include "lfidbearer.h"
#include "llview.h"
#include "llstring.h"
#include "llfontgl.h"
#include "llnameui.h"
#include "lltextbox.h"
class LLNameBox
: public LLTextBox
, public LFIDBearer
, public LLNameUI
{
public:
virtual void initFromXML(LLXMLNodePtr node, LLView* parent);
static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
virtual ~LLNameBox();
LLUUID getStringUUIDSelectedItem() const override final { return mNameID; }
uuid_vec_t getSelectedIDs() const override final { return {mNameID}; }
S32 getNumSelected() const override final { return 1; }
void setNameID(const LLUUID& name_id, BOOL is_group);
void refresh(const LLUUID& id, const std::string& full_name, bool is_group);
static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group);
void setText(const std::string& text) override final { LLTextBox::setText(text); }
void showProfile();
BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override final;
@@ -67,12 +53,6 @@ protected:
LLNameBox(const std::string& name);
friend class LLUICtrlFactory;
private:
static std::set<LLNameBox*> sInstances;
LLUUID mNameID;
bool mIsGroup;
std::string mInitialValue;
};
#endif

85
indra/newview/llnameui.cpp Normal file
View File

@@ -0,0 +1,85 @@
/**
* @file llnameui.cpp
* @brief Name UI refreshes a name and bears a menu for interacting with it
*
* $LicenseInfo:firstyear=2003&license=viewergpl$
*
* Copyright (c) 2003-2009, Linden Research, Inc. 2019, Liru F<>rs
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "llnameui.h"
#include "lltrans.h"
// statics
std::set<LLNameUI*> LLNameUI::sInstances;
LLNameUI::LLNameUI(const std::string& loading, const LLUUID& id, bool is_group)
: mInitialValue(!loading.empty() ? loading : LLTrans::getString("LoadingData"))
, mNameID(id), mIsGroup(is_group)
{
sInstances.insert(this);
}
void LLNameUI::setNameID(const LLUUID& name_id, bool is_group)
{
mNameID = name_id;
std::string name;
bool got_name = false;
if (!is_group)
{
got_name = gCacheName->getFullName(name_id, name);
}
else
{
got_name = gCacheName->getGroupName(name_id, name);
}
mIsGroup = is_group;
// Got the name already? Set it.
// Otherwise it will be set later in refresh().
setText(got_name ? name : mInitialValue);
}
void LLNameUI::refresh(const LLUUID& id, const std::string& full_name, bool is_group)
{
if (id == mNameID)
{
setText(full_name);
}
}
void LLNameUI::refreshAll(const LLUUID& id, const std::string& full_name, bool is_group)
{
for (auto box : sInstances)
{
box->refresh(id, full_name, is_group);
}
}

61
indra/newview/llnameui.h Normal file
View File

@@ -0,0 +1,61 @@
/**
* @file llnameui.h
* @brief display and refresh a name from the name cache
*
* $LicenseInfo:firstyear=2003&license=viewergpl$
*
* Copyright (c) 2003-2009, Linden Research, Inc. 2019, Liru F<>rs
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#pragma once
#include <set>
#include "lfidbearer.h"
struct LLNameUI : public LFIDBearer
{
LLNameUI(const std::string& loading = LLStringUtil::null, const LLUUID& id = LLUUID::null, bool is_group = false);
virtual ~LLNameUI() { sInstances.erase(this); }
LLUUID getStringUUIDSelectedItem() const override final { return mNameID; }
uuid_vec_t getSelectedIDs() const override final { return { mNameID }; }
S32 getNumSelected() const override final { return 1; }
void setNameID(const LLUUID& name_id, bool is_group);
void refresh(const LLUUID& id, const std::string& full_name, bool is_group);
static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group);
virtual void setText(const std::string& text) = 0;
private:
static std::set<LLNameUI*> sInstances;
protected:
LLUUID mNameID;
bool mIsGroup;
std::string mInitialValue;
};

4
indra/newview/llstartup.cpp
View File

@@ -204,7 +204,7 @@
#include "llweb.h"
#include "llvoiceclient.h"
#include "llnamelistctrl.h"
#include "llnamebox.h"
#include "llnameui.h"
#include "llnameeditor.h"
#include "llwlparammanager.h"
#include "llwaterparammanager.h"
@@ -320,7 +320,7 @@ void transition_back_to_login_panel(const std::string& emsg);
void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is_group)
{
LLNameBox::refreshAll(id, full_name, is_group);
LLNameUI::refreshAll(id, full_name, is_group);
LLNameEditor::refreshAll(id, full_name, is_group);
// TODO: Actually be intelligent about the refresh.