Main toolbar consolidation and cleanup (#1167)

* Moving menu options around

* Consolidation and moving of toolbar functioanlity

* Fixed non-unity build missing header

* Updated camera icon to the correct one

* Addressed review feedback

* Addressed review feedback

* Moved icons to new folder structure/naming

Code/Sandbox/Editor/LayoutWnd.h

@@ -20,7 +20,6 @@
 
 #if !defined(Q_MOC_RUN)
 #include "Viewport.h"
-#include "InfoBar.h"
 
 #include <QSplitter>
 #include <QPointer>
@@ -77,8 +76,6 @@ private:
     friend class CLayoutWnd;
 };
 
-class InfoBarExpanderWatcher;
-
 /** Main layout window.
 */
 class CLayoutWnd
@@ -116,8 +113,6 @@ public:
     //! Switch 2D viewports.
     void Cycle2DViewport();
 
-    CInfoBar& GetInfoBar() { return *m_infoBar; }
-
 public slots:
     void ResetLayout();
 
@@ -162,11 +157,8 @@ private:
     // Id of maximized view pane.
     int m_maximizedViewId;
 
-    CInfoBar* m_infoBar;
-    QToolBar* m_infoToolBar;
     QSize m_infoBarSize;
     QSettings* m_settings;
-    InfoBarExpanderWatcher* m_expanderWatcher;
 };
 
 /////////////////////////////////////////////////////////////////////////////