UI cleanup.
-Added ui-local transformation matrix. -Gutted legacy commitcallbacks throughout ui widget ctors. -Created filter_editor ui widget which issues commit on keypress -search_editor commits on focus loss/enter press -search_editor and filter_editor now have a built in 'x' button to clear text. -LLComboBox::setPrearrangeCallback now uses boost::function -LLComboBox::setTextEntryCallback now uses boost::function -LLLineEditor::setKeystrokeCallback now uses boost::function -LLLineEditor::setPrevalidate now uses boost::function -LLPanel::childSetKeystrokeCallback removed -LLPanel::childSetPrevalidate removed -LLPanel::childSetActionTextbox now uses boost::function -LLTextBox::setClickedCallback now uses boost::function -LLTextEditor::setKeystrokeCallback added. -Cleaned up JCFloaterAreaSearch
This commit is contained in:
@@ -36,6 +36,8 @@
|
||||
#include <map>
|
||||
#include "llmultifloater.h"
|
||||
#include "lliconctrl.h"
|
||||
#include "llinstancetracker.h"
|
||||
#include "lluuid.h"
|
||||
|
||||
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
// Class LLFloaterProperties
|
||||
@@ -50,7 +52,7 @@ class LLTextBox;
|
||||
|
||||
class LLPropertiesObserver;
|
||||
|
||||
class LLFloaterProperties : public LLFloater
|
||||
class LLFloaterProperties : public LLFloater, LLInstanceTracker<LLFloaterProperties, LLUUID>
|
||||
{
|
||||
public:
|
||||
static LLFloaterProperties* find(const LLUUID& item_id,
|
||||
@@ -62,21 +64,23 @@ public:
|
||||
static void closeByID(const LLUUID& item_id, const LLUUID& object_id);
|
||||
|
||||
LLFloaterProperties(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_id, const LLUUID& object_id);
|
||||
virtual ~LLFloaterProperties();
|
||||
/*virtual*/ ~LLFloaterProperties();
|
||||
/*virtual*/ BOOL postBuild();
|
||||
/*virtual*/ void onOpen();
|
||||
|
||||
// do everything necessary
|
||||
void dirty() { mDirty = TRUE; }
|
||||
void refresh();
|
||||
|
||||
|
||||
protected:
|
||||
// ui callbacks
|
||||
static void onClickCreator(void* data);
|
||||
static void onClickOwner(void* data);
|
||||
static void onCommitName(LLUICtrl* ctrl, void* data);
|
||||
static void onCommitDescription(LLUICtrl* ctrl, void* data);
|
||||
static void onCommitPermissions(LLUICtrl* ctrl, void* data);
|
||||
static void onCommitSaleInfo(LLUICtrl* ctrl, void* data);
|
||||
static void onCommitSaleType(LLUICtrl* ctrl, void* data);
|
||||
void onClickCreator();
|
||||
void onClickOwner();
|
||||
void onCommitName();
|
||||
void onCommitDescription();
|
||||
void onCommitPermissions();
|
||||
void onCommitSaleInfo();
|
||||
void onCommitSaleType();
|
||||
void updateSaleInfo();
|
||||
|
||||
LLInventoryItem* findItem() const;
|
||||
@@ -95,10 +99,7 @@ protected:
|
||||
|
||||
BOOL mDirty;
|
||||
|
||||
typedef std::map<LLUUID, LLFloaterProperties*, lluuid_less> instance_map;
|
||||
static instance_map sInstances;
|
||||
static LLPropertiesObserver* sPropertiesObserver;
|
||||
static S32 sPropertiesObserverCount;
|
||||
LLPropertiesObserver* mPropertiesObserver;
|
||||
};
|
||||
|
||||
class LLMultiProperties : public LLMultiFloater
|
||||
|
||||
Reference in New Issue
Block a user