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

Merge branch 'master' of git://github.com/siana/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2015-11-20 07:24:30 -05:00
parent 4d8f75fb32 c358ffe8e2
commit c28b241c69
41 changed files with 383 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llcallbackmap.h
View File

@@ -35,7 +35,10 @@
#include <map>
#include <string>
#ifndef BOOST_FUNCTION_HPP_INCLUDED
#include <boost/function.hpp>
#define BOOST_FUNCTION_HPP_INCLUDED
#endif
class LLCallbackMap
{

3
indra/llui/llfunctorregistry.h
View File

@@ -37,8 +37,6 @@
#include <string>
#include <map>
#include <boost/function.hpp>
#include "llsd.h"
#include "llsingleton.h"
@@ -140,5 +138,6 @@ public:
}
};
#endif//LL_LLFUNCTORREGISTRY_H

25
indra/llui/llnotifications.h
View File

@@ -92,7 +92,6 @@
#include <boost/utility.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/type_traits.hpp>
#include <boost/signals2.hpp>
// we want to minimize external dependencies, but this one is important
@@ -307,7 +306,7 @@ public:
// after someone responds to a notification (usually by clicking a button,
// but sometimes by filling out a little form and THEN clicking a button),
// the result of the response (the name and value of the button clicked,
// the result of the response (the name and value of the button clicked,
// plus any other data) should be packaged up as LLSD, then passed as a
// parameter to the notification's respond() method here. This will look up
// and call the appropriate responder.
@@ -320,7 +319,7 @@ public:
// ["payload"] = transaction specific data, such as ["source_id"] (originator of notification),
// ["item_id"] (attached inventory item), etc.
// ["substitutions"] = string substitutions used to generate notification message
// from the template
// from the template
// ["time"] = time at which notification was generated;
// ["expiry"] = time at which notification expires;
// ["responseFunctor"] = name of registered functor that handles responses to notification;
@@ -514,7 +513,7 @@ namespace LLNotificationComparators
struct orderBy
{
typedef boost::function<T (LLNotificationPtr)> field_t;
orderBy(field_t field, EDirection direction = ORDER_INCREASING) : mField(field), mDirection(direction) {}
orderBy(field_t field, EDirection direction = ORDER_INCREASING) : mField(field), mDirection(direction) {}
bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs)
{
if (mDirection == ORDER_DECREASING)
@@ -632,18 +631,18 @@ class LLNotificationChannel :
public:
virtual ~LLNotificationChannel() {}
typedef LLNotificationSet::iterator Iterator;
std::string getName() const { return mName; }
std::string getParentChannelName() { return mParent; }
bool isEmpty() const;
Iterator begin();
Iterator end();
bool isEmpty() const;
Iterator begin();
Iterator end();
// Channels have a comparator to control sort order;
// Channels have a comparator to control sort order;
// the default sorts by arrival date
void setComparator(LLNotificationComparator comparator);
void setComparator(LLNotificationComparator comparator);
std::string summarize();
@@ -654,7 +653,7 @@ public:
LLNotificationComparator comparator=LLNotificationComparators::orderByUUID());
protected:
// Notification Channels have a filter, which determines which notifications
// Notification Channels have a filter, which determines which notifications
// will be added to this channel.
// Channel filters cannot change.
// Channels have a protected constructor so you can't make smart pointers that don't

3
indra/llui/llnotificationsutil.h
View File

@@ -32,7 +32,10 @@
#include "llnotificationptr.h"
#include "aialert.h"
#ifndef BOOST_FUNCTION_HPP_INCLUDED
#include <boost/function.hpp>
#define BOOST_FUNCTION_HPP_INCLUDED
#endif
class LLSD;

3
indra/llui/llui.h
View File

@@ -33,7 +33,6 @@
#include "llcoord.h"
#include "v2math.h"
#include "llinitparam.h"
#include "llregistry.h"
#include "llrender2dutils.h"
#include "llpointer.h"
#include "lluicolor.h"
@@ -206,7 +205,7 @@ public:
{
}
virtual ~LLUIFactory()
virtual ~LLUIFactory()
{
}

12
indra/llui/lluictrl.cpp
View File

@@ -406,7 +406,7 @@ BOOL LLUICtrl::isCtrl() const
//virtual
void LLUICtrl::setValue(const LLSD& value)
{
mViewModel->setValue(value);
mViewModel->setValue(value);
}
//virtual
@@ -419,10 +419,10 @@ LLSD LLUICtrl::getValue() const
/// change), share their ViewModel.
void LLUICtrl::shareViewModelFrom(const LLUICtrl& other)
{
// Because mViewModel is an LLViewModelPtr, this assignment will quietly
// dispose of the previous LLViewModel -- unless it's already shared by
// somebody else.
mViewModel = other.mViewModel;
// Because mViewModel is an LLViewModelPtr, this assignment will quietly
// dispose of the previous LLViewModel -- unless it's already shared by
// somebody else.
mViewModel = other.mViewModel;
}
//virtual
@@ -635,7 +635,7 @@ BOOL LLUICtrl::isDirty() const
//virtual
void LLUICtrl::resetDirty()
{
mViewModel->resetDirty();
mViewModel->resetDirty();
}
// virtual

23
indra/llui/lluictrl.h
View File

@@ -36,7 +36,12 @@
#include "llrect.h"
#include "llsd.h"
#include "llregistry.h"
#ifndef BOOST_FUNCTION_HPP_INCLUDED
#include <boost/function.hpp>
#define BOOST_FUNCTION_HPP_INCLUDED
#endif
#include <boost/signals2.hpp>
#include "llinitparam.h"
@@ -128,7 +133,7 @@ public:
void initFromParams(const Params& p);
static const Params& getDefaultParams();
LLUICtrl(const Params& p = getDefaultParams(),
const LLViewModelPtr& viewmodel=LLViewModelPtr(new LLViewModel));
const LLViewModelPtr& viewmodel=LLViewModelPtr(new LLViewModel));
// Singu Note: This constructor is deprecated:
LLUICtrl( const std::string& name, const LLRect rect = LLRect(), BOOL mouse_opaque = TRUE,
commit_callback_t commit_callback = NULL,
@@ -139,8 +144,8 @@ public:
// We need this virtual so we can override it with derived versions
virtual LLViewModel* getViewModel() const;
// We shouldn't ever need to set this directly
//virtual void setViewModel(const LLViewModelPtr&);
// We shouldn't ever need to set this directly
//virtual void setViewModel(const LLViewModelPtr&);
virtual BOOL postBuild();
@@ -179,9 +184,9 @@ public:
virtual BOOL getTentative() const;
virtual void setValue(const LLSD& value);
virtual LLSD getValue() const;
/// When two widgets are displaying the same data (e.g. during a skin
/// change), share their ViewModel.
virtual void shareViewModelFrom(const LLUICtrl& other);
/// When two widgets are displaying the same data (e.g. during a skin
/// change), share their ViewModel.
virtual void shareViewModelFrom(const LLUICtrl& other);
virtual BOOL setTextArg( const std::string& key, const LLStringExplicit& text );
virtual void setIsChrome(BOOL is_chrome);
@@ -259,12 +264,12 @@ public:
};
template <typename F, typename DERIVED> class CallbackRegistry : public LLRegistrySingleton<std::string, F, DERIVED >
{};
{};
class CommitCallbackRegistry : public CallbackRegistry<commit_callback_t, CommitCallbackRegistry>{};
// the enable callback registry is also used for visiblity callbacks
class EnableCallbackRegistry : public CallbackRegistry<enable_callback_t, EnableCallbackRegistry>{};
protected:
static bool controlListener(const LLSD& newvalue, LLHandle<LLUICtrl> handle, std::string type);
@@ -282,7 +287,7 @@ protected:
mouse_signal_t* mDoubleClickSignal;
LLViewModelPtr mViewModel;
LLViewModelPtr mViewModel;
LLControlVariable* mEnabledControlVariable;
boost::signals2::connection mEnabledControlConnection;

3
indra/llui/llurlaction.h
View File

@@ -29,7 +29,10 @@
#define LL_LLURLACTION_H
#include <string>
#ifndef BOOST_FUNCTION_HPP_INCLUDED
#include <boost/function.hpp>
#define BOOST_FUNCTION_HPP_INCLUDED
#endif
///
/// The LLUrlAction class provides a number of static functions that

3
indra/llui/llxuiparser.h
View File

@@ -31,7 +31,10 @@
#include "llregistry.h"
#include "llxmlnode.h"
#ifndef BOOST_FUNCTION_HPP_INCLUDED
#include <boost/function.hpp>
#define BOOST_FUNCTION_HPP_INCLUDED
#endif
#include <iosfwd>
#include <stack>
#include <set>