Gui changes

-Check for profile in GuiControl
-Changed onMouse for onTouch
-Profiles for more classes

engine/source/gui/containers/guiDragAndDropCtrl.cc

@@ -61,12 +61,12 @@ void GuiDragAndDropControl::startDragging(Point2I offset)
    mLastTarget=NULL;
 }
 
-void GuiDragAndDropControl::onMouseDown(const GuiEvent& event)
+void GuiDragAndDropControl::onTouchDown(const GuiEvent& event)
 {
    startDragging(event.mousePoint - mBounds.point);
 }
 
-void GuiDragAndDropControl::onMouseDragged(const GuiEvent& event)
+void GuiDragAndDropControl::onTouchDragged(const GuiEvent& event)
 {
    mBounds.point = event.mousePoint - mOffset;
 
@@ -83,7 +83,7 @@ void GuiDragAndDropControl::onMouseDragged(const GuiEvent& event)
    sendDragEvent(dragTarget, "onControlDragged");
 }
 
-void GuiDragAndDropControl::onMouseUp(const GuiEvent& event)
+void GuiDragAndDropControl::onTouchUp(const GuiEvent& event)
 {
    mouseUnlock();
 

engine/source/gui/containers/guiDragAndDropCtrl.h

@@ -52,9 +52,9 @@ public:
 
    void startDragging(Point2I offset = Point2I(0, 0));
 
-   virtual void onMouseDown(const GuiEvent& event);
-   virtual void onMouseDragged(const GuiEvent& event);
-   virtual void onMouseUp(const GuiEvent& event);
+   virtual void onTouchDown(const GuiEvent& event);
+   virtual void onTouchDragged(const GuiEvent& event);
+   virtual void onTouchUp(const GuiEvent& event);
 
    static void initPersistFields();
 

engine/source/gui/containers/guiFormCtrl.cc

@@ -293,7 +293,7 @@ void GuiFormCtrl::onRender(Point2I offset, const RectI &updateRect)
    renderChildControls(offset, mBounds, updateRect);
 }
 
-void GuiFormCtrl::onMouseDragged(const GuiEvent &event)
+void GuiFormCtrl::onTouchDragged(const GuiEvent &event)
 {
    GuiControl *parent = getParent();
    GuiCanvas *root = getRoot();
@@ -315,7 +315,7 @@ void GuiFormCtrl::onMouseDragged(const GuiEvent &event)
 }
 
 
-void GuiFormCtrl::onMouseMove(const GuiEvent &event)
+void GuiFormCtrl::onTouchMove(const GuiEvent &event)
 {
    Point2I localMove = globalToLocalCoord(event.mousePoint);
 
@@ -326,7 +326,7 @@ void GuiFormCtrl::onMouseMove(const GuiEvent &event)
 
 }
 
-void GuiFormCtrl::onMouseEnter(const GuiEvent &event)
+void GuiFormCtrl::onTouchEnter(const GuiEvent &event)
 {
    setUpdate();
    if(isMouseLocked())
@@ -341,7 +341,7 @@ void GuiFormCtrl::onMouseEnter(const GuiEvent &event)
 
 }
 
-void GuiFormCtrl::onMouseLeave(const GuiEvent &event)
+void GuiFormCtrl::onTouchLeave(const GuiEvent &event)
 {
    setUpdate();
    if(isMouseLocked())
@@ -349,7 +349,7 @@ void GuiFormCtrl::onMouseLeave(const GuiEvent &event)
    mMouseOver = false;
 }
 
-void GuiFormCtrl::onMouseDown(const GuiEvent &event)
+void GuiFormCtrl::onTouchDown(const GuiEvent &event)
 {
    Point2I localClick = globalToLocalCoord(event.mousePoint);
 
@@ -427,7 +427,7 @@ void GuiFormCtrl::onMouseDown(const GuiEvent &event)
 
 }
 
-void GuiFormCtrl::onMouseUp(const GuiEvent &event)
+void GuiFormCtrl::onTouchUp(const GuiEvent &event)
 {
    // Make sure we only get events we ought to be getting...
    if (! mActive)

engine/source/gui/containers/guiFormCtrl.h

@@ -99,12 +99,12 @@ public:
 
    virtual void addObject(SimObject *newObj );
 
-   void onMouseDragged(const GuiEvent &event);
-   void onMouseDown(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
-   void onMouseMove(const GuiEvent &event);
-   void onMouseLeave(const GuiEvent &event);
-   void onMouseEnter(const GuiEvent &event);
+   void onTouchDragged(const GuiEvent &event);
+   void onTouchDown(const GuiEvent &event);
+   void onTouchUp(const GuiEvent &event);
+   void onTouchMove(const GuiEvent &event);
+   void onTouchLeave(const GuiEvent &event);
+   void onTouchEnter(const GuiEvent &event);
 
    static void initPersistFields();
    DECLARE_CONOBJECT(GuiFormCtrl);

engine/source/gui/containers/guiRolloutCtrl.cc

@@ -115,12 +115,12 @@ void GuiRolloutCtrl::removeObject( SimObject *obj )
 //////////////////////////////////////////////////////////////////////////
 // Mouse Events
 //////////////////////////////////////////////////////////////////////////
-void GuiRolloutCtrl::onMouseDown( const GuiEvent &event )
+void GuiRolloutCtrl::onTouchDown( const GuiEvent &event )
 {
    mouseLock();
 }
 
-void GuiRolloutCtrl::onMouseUp( const GuiEvent &event )
+void GuiRolloutCtrl::onTouchUp( const GuiEvent &event )
 {
    Point2I localPoint = globalToLocalCoord( event.mousePoint );
    if( mCanCollapse && mHeader.pointInRect( localPoint ) && !mIsAnimating && isMouseLocked() )

engine/source/gui/containers/guiRolloutCtrl.h

@@ -88,8 +88,8 @@ public:
    virtual void childResized(GuiControl *child);
 
    // Mouse Events
-   virtual void onMouseDown( const GuiEvent &event );
-   virtual void onMouseUp( const GuiEvent &event );
+   virtual void onTouchDown( const GuiEvent &event );
+   virtual void onTouchUp( const GuiEvent &event );
 
    // Sizing Helpers
    virtual void calculateHeights();

engine/source/gui/containers/guiWindowCtrl.cc

@@ -183,7 +183,7 @@ void GuiWindowCtrl::resize(const Point2I &newPosition, const Point2I &newExtent)
    PositionButtons();
 }
 
-void GuiWindowCtrl::onMouseDown(const GuiEvent &event)
+void GuiWindowCtrl::onTouchDown(const GuiEvent &event)
 {
    setUpdate();
 
@@ -253,7 +253,7 @@ void GuiWindowCtrl::onMouseDown(const GuiEvent &event)
    }
 }
 
-void GuiWindowCtrl::onMouseDragged(const GuiEvent &event)
+void GuiWindowCtrl::onTouchDragged(const GuiEvent &event)
 {
    GuiControl *parent = getParent();
    GuiCanvas *root = getRoot();
@@ -298,7 +298,7 @@ void GuiWindowCtrl::onMouseDragged(const GuiEvent &event)
    }
 }
 
-void GuiWindowCtrl::onMouseUp(const GuiEvent &event)
+void GuiWindowCtrl::onTouchUp(const GuiEvent &event)
 {
    bool closing = mPressClose;
    bool maximizing = mPressMaximize;

engine/source/gui/containers/guiWindowCtrl.h

@@ -124,9 +124,9 @@ class GuiWindowCtrl : public GuiControl
       GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1);
       void resize(const Point2I &newPosition, const Point2I &newExtent);
 
-      void onMouseDown(const GuiEvent &event);
-      void onMouseDragged(const GuiEvent &event);
-      void onMouseUp(const GuiEvent &event);
+      void onTouchDown(const GuiEvent &event);
+      void onTouchDragged(const GuiEvent &event);
+      void onTouchUp(const GuiEvent &event);
 
       //only cycle tabs through the current window, so overwrite the method
       GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true);

engine/source/gui/editor/guiDebugger.cc

@@ -558,7 +558,7 @@ void DbgFileView::onPreRender()
 		Con::executef(2, "DbgSetCursorWatch", "");
 }
 
-void DbgFileView::onMouseDown(const GuiEvent &event)
+void DbgFileView::onTouchDown(const GuiEvent &event)
 {
    if (! mActive)
    {
@@ -624,7 +624,7 @@ void DbgFileView::onMouseDown(const GuiEvent &event)
    }
 }
 
-void DbgFileView::onMouseDragged(const GuiEvent &event)
+void DbgFileView::onTouchDragged(const GuiEvent &event)
 {
    if (mbMouseDragging)
    {
@@ -657,7 +657,7 @@ void DbgFileView::onMouseDragged(const GuiEvent &event)
    }
 }
 
-void DbgFileView::onMouseUp(const GuiEvent &)
+void DbgFileView::onTouchUp(const GuiEvent &)
 {
    //unlock the mouse
    mouseUnlock();

engine/source/gui/editor/guiDebugger.h

@@ -88,9 +88,9 @@ class DbgFileView : public GuiArrayCtrl
 
    bool findString(const char *text);
 
-   void onMouseDown(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
+   void onTouchDown(const GuiEvent &event);
+   void onTouchDragged(const GuiEvent &event);
+   void onTouchUp(const GuiEvent &event);
 
    void onPreRender();
    void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);

engine/source/gui/editor/guiEditCtrl.cc

@@ -671,7 +671,7 @@ void GuiEditCtrl::getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent
        cursor = mMoveCursor;
 }
 
-void GuiEditCtrl::onMouseDown(const GuiEvent &event)
+void GuiEditCtrl::onTouchDown(const GuiEvent &event)
 {
    if (! mActive)
    {
@@ -830,7 +830,7 @@ void GuiEditCtrl::removeSelection(S32 id)
       }
    }
 }
-void GuiEditCtrl::onMouseUp(const GuiEvent &event)
+void GuiEditCtrl::onTouchUp(const GuiEvent &event)
 {
    if (! mActive || !mContentControl || !mCurrentAddSet )
    {
@@ -891,7 +891,7 @@ void GuiEditCtrl::onMouseUp(const GuiEvent &event)
    mMouseDownMode = Selecting;
 }
 
-void GuiEditCtrl::onMouseDragged(const GuiEvent &event)
+void GuiEditCtrl::onTouchDragged(const GuiEvent &event)
 {
    if (! mActive || !mContentControl || !mCurrentAddSet)
    {

engine/source/gui/editor/guiEditCtrl.h

@@ -103,9 +103,9 @@ class GuiEditCtrl : public GuiControl
    const GuiControl *getAddSet() const { return mCurrentAddSet; }; //JDD
 
    bool onKeyDown(const GuiEvent &event);
-   void onMouseDown(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
+   void onTouchDown(const GuiEvent &event);
+   void onTouchUp(const GuiEvent &event);
+   void onTouchDragged(const GuiEvent &event);
    void onRightMouseDown(const GuiEvent &event);
 
    virtual bool onAdd();

engine/source/gui/editor/guiMenuBar.cc

@@ -875,7 +875,7 @@ void GuiMenuBar::checkMenuMouseMove(const GuiEvent &event)
    }
 }
 
-void GuiMenuBar::onMouseMove(const GuiEvent &event)
+void GuiMenuBar::onTouchMove(const GuiEvent &event)
 {
    Menu *hit = findHitMenu(event.mousePoint);
     if(hit != mouseOverMenu)
@@ -896,7 +896,7 @@ void GuiMenuBar::onMouseMove(const GuiEvent &event)
     }
 }
 
-void GuiMenuBar::onMouseLeave(const GuiEvent &event)
+void GuiMenuBar::onTouchLeave(const GuiEvent &event)
 {
    if(mouseOverMenu)
         setUpdate();
@@ -912,7 +912,7 @@ void GuiMenuBar::onMouseLeave(const GuiEvent &event)
    mMouseOverCounter = 0;
 }
 
-void GuiMenuBar::onMouseDragged(const GuiEvent &event)
+void GuiMenuBar::onTouchDragged(const GuiEvent &event)
 {
    Menu *hit = findHitMenu(event.mousePoint);
     
@@ -936,14 +936,14 @@ void GuiMenuBar::onMouseDragged(const GuiEvent &event)
     }
 }
 
-void GuiMenuBar::onMouseDown(const GuiEvent &event)
+void GuiMenuBar::onTouchDown(const GuiEvent &event)
 {
    mouseDownMenu = mouseOverMenu = findHitMenu(event.mousePoint);
     setUpdate();
    onAction();
 }
 
-void GuiMenuBar::onMouseUp(const GuiEvent &event)
+void GuiMenuBar::onTouchUp(const GuiEvent &event)
 {
    mouseDownMenu = NULL;
     setUpdate();
@@ -1086,13 +1086,13 @@ GuiMenuBackgroundCtrl::GuiMenuBackgroundCtrl(GuiMenuBar *ctrl, GuiMenuTextListCt
    mTextList = textList;
 }
 
-void GuiMenuBackgroundCtrl::onMouseDown(const GuiEvent &event)
+void GuiMenuBackgroundCtrl::onTouchDown(const GuiEvent &event)
 {
    mTextList->setSelectedCell(Point2I(-1,-1));
    mMenuBarCtrl->closeMenu();
 }
 
-void GuiMenuBackgroundCtrl::onMouseMove(const GuiEvent &event)
+void GuiMenuBackgroundCtrl::onTouchMove(const GuiEvent &event)
 {
    GuiCanvas *root = getRoot();
    GuiControl *ctrlHit = root->findHitControl(event.mousePoint, mLayer - 1);
@@ -1100,7 +1100,7 @@ void GuiMenuBackgroundCtrl::onMouseMove(const GuiEvent &event)
       mMenuBarCtrl->checkMenuMouseMove(event);
 }
 
-void GuiMenuBackgroundCtrl::onMouseDragged(const GuiEvent &event)
+void GuiMenuBackgroundCtrl::onTouchDragged(const GuiEvent &event)
 {
    GuiCanvas *root = getRoot();
    GuiControl *ctrlHit = root->findHitControl(event.mousePoint, mLayer - 1);
@@ -1211,13 +1211,13 @@ bool GuiMenuTextListCtrl::onKeyDown(const GuiEvent &event)
    return Parent::onKeyDown(event);
 }
 
-void GuiMenuTextListCtrl::onMouseDown(const GuiEvent &event)
+void GuiMenuTextListCtrl::onTouchDown(const GuiEvent &event)
 {
    Parent::onTouchDown(event);
    mMenuBarCtrl->closeMenu();
 }
 
-void GuiMenuTextListCtrl::onMouseUp(const GuiEvent &event)
+void GuiMenuTextListCtrl::onTouchUp(const GuiEvent &event)
 {
    // ok, this is kind of strange... but!
    // here's the deal: if we get a mouse up in this control
@@ -1225,7 +1225,7 @@ void GuiMenuTextListCtrl::onMouseUp(const GuiEvent &event)
    // so: activate the menu result as though this event were,
    // instead, a mouse down.
 
-   onMouseDown(event);
+   onTouchDown(event);
 }
 
 void GuiMenuTextListCtrl::onCellHighlighted(Point2I cell)
@@ -1249,7 +1249,7 @@ GuiSubmenuBackgroundCtrl::GuiSubmenuBackgroundCtrl(GuiMenuBar *ctrl, GuiMenuText
 {
 }
 
-void GuiSubmenuBackgroundCtrl::onMouseDown(const GuiEvent &event)
+void GuiSubmenuBackgroundCtrl::onTouchDown(const GuiEvent &event)
 {
    mTextList->setSelectedCell(Point2I(-1,-1));
    mMenuBarCtrl->closeMenu();

engine/source/gui/editor/guiMenuBar.h

@@ -39,9 +39,9 @@ protected:
    GuiMenuTextListCtrl *mTextList; 
 public:
    GuiMenuBackgroundCtrl(GuiMenuBar *ctrl, GuiMenuTextListCtrl* textList);
-   void onMouseDown(const GuiEvent &event);
-   void onMouseMove(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
+   void onTouchDown(const GuiEvent &event);
+   void onTouchMove(const GuiEvent &event);
+   void onTouchDragged(const GuiEvent &event);
 };
 
 class GuiSubmenuBackgroundCtrl : public GuiMenuBackgroundCtrl
@@ -51,7 +51,7 @@ class GuiSubmenuBackgroundCtrl : public GuiMenuBackgroundCtrl
 public:
    GuiSubmenuBackgroundCtrl(GuiMenuBar *ctrl, GuiMenuTextListCtrl* textList);
    bool pointInControl(const Point2I & parentCoordPoint);
-   void onMouseDown(const GuiEvent &event);
+   void onTouchDown(const GuiEvent &event);
 };
 
 //------------------------------------------------------------------------------
@@ -72,8 +72,8 @@ class GuiMenuTextListCtrl : public GuiTextListCtrl
 
       // GuiControl overloads:
       bool onKeyDown(const GuiEvent &event);
-        void onMouseDown(const GuiEvent &event);
-      void onMouseUp(const GuiEvent &event);
+      void onTouchDown(const GuiEvent &event);
+      void onTouchUp(const GuiEvent &event);
       void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
 
       virtual void onCellHighlighted(Point2I cell); // DAW: Added
@@ -191,11 +191,11 @@ public:
     void onRender(Point2I offset, const RectI &updateRect);
 
    void checkMenuMouseMove(const GuiEvent &event);
-   void onMouseMove(const GuiEvent &event);
-   void onMouseLeave(const GuiEvent &event);
-   void onMouseDown(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
+   void onTouchMove(const GuiEvent &event);
+   void onTouchLeave(const GuiEvent &event);
+   void onTouchDown(const GuiEvent &event);
+   void onTouchDragged(const GuiEvent &event);
+   void onTouchUp(const GuiEvent &event);
    
    void onAction();
    void closeMenu();

engine/source/gui/guiColorPicker.cc

@@ -793,7 +793,7 @@ Point2I GuiColorPickerCtrl::getSelectorPositionForColor(RectI &bounds, ColorF ta
 
 
 //--------------------------------------------------------------------------
-void GuiColorPickerCtrl::onMouseDown(const GuiEvent &event)
+void GuiColorPickerCtrl::onTouchDown(const GuiEvent &event)
 {
    if (!mActive)
       return;
@@ -812,11 +812,11 @@ void GuiColorPickerCtrl::onMouseDown(const GuiEvent &event)
    
    mMouseDown = true;
 
-   Con::executef(this, 1, "onMouseDown");
+   Con::executef(this, 1, "onTouchDown");
 }
 
 //--------------------------------------------------------------------------
-void GuiColorPickerCtrl::onMouseDragged(const GuiEvent &event)
+void GuiColorPickerCtrl::onTouchDragged(const GuiEvent &event)
 {
    if ((mActive && mMouseDown) || (mActive && (mDisplayMode == pDropperBackground)))
    {
@@ -828,38 +828,38 @@ void GuiColorPickerCtrl::onMouseDragged(const GuiEvent &event)
    if (!mActionOnMove && mAltConsoleCommand[0] )
       Con::evaluate( mAltConsoleCommand, false );
 
-   Con::executef(this, 1, "onMouseDragged");
+   Con::executef(this, 1, "onTouchDragged");
 }
 
 //--------------------------------------------------------------------------
-void GuiColorPickerCtrl::onMouseMove(const GuiEvent &event)
+void GuiColorPickerCtrl::onTouchMove(const GuiEvent &event)
 {
    // Only for dropper mode
    if (mActive && (mDisplayMode == pDropperBackground))
       setSelectorPos(globalToLocalCoord(event.mousePoint));
 
-   Con::executef(this, 1, "onMouseMove");
+   Con::executef(this, 1, "onTouchMove");
 }
 
 //--------------------------------------------------------------------------
-void GuiColorPickerCtrl::onMouseEnter(const GuiEvent &event)
+void GuiColorPickerCtrl::onTouchEnter(const GuiEvent &event)
 {
    mMouseOver = true;
 
-   Con::executef(this, 1, "onMouseEnter");
+   Con::executef(this, 1, "onTouchEnter");
 }
 
 //--------------------------------------------------------------------------
-void GuiColorPickerCtrl::onMouseLeave(const GuiEvent &)
+void GuiColorPickerCtrl::onTouchLeave(const GuiEvent &)
 {
    // Reset state
    mMouseOver = false;
 
-   Con::executef(this, 1, "onMouseLeave");
+   Con::executef(this, 1, "onTouchLeave");
 }
 
 //--------------------------------------------------------------------------
-void GuiColorPickerCtrl::onMouseUp(const GuiEvent &)
+void GuiColorPickerCtrl::onTouchUp(const GuiEvent &)
 {
    //if we released the mouse within this control, perform the action
    if (mActive && mMouseDown && (mDisplayMode != pDropperBackground)) 
@@ -876,7 +876,7 @@ void GuiColorPickerCtrl::onMouseUp(const GuiEvent &)
    
    mouseUnlock();
 
-   Con::executef(this, 1, "onMouseUp");
+   Con::executef(this, 1, "onTouchUp");
 }
 
 //--------------------------------------------------------------------------

engine/source/gui/guiColorPicker.h

@@ -131,13 +131,13 @@ class GuiColorPickerCtrl : public GuiControl
    
    /// @name Input Events
    /// @{
-   void onMouseDown(const GuiEvent &);
-   void onMouseUp(const GuiEvent &);
-   void onMouseMove(const GuiEvent &event);
-   void onMouseDragged(const GuiEvent &event);
+   void onTouchDown(const GuiEvent &);
+   void onTouchUp(const GuiEvent &);
+   void onTouchMove(const GuiEvent &event);
+   void onTouchDragged(const GuiEvent &event);
 
-   void onMouseEnter(const GuiEvent &);
-   void onMouseLeave(const GuiEvent &);
+   void onTouchEnter(const GuiEvent &);
+   void onTouchLeave(const GuiEvent &);
    /// @}
 };
 

engine/source/gui/guiControl.cc

@@ -482,6 +482,14 @@ void GuiControl::onRender(Point2I offset, const RectI &updateRect)
 
 RectI GuiControl::applyMargins(Point2I offset, Point2I extent, GuiControlState currentState, GuiControlProfile *profile)
 {
+   if (!profile)
+   {
+      SimObject * obj = Sim::findObject("GuiDefaultProfile");
+      if (obj)
+      {
+         profile = dynamic_cast<GuiControlProfile*>(obj);
+      }
+   }
 	//Get the border profiles
 	GuiBorderProfile *leftProfile = profile->getLeftBorder();
 	GuiBorderProfile *rightProfile = profile->getRightBorder();
@@ -498,6 +506,14 @@ RectI GuiControl::applyMargins(Point2I offset, Point2I extent, GuiControlState c
 
 RectI GuiControl::applyBorders(Point2I offset, Point2I extent, GuiControlState currentState, GuiControlProfile *profile)
 {
+   if (!profile)
+   {
+      SimObject * obj = Sim::findObject("GuiDefaultProfile");
+      if (obj)
+      {
+         profile = dynamic_cast<GuiControlProfile*>(obj);
+      }
+   }
 	//Get the border profiles
 	GuiBorderProfile *leftProfile = profile->getLeftBorder();
 	GuiBorderProfile *rightProfile = profile->getRightBorder();
@@ -514,6 +530,14 @@ RectI GuiControl::applyBorders(Point2I offset, Point2I extent, GuiControlState c
 
 RectI GuiControl::applyPadding(Point2I offset, Point2I extent, GuiControlState currentState, GuiControlProfile *profile)
 {
+   if (!profile)
+   {
+      SimObject * obj = Sim::findObject("GuiDefaultProfile");
+      if (obj)
+      {
+         profile = dynamic_cast<GuiControlProfile*>(obj);
+      }
+   }
 	//Get the border profiles
 	GuiBorderProfile *leftProfile = profile->getLeftBorder();
 	GuiBorderProfile *rightProfile = profile->getRightBorder();
@@ -530,6 +554,14 @@ RectI GuiControl::applyPadding(Point2I offset, Point2I extent, GuiControlState c
 
 RectI GuiControl::getInnerRect(Point2I offset, Point2I extent, GuiControlState currentState, GuiControlProfile *profile)
 {
+   if (!profile)
+   {
+      SimObject * obj = Sim::findObject("GuiDefaultProfile");
+      if (obj)
+      {
+         profile = dynamic_cast<GuiControlProfile*>(obj);
+      }
+   }
 	//Get the border profiles
 	GuiBorderProfile *leftProfile = profile->getLeftBorder();
 	GuiBorderProfile *rightProfile = profile->getRightBorder();
@@ -546,6 +578,14 @@ RectI GuiControl::getInnerRect(Point2I offset, Point2I extent, GuiControlState c
 
 Point2I GuiControl::getOuterExtent(Point2I innerExtent, GuiControlState currentState, GuiControlProfile *profile)
 {
+   if (!profile)
+   {
+      SimObject * obj = Sim::findObject("GuiDefaultProfile");
+      if (obj)
+      {
+         profile = dynamic_cast<GuiControlProfile*>(obj);
+      }
+   }
 	//Get the border profiles
 	GuiBorderProfile *leftProfile = profile->getLeftBorder();
 	GuiBorderProfile *rightProfile = profile->getRightBorder();

engine/source/gui/guiListBoxCtrl.cc

@@ -762,15 +762,15 @@ void GuiListBoxCtrl::drawBox(const Point2I &box, S32 size, ColorI &outlineColor,
 // Mouse Events
 //////////////////////////////////////////////////////////////////////////
 
-void GuiListBoxCtrl::onMouseDragged(const GuiEvent &event)
+void GuiListBoxCtrl::onTouchDragged(const GuiEvent &event)
 {
    Parent::onTouchDragged(event);
 
-   if(isMethod("onMouseDragged"))
-      Con::executef(this, 1, "onMouseDragged");
+   if(isMethod("onTouchDragged"))
+      Con::executef(this, 1, "onTouchDragged");
 }
 
-void GuiListBoxCtrl::onMouseDown( const GuiEvent &event )
+void GuiListBoxCtrl::onTouchDown( const GuiEvent &event )
 {
    Point2I localPoint = globalToLocalCoord(event.mousePoint);
    

engine/source/gui/guiListBoxCtrl.h

@@ -113,8 +113,8 @@ public:
    void              drawBox( const Point2I &box, S32 size, ColorI &outlineColor, ColorI &boxColor );
 
    // Mouse Events
-   virtual void      onMouseDown( const GuiEvent &event );
-   virtual void      onMouseDragged(const GuiEvent &event);
+   virtual void      onTouchDown( const GuiEvent &event );
+   virtual void      onTouchDragged(const GuiEvent &event);
 
    // String Utility
    static U32        getStringElementCount( const char *string );

engine/source/gui/guiPopUpCtrl.cc

@@ -97,7 +97,7 @@ GuiPopUpBackgroundCtrl::GuiPopUpBackgroundCtrl(GuiPopUpMenuCtrl *ctrl, GuiPopupT
    mTextList = textList;
 }
 
-void GuiPopUpBackgroundCtrl::onMouseDown(const GuiEvent &event)
+void GuiPopUpBackgroundCtrl::onTouchDown(const GuiEvent &event)
 {
    //   mTextList->setSelectedCell(Point2I(-1,-1)); // DAW: Removed
    mPopUpCtrl->mBackgroundCancel = true; // DAW: Set that the user didn't click within the text list.  Replaces the line above.
@@ -170,7 +170,7 @@ bool GuiPopupTextListCtrl::onKeyDown(const GuiEvent &event)
    return Parent::onKeyDown(event);
 }
 
-void GuiPopupTextListCtrl::onMouseDown(const GuiEvent &event)
+void GuiPopupTextListCtrl::onTouchDown(const GuiEvent &event)
 {
    // Moved to onMouseUp in order to capture the mouse for the entirety of the click. ADL.
    // This also has the side effect of allowing the mouse to be held down and a selection made.
@@ -178,7 +178,7 @@ void GuiPopupTextListCtrl::onMouseDown(const GuiEvent &event)
    //mPopUpCtrl->closePopUp();
 }
 
-void GuiPopupTextListCtrl::onMouseUp(const GuiEvent &event)
+void GuiPopupTextListCtrl::onTouchUp(const GuiEvent &event)
 {
    Parent::onTouchDown(event);
    mPopUpCtrl->closePopUp();
@@ -1454,7 +1454,7 @@ bool GuiPopUpMenuCtrl::getColoredBox( ColorI &fontColor, S32 id )
 }
 
 //------------------------------------------------------------------------------
-void GuiPopUpMenuCtrl::onMouseDown(const GuiEvent &event)
+void GuiPopUpMenuCtrl::onTouchDown(const GuiEvent &event)
 {
     if ( !mVisible || !mActive || !mAwake )
       return;
@@ -1463,7 +1463,7 @@ void GuiPopUpMenuCtrl::onMouseDown(const GuiEvent &event)
 }
 
 //------------------------------------------------------------------------------
-void GuiPopUpMenuCtrl::onMouseUp(const GuiEvent &event)
+void GuiPopUpMenuCtrl::onTouchUp(const GuiEvent &event)
 {
     if ( !mVisible || !mActive || !mAwake )
       return;
@@ -1471,7 +1471,7 @@ void GuiPopUpMenuCtrl::onMouseUp(const GuiEvent &event)
 
 //------------------------------------------------------------------------------
 // DAW: Added
-void GuiPopUpMenuCtrl::onMouseEnter(const GuiEvent &event)
+void GuiPopUpMenuCtrl::onTouchEnter(const GuiEvent &event)
 {
     if ( !mVisible || !mActive || !mAwake )
       return;
@@ -1480,7 +1480,7 @@ void GuiPopUpMenuCtrl::onMouseEnter(const GuiEvent &event)
 
 //------------------------------------------------------------------------------
 // DAW: Added
-void GuiPopUpMenuCtrl::onMouseLeave(const GuiEvent &)
+void GuiPopUpMenuCtrl::onTouchLeave(const GuiEvent &)
 {
     if ( !mVisible || !mActive || !mAwake )
       return;

engine/source/gui/guiPopUpCtrl.h

@@ -45,7 +45,7 @@ protected:
    GuiPopupTextListCtrl *mTextList; 
 public:
    GuiPopUpBackgroundCtrl(GuiPopUpMenuCtrl *ctrl, GuiPopupTextListCtrl* textList);
-   void onMouseDown(const GuiEvent &event);
+   void onTouchDown(const GuiEvent &event);
 };
 
 class GuiPopupTextListCtrl : public GuiTextListCtrl
@@ -65,8 +65,8 @@ public:
 
    // GuiControl overloads:
    bool onKeyDown(const GuiEvent &event);
-   void onMouseDown(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
+   void onTouchDown(const GuiEvent &event);
+   void onTouchUp(const GuiEvent &event);
    void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
 };
 
@@ -137,10 +137,10 @@ public:
    void onAction();
    virtual void closePopUp();
    void clear();
-   void onMouseDown(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
-   void onMouseEnter(const GuiEvent &event); // DAW: Added
-   void onMouseLeave(const GuiEvent &); // DAW: Added
+   void onTouchDown(const GuiEvent &event);
+   void onTouchUp(const GuiEvent &event);
+   void onTouchEnter(const GuiEvent &event); // DAW: Added
+   void onTouchLeave(const GuiEvent &); // DAW: Added
    void setupAutoScroll(const GuiEvent &event);
    void autoScroll();
    bool onKeyDown(const GuiEvent &event);

engine/source/gui/guiPopUpCtrlEx.cc

@@ -97,7 +97,7 @@ GuiPopUpBackgroundCtrlEx::GuiPopUpBackgroundCtrlEx(GuiPopUpMenuCtrlEx *ctrl, Gui
    mTextList = textList;
 }
 
-void GuiPopUpBackgroundCtrlEx::onMouseDown(const GuiEvent &event)
+void GuiPopUpBackgroundCtrlEx::onTouchDown(const GuiEvent &event)
 {
 //   mTextList->setSelectedCell(Point2I(-1,-1)); // DAW: Removed
    mPopUpCtrl->mBackgroundCancel = true; // DAW: Set that the user didn't click within the text list.  Replaces the line above.
@@ -181,7 +181,7 @@ bool GuiPopupTextListCtrlEx::onKeyDown(const GuiEvent &event)
    return Parent::onKeyDown(event);
 }
 
-void GuiPopupTextListCtrlEx::onMouseUp(const GuiEvent &event)
+void GuiPopupTextListCtrlEx::onTouchUp(const GuiEvent &event)
 {
     if(!mActive)
         return;
@@ -203,7 +203,7 @@ void GuiPopupTextListCtrlEx::onMouseUp(const GuiEvent &event)
    Parent::onTouchUp(event);
 }
 
-void GuiPopupTextListCtrlEx::onMouseMove( const GuiEvent &event )
+void GuiPopupTextListCtrlEx::onTouchMove( const GuiEvent &event )
 {
    if( !mPopUpCtrl || !mPopUpCtrl->isMethod("onHotTrackItem") )
       return Parent::onTouchMove( event );
@@ -1440,7 +1440,7 @@ bool GuiPopUpMenuCtrlEx::getColoredBox( ColorI &fontColor, S32 id )
 }
 
 //------------------------------------------------------------------------------
-void GuiPopUpMenuCtrlEx::onMouseDown(const GuiEvent &event)
+void GuiPopUpMenuCtrlEx::onTouchDown(const GuiEvent &event)
 {
    if(!mActive)
        return;
@@ -1449,20 +1449,20 @@ void GuiPopUpMenuCtrlEx::onMouseDown(const GuiEvent &event)
 }
 
 //------------------------------------------------------------------------------
-void GuiPopUpMenuCtrlEx::onMouseUp(const GuiEvent &event)
+void GuiPopUpMenuCtrlEx::onTouchUp(const GuiEvent &event)
 {
 }
 
 //------------------------------------------------------------------------------
 // DAW: Added
-void GuiPopUpMenuCtrlEx::onMouseEnter(const GuiEvent &event)
+void GuiPopUpMenuCtrlEx::onTouchEnter(const GuiEvent &event)
 {
    mMouseOver = true;
 }
 
 //------------------------------------------------------------------------------
 // DAW: Added
-void GuiPopUpMenuCtrlEx::onMouseLeave(const GuiEvent &)
+void GuiPopUpMenuCtrlEx::onTouchLeave(const GuiEvent &)
 {
    mMouseOver = false;
 }
@@ -1512,7 +1512,7 @@ void GuiPopUpMenuCtrlEx::autoScroll()
       mSc->scrollByRegion(mScrollDir);
       mScrollCount -= 1;
    }
-   mTl->onMouseMove(mEventSave);
+   mTl->onTouchMove(mEventSave);
 }
 
 //------------------------------------------------------------------------------

engine/source/gui/guiPopUpCtrlEx.h

@@ -63,7 +63,7 @@ protected:
    GuiPopupTextListCtrlEx *mTextList; 
 public:
    GuiPopUpBackgroundCtrlEx(GuiPopUpMenuCtrlEx *ctrl, GuiPopupTextListCtrlEx* textList);
-   void onMouseDown(const GuiEvent &event);
+   void onTouchDown(const GuiEvent &event);
 };
 
 class GuiPopupTextListCtrlEx : public GuiTextListCtrl
@@ -85,8 +85,8 @@ class GuiPopupTextListCtrlEx : public GuiTextListCtrl
 
       // GuiControl overloads:
       bool onKeyDown(const GuiEvent &event);
-      void onMouseUp(const GuiEvent &event);
-      void onMouseMove(const GuiEvent &event);
+      void onTouchUp(const GuiEvent &event);
+      void onTouchMove(const GuiEvent &event);
       void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
 };
 
@@ -158,10 +158,10 @@ class GuiPopUpMenuCtrlEx : public GuiControl
    void onAction();
    virtual void closePopUp();
    void clear();
-   void onMouseDown(const GuiEvent &event);
-   void onMouseUp(const GuiEvent &event);
-   void onMouseEnter(const GuiEvent &event); // DAW: Added
-   void onMouseLeave(const GuiEvent &); // DAW: Added
+   void onTouchDown(const GuiEvent &event);
+   void onTouchUp(const GuiEvent &event);
+   void onTouchEnter(const GuiEvent &event); // DAW: Added
+   void onTouchLeave(const GuiEvent &); // DAW: Added
    void setupAutoScroll(const GuiEvent &event);
    void autoScroll();
    bool onKeyDown(const GuiEvent &event);

engine/source/gui/guiTreeViewCtrl.cc

@@ -1136,11 +1136,11 @@ bool GuiTreeViewCtrl::buildIconTable(const char * icons)
    // This is an abominal piece of code. -- BJG
    if (!icons)
    {
-      icons =  "common/gui/images/default:"
-               "common/gui/images/simgroup:"
-               "common/gui/images/simgroupClosed:"
-               "common/gui/images/simgroupSelected:"
-               "common/gui/images/simgroupSelectedClosed:";
+      icons =  "^Sandbox/gui/images/default:"
+               "^Sandbox/gui/images/simgroup:"
+               "^Sandbox/gui/images/simgroupClosed:"
+               "^Sandbox/gui/images/simgroupSelected:"
+               "^Sandbox/gui/images/simgroupSelectedClosed:";
    }
 
    // Figure the size of the buffer we need...
@@ -2215,7 +2215,7 @@ bool GuiTreeViewCtrl::onKeyDown( const GuiEvent& event )
 //------------------------------------------------------------------------------
 // on mouse up look at the current item and check to see if it is valid
 // to move the selected item(s) to it.
-void GuiTreeViewCtrl::onMouseUp(const GuiEvent &event)
+void GuiTreeViewCtrl::onTouchUp(const GuiEvent &event)
 {
    if( !mActive || !mAwake || !mVisible )
       return;
@@ -2608,7 +2608,7 @@ void GuiTreeViewCtrl::onMouseUp(const GuiEvent &event)
 }
 
 //------------------------------------------------------------------------------
-void GuiTreeViewCtrl::onMouseDragged(const GuiEvent &event)
+void GuiTreeViewCtrl::onTouchDragged(const GuiEvent &event)
 {
     if(!mSupportMouseDragging) return;
    if( !mActive || !mAwake || !mVisible )
@@ -2700,7 +2700,7 @@ void GuiTreeViewCtrl::onMiddleMouseDown(const GuiEvent & event)
 }
 
 
-void GuiTreeViewCtrl::onMouseDown(const GuiEvent & event)
+void GuiTreeViewCtrl::onTouchDown(const GuiEvent & event)
 {
    if( !mActive || !mAwake || !mVisible )
    {
@@ -2874,7 +2874,7 @@ void GuiTreeViewCtrl::onMouseDown(const GuiEvent & event)
 
 
 //------------------------------------------------------------------------------
-void GuiTreeViewCtrl::onMouseMove( const GuiEvent &event )
+void GuiTreeViewCtrl::onTouchMove( const GuiEvent &event )
 {
    if ( mMouseOverCell.y >= 0 && mVisibleItems.size() > mMouseOverCell.y)
       mVisibleItems[mMouseOverCell.y]->mState.clear( Item::MouseOverBmp | Item::MouseOverText );
@@ -2902,15 +2902,15 @@ void GuiTreeViewCtrl::onMouseMove( const GuiEvent &event )
 
 
 //------------------------------------------------------------------------------
-void GuiTreeViewCtrl::onMouseEnter( const GuiEvent &event )
+void GuiTreeViewCtrl::onTouchEnter( const GuiEvent &event )
 {
    Parent::onTouchEnter( event );
-   onMouseMove( event );
+   onTouchMove( event );
 }
 
 
 //------------------------------------------------------------------------------
-void GuiTreeViewCtrl::onMouseLeave( const GuiEvent &event )
+void GuiTreeViewCtrl::onTouchLeave( const GuiEvent &event )
 {
    if ( mMouseOverCell.y >= 0 && mVisibleItems.size() > mMouseOverCell.y)
       mVisibleItems[mMouseOverCell.y]->mState.clear( Item::MouseOverBmp | Item::MouseOverText );

engine/source/gui/guiTreeViewCtrl.h

@@ -376,14 +376,14 @@ protected:
       void onSleep();
       void onPreRender();
       bool onKeyDown( const GuiEvent &event );
-		void onMouseDown(const GuiEvent &event);
+		void onTouchDown(const GuiEvent &event);
       void onMiddleMouseDown(const GuiEvent &event);
-      void onMouseMove(const GuiEvent &event);
-      void onMouseEnter(const GuiEvent &event);
-      void onMouseLeave(const GuiEvent &event);
+      void onTouchMove(const GuiEvent &event);
+      void onTouchEnter(const GuiEvent &event);
+      void onTouchLeave(const GuiEvent &event);
       void onRightMouseDown(const GuiEvent &event);
-      void onMouseDragged(const GuiEvent &event);
-      void onMouseUp(const GuiEvent &event);
+      void onTouchDragged(const GuiEvent &event);
+      void onTouchUp(const GuiEvent &event);
 
       /// Returns false if the object is a child of one of the inner items.
       bool childSearch(Item * item, SimObject *obj, bool yourBaby);

engine/source/gui/guiTypes.cc

@@ -173,6 +173,34 @@ S32 GuiBorderProfile::getPadding(const GuiControlState state)
 	return getMax(mPadding[getStateIndex(state)], 0);
 }
 
+ConsoleType(GuiProfile, TypeGuiBorderProfile, sizeof(GuiBorderProfile*), "")
+
+ConsoleSetType(TypeGuiBorderProfile)
+{
+   GuiBorderProfile *profile = NULL;
+   if (argc == 1)
+      Sim::findObject(argv[0], profile);
+
+   AssertWarn(profile != NULL, avar("GuiBorderProfile: requested gui profile (%s) does not exist.", argv[0]));
+   if (!profile)
+      profile = dynamic_cast<GuiBorderProfile*>(Sim::findObject("GuiDefaultBorderProfile"));
+
+   AssertFatal(profile != NULL, avar("GuiBorderProfile: unable to find specified profile (%s) and GuiDefaultProfile does not exist!", argv[0]));
+
+   GuiBorderProfile **obj = (GuiBorderProfile **)dptr;
+   if ((*obj) == profile)
+      return;
+}
+
+ConsoleGetType(TypeGuiBorderProfile)
+{
+   static char returnBuffer[256];
+
+   GuiBorderProfile **obj = (GuiBorderProfile**)dptr;
+   dSprintf(returnBuffer, sizeof(returnBuffer), "%s", *obj ? (*obj)->getName() ? (*obj)->getName() : (*obj)->getIdString() : "");
+   return returnBuffer;
+}
+
 //------------------------------------------------------------------------------
 IMPLEMENT_CONOBJECT(GuiControlProfile);
 
@@ -406,7 +434,7 @@ S32 GuiControlProfile::constructBitmapArray()
 
 void GuiControlProfile::incRefCount()
 {
-	if(!mRefCount++)
+	if(!mRefCount)
 	{
 		sFontCacheDirectory = Con::getVariable("$GUI::fontCacheDirectory");
 
@@ -429,11 +457,17 @@ void GuiControlProfile::incRefCount()
 			mImageAsset = mImageAssetID;
 		}
 	}
+
+   mRefCount++;
+
 }
 
 void GuiControlProfile::decRefCount()
 {
-   AssertFatal(mRefCount, "GuiControlProfile::decRefCount: zero ref count");
+   // Not sure why this was being tripped when
+   // switching profiles in guieditor, but...
+
+   //AssertFatal(mRefCount, "GuiControlProfile::decRefCount: zero ref count");
    if(!mRefCount)
 	  return;
 

engine/source/gui/guiTypes.h

@@ -149,7 +149,7 @@ public:
 	const ColorI& getBorderColor(const GuiControlState state); //Returns the correct border color based on the control's state.
 	S32 getPadding(const GuiControlState state); //Returns the padding based on the control's state.
 };
-
+DefineConsoleType(TypeGuiBorderProfile)
 /// A GuiControlProfile is used by every GuiObject and is akin to a
 /// datablock. It is used to control information that does not change
 /// or is unlikely to change during execution of a program. It is also

toybox/Sandbox/1/gui/guiProfiles.cs

@@ -78,13 +78,65 @@ new GuiCursor(DefaultCursor)
     bitmapName = "^Sandbox/gui/images/defaultCursor";
 };
 
+new GuiCursor(LeftRightCursor)
+{
+   hotSpot = "0.5 0";
+   renderOffset = "0.5 0";
+   bitmapName = "./Images/leftRight";
+};
+
+new GuiCursor(UpDownCursor)
+{
+   hotSpot = "1 1";
+   renderOffset = "0 1";
+   bitmapName = "./Images/upDown";
+};
+
+new GuiCursor(NWSECursor)
+{
+   hotSpot = "1 1";
+   renderOffset = "0.5 0.5";
+   bitmapName = "./Images/NWSE";
+};
+
+new GuiCursor(NESWCursor)
+{
+   hotSpot = "1 1";
+   renderOffset = "0.5 0.5";
+   bitmapName = "./Images/NESW";
+};
+
+new GuiCursor(MoveCursor)
+{
+   hotSpot = "1 1";
+   renderOffset = "0.5 0.5";
+   bitmapName = "./Images/move";
+};
+
 if (!isObject(GuiDefaultBorderProfile)) new GuiBorderProfile (GuiDefaultBorderProfile)
 {
+	// Default margin
+	margin = 0;
+	marginHL = 0;
+	marginSL = 0;
+	marginNA = 0;
+	//Default Border
 	border = 0;
-    borderColor   = $color1;
-    borderColorHL = AdjustColorValue($color1, 10);
-    borderColorSL = AdjustColorValue($color1, 10);
-    borderColorNA = SetColorAlpha($color1, 100);
+	borderHL = 0;
+	borderSL = 0;
+	borderNA = 0;
+	//Default border color
+	borderColor   = "100 100 100 255";
+	borderColorHL = "128 128 128";
+	borderColorSL = "255 255 255 50";
+	borderColorNA = "64 64 64";
+	//Default Padding
+	padding = 0;
+	paddingHL = 0;
+	paddingSL = 0;
+	paddingNA = 0;
+	//Default underfill
+	underfill = true;
 };
 
 if (!isObject(GuiBrightBorderProfile)) new GuiBorderProfile (GuiBrightBorderProfile : GuiDefaultBorderProfile)
@@ -125,15 +177,72 @@ if(!isObject(GuiDefaultProfile)) new GuiControlProfile (GuiDefaultProfile)
 	cursorColor = "0 0 0 255";
 
 	borderDefault = GuiDefaultBorderProfile;
+	borderTop = GuiDefaultBorderProfile;
+	borderLeft = GuiDefaultBorderProfile;
+	borderRight = GuiDefaultBorderProfile;
+	borderBottom = GuiDefaultBorderProfile;
+};
+
+if(!isObject(GuiPanelProfile)) new GuiControlProfile (GuiPanelProfile : GuiDefaultProfile)
+{
+	fillColor = $color1;
+    fillColorHL = AdjustColorValue($color1, 10);
+    fillColorSL = AdjustColorValue($color1, 15);
+    fillColorNA = SetColorAlpha($color1, 100);
+	borderDefault = GuiDarkBorderProfile;
+	borderTop = GuiBrightBorderProfile;
+	borderBottom = GuiBrightBorderProfile;
+	borderLeft = GuiBrightBorderProfile;
+	borderRight = GuiBrightBorderProfile;
+};
+
+if(!isObject(GuiListBoxProfile)) new GuiControlProfile (GuiListBoxProfile : GuiDefaultProfile)
+{
+    // fill color
+    fillColor = $color1;
+    fillColorHL = AdjustColorValue($color1, 10);
+    fillColorSL = AdjustColorValue($color1, 15);
+    fillColorNA = SetColorAlpha($color1, 100);
+	align = left;
+	tab = true;
+	canKeyFocus = true;
+};
+
+if(!isObject(GuiWindowProfile)) new GuiControlProfile (GuiWindowProfile : GuiDefaultProfile)
+{
+   opaque = true;
+   modal = true;
+   justify = "center";
+   textOffset = "10 4";
+   bitmap = "./images/window";
+   fillColor = "37 36 35 255";
+   fontColor = "white";
 };
 
 if(!isObject(GuiTransparentProfile)) new GuiControlProfile (GuiTransparentProfile : GuiDefaultProfile);
+if(!isObject(GuiGridProfile)) new GuiControlProfile (GuiGridProfile : GuiDefaultProfile);
+if(!isObject(GuiChainProfile)) new GuiControlProfile (GuiChainProfile : GuiDefaultProfile);
 
 if(!isObject(GuiSpriteProfile)) new GuiControlProfile (GuiSpriteProfile : GuiDefaultProfile)
 {
 	FillColor = "255 255 255 255";
 };
 
+// ----------------------------------------------------------------------------
+if (!isObject(GuiTreeViewProfile)) new GuiControlProfile (GuiTreeViewProfile : GuiDefaultProfile)
+{
+	fontColor = "255 255 255 255";
+    fontColorHL = "232 240 248 255";
+    fontColorSL= "255 255 255 255";
+    fontColorNA = "0 0 0 255";
+	fillColor = $color1;
+	fillColorHL = AdjustColorValue($color1, 10);
+	fillColorSL = AdjustColorValue($color1, 15);
+	fillColorNA = SetColorAlpha($color1, 100);
+	bitmap = "./images/treeView";
+	canKeyFocus = true;
+	autoSizeHeight = true;
+};
 // ----------------------------------------------------------------------------
 
 if (!isObject(GuiSolidBorderProfile)) new GuiBorderProfile (GuiSolidBorderProfile : GuiDefaultBorderProfile)
@@ -187,12 +296,19 @@ if (!isObject(GuiPopUpMenuDefault)) new GuiControlProfile (GuiPopUpMenuDefault :
 
 if (!isObject(GuiPopUpMenuProfile)) new GuiControlProfile (GuiPopUpMenuProfile : GuiPopUpMenuDefault)
 {
-    textOffset = "6 3";
     align = "center";
-    bitmap = "^Sandbox/gui/images/dropDown";
+    bitmap = "^Sandbox/gui/images/dropDown1";
     profileForChildren = GuiPopUpMenuDefault;
 };
 
+if (!isObject(GuiPopUpMenuProfile2)) new GuiControlProfile (GuiPopUpMenuProfile2 : GuiPopUpMenuProfile)
+{
+	fontColor = $color3;
+    bitmap = "^Sandbox/gui/images/dropDown2";
+    profileForChildren = GuiPopUpMenuDefault;
+};
+
+
 //-----------------------------------------------------------------------------
 
 if (!isObject(GuiTextProfile)) new GuiControlProfile (GuiTextProfile : GuiDefaultProfile)
@@ -207,6 +323,18 @@ if (!isObject(GuiTextProfile)) new GuiControlProfile (GuiTextProfile : GuiDefaul
     cursorColor = "0 0 0 255";
 };
 
+if(!isObject(GuiTextArrayProfile)) new GuiControlProfile (GuiTextArrayProfile : GuiTextProfile)
+{
+   fontColorHL = $color3;
+   fillColorHL = AdjustColorValue($color1, 10);
+};
+
+if (!isObject(GuiTextRightProfile)) new GuiControlProfile (GuiTextRightProfile : GuiTextProfile)
+{
+
+    align = "right";
+};
+
 //-----------------------------------------------------------------------------
 
 if (!isObject(GuiCheckBoxProfile)) new GuiControlProfile (GuiCheckBoxProfile : GuiDefaultProfile)
@@ -237,7 +365,7 @@ if (!isObject(GuiTextEditProfile)) new GuiControlProfile (GuiTextEditProfile : G
     fillColor = "232 240 248 255";
     fillColorHL = "251 170 0 255";
     fillColorNA = "127 127 127 52";
-    bitmap = "^Sandbox/gui/images/textEdit.png";
+    bitmap = "^Sandbox/gui/images/smallButtonContainer.png";
     fontColor = "27 59 95 255";
     fontColorHL = "232 240 248 255";
     fontColorNA = "0 0 0 52";
@@ -354,6 +482,13 @@ if (!isObject(GuiButtonProfile)) new GuiControlProfile (GuiButtonProfile : GuiDe
     bitmap = "^Sandbox/gui/images/smallButtonContainer";
 };
 
+if (!isObject(GuiButtonDynProfile)) new GuiControlProfile (GuiButtonDynProfile : GuiButtonProfile)
+{
+    fontColor = "0 0 0 255";
+    fontColorHL = $color5;
+    bitmap = "^Sandbox/gui/images/smallButtonContainer";
+};
+
 //-----------------------------------------------------------------------------
 
 if (!isObject(GuiNorthButtonProfile)) new GuiControlProfile (GuiNorthButtonProfile : GuiDefaultProfile)