diff options
Diffstat (limited to 'indra/llui/llpanel.h')
| -rw-r--r-- | indra/llui/llpanel.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index c55eb6bba2..da876667e6 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -49,23 +49,13 @@ const BOOL BORDER_YES = TRUE; const BOOL BORDER_NO = FALSE; -struct LLAlertInfo -{ - std::string mLabel; - LLStringUtil::format_map_t mArgs; - - LLAlertInfo(std::string label, LLStringUtil::format_map_t args) : mLabel(label), mArgs(args) { } - LLAlertInfo(){} -}; - - /* * General purpose concrete view base class. * Transparent or opaque, * With or without border, * Can contain LLUICtrls. */ -class LLPanel : public LLUICtrl +class LLPanel : public LLUICtrl, public boost::signals::trackable { public: @@ -227,8 +217,6 @@ public: void childNotFound(const std::string& id) const; void childDisplayNotFound(); - static void alertXml(const std::string& label, LLStringUtil::format_map_t args = LLStringUtil::format_map_t()); - static BOOL nextAlert(LLAlertInfo &alert); static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); protected: @@ -266,8 +254,6 @@ private: std::string mRequirementsError; - typedef std::queue<LLAlertInfo> alert_queue_t; - static alert_queue_t sAlertQueue; }; // end class LLPanel @@ -292,8 +278,16 @@ public: S32 getMinWidth() const { return mMinWidth; } S32 getMinHeight() const { return mMinHeight; } - void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, S32 index = S32_MAX); + typedef enum e_animate + { + NO_ANIMATE, + ANIMATE + } EAnimate; + + void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, EAnimate animate = NO_ANIMATE, S32 index = S32_MAX); void removePanel(LLPanel* panel); + void collapsePanel(LLPanel* panel, BOOL collapsed = TRUE); + S32 getNumPanels() { return mPanels.size(); } private: struct LLEmbeddedPanel; |