Integrating latest 47acbe8

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerSearchWidget.h

@@ -20,7 +20,11 @@
 #include <QStandardItem>
 #endif
 
+#if !defined(DEFINED_QMETATYPE_UUID)
+#define DEFINED_QMETATYPE_UUID
+
 Q_DECLARE_METATYPE(AZ::Uuid);
+#endif
 
 namespace Ui
 {
@@ -111,4 +115,4 @@ namespace AzQtComponents
     private:
         SearchTypeSelector* m_selector = nullptr;
     };
-}
+}

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.cpp

@@ -19,9 +19,7 @@
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
 
-#include <AzToolsFramework/API/ToolsApplicationAPI.h>
-#include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
-#include <AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.hxx>
+#include <AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx>
 
 #include <QVBoxLayout>
 
@@ -55,6 +53,36 @@ void QComponentEntityEditorOutlinerWindow::Init()
     setCentralWidget(window);
 }
 
+QEntityOutlinerWindow::QEntityOutlinerWindow(QWidget* parent)
+    : QMainWindow(parent)
+    , m_outlinerWidget(nullptr)
+{
+    gEnv->pSystem->GetISystemEventDispatcher()->RegisterListener(this);
+
+    Init();
+}
+
+QEntityOutlinerWindow::~QEntityOutlinerWindow()
+{
+    gEnv->pSystem->GetISystemEventDispatcher()->RemoveListener(this);
+}
+
+void QEntityOutlinerWindow::OnSystemEvent([[maybe_unused]] ESystemEvent event, [[maybe_unused]] UINT_PTR wparam, [[maybe_unused]] UINT_PTR lparam)
+{
+}
+
+void QEntityOutlinerWindow::Init()
+{
+    QVBoxLayout* layout = new QVBoxLayout();
+
+    m_outlinerWidget = new AzToolsFramework::EntityOutlinerWidget(nullptr);
+    layout->addWidget(m_outlinerWidget);
+
+    QWidget* window = new QWidget();
+    window->setLayout(layout);
+    setCentralWidget(window);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // End of context menu handling
 ///////////////////////////////////////////////////////////////////////////////

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/QComponentEntityEditorOutlinerWindow.h

@@ -26,6 +26,11 @@ namespace AZ
     class Entity;
 }
 
+namespace AzToolsFramework
+{
+    class EntityOutlinerWidget;
+}
+
 class OutlinerWidget;
 
 // This is the shell class to interface between Qt and the Sandbox.  All Sandbox implementation is retained in an inherited class.
@@ -60,3 +65,36 @@ public:
 private:
     OutlinerWidget* m_outlinerWidget;
 };
+
+// This is the shell class to interface between Qt and the Sandbox.  All Sandbox implementation is retained in an inherited class.
+class QEntityOutlinerWindow
+    : public QMainWindow
+    , public ISystemEventListener
+{
+    Q_OBJECT
+
+public:
+    explicit QEntityOutlinerWindow(QWidget* parent = 0);
+    ~QEntityOutlinerWindow();
+
+    void Init();
+
+    // Used to receive events from widgets where SIGNALS aren't available or implemented yet.
+    // Required override.
+    void OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_PTR lparam) override;
+
+    // you are required to implement this to satisfy the unregister/registerclass requirements on "AzToolsFramework::RegisterViewPane"
+    // make sure you pick a unique GUID
+    static const GUID& GetClassID()
+    {
+        // {CEE50D0E-46A8-4CB4-9C5F-DCD374A78032}
+        static const GUID guid =
+        {
+            0xcee50d0e, 0x46a8, 0x4cb4, { 0x9c, 0x5f, 0xdc, 0xd3, 0x74, 0xa7, 0x80, 0x32 }
+        };
+        return guid;
+    }
+
+private:
+    AzToolsFramework::EntityOutlinerWidget* m_outlinerWidget;
+};