Second Life viewer sources 1.18.1.2

1 files changed, 58 insertions, 0 deletions

diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index fea3eee..28c56fa 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -35,6 +35,7 @@
 #include "llcallbackmap.h"
 #include "lluictrl.h"
 #include "llviewborder.h"
+#include "lluistring.h"
 #include "v4color.h"
 #include <list>
 #include <queue>
@@ -91,6 +92,8 @@ public:
                                         LLViewBorder::EStyle border_style = LLViewBorder::STYLE_LINE,
                                         S32 border_thickness = LLPANEL_BORDER_WIDTH );
 
+        void removeBorder();
+
         virtual ~LLPanel();
         virtual void    draw(); 
         virtual void    refresh();      // called in setFocus()
@@ -117,6 +120,7 @@ public:
         LLString                getLabel() const { return mLabel; }
         
         void            setRectControl(const LLString& rect_control) { mRectControl.assign(rect_control); }
+        void                    storeRectControl();
         
         void                    setBorderVisible( BOOL b );
 
@@ -136,8 +140,12 @@ public:
         virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
         BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+        void initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory);
         void setPanelParameters(LLXMLNodePtr node, LLView *parentp);
 
+        LLString getFormattedUIString(const LLString& name, const LLString::format_map_t& args = LLUIString::sNullArgs) const;
+        LLUIString getUIString(const LLString& name) const;
+
         // ** Wrappers for setting child properties by name ** -TomY
 
         // Override to set not found list
@@ -216,6 +224,8 @@ public:
         typedef std::queue<LLAlertInfo> alert_queue_t;
         static alert_queue_t sAlertQueue;
 
+        typedef std::map<LLString, LLUIString> ui_string_map_t;
+
 private:
         // common constructor
         void init();
@@ -241,6 +251,8 @@ protected:
         LLString                mLabel;
         S32                             mLastTabGroup;
 
+        ui_string_map_t mUIStrings;
+
         typedef std::map<LLString, EWidgetType> requirements_map_t;
         requirements_map_t mRequirements;
 
@@ -248,4 +260,50 @@ protected:
         static panel_map_t sPanelMap;
 };
 
+class LLLayoutStack : public LLView
+{
+public:
+        typedef enum e_layout_orientation
+        {
+                HORIZONTAL,
+                VERTICAL
+        } eLayoutOrientation;
+
+        LLLayoutStack(eLayoutOrientation orientation);
+        virtual ~LLLayoutStack();
+
+        /*virtual*/ void draw();
+        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
+        /*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
+        /*virtual*/ void removeCtrl(LLUICtrl* ctrl);
+        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_LAYOUT_STACK; }
+        virtual LLString getWidgetTag() const { return LL_LAYOUT_STACK_TAG; }
+
+        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+
+        S32 getMinWidth();
+        S32 getMinHeight();
+        
+        void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, S32 index = S32_MAX);
+        void removePanel(LLPanel* panel);
+        void updateLayout(BOOL force_resize = FALSE);
+
+protected:
+        struct LLEmbeddedPanel;
+
+        LLEmbeddedPanel* findEmbeddedPanel(LLPanel* panelp);
+        void calcMinExtents();
+        S32 getMinStackSize();
+        S32 getCurStackSize();
+
+protected:
+        eLayoutOrientation mOrientation;
+
+        typedef std::vector<LLEmbeddedPanel*> e_panel_list_t;
+        e_panel_list_t mPanels;
+
+        S32 mMinWidth;
+        S32 mMinHeight;
+};
+
 #endif