Created material editor settings dialog

Activated settings menu option Moved viewport camera controller initialization before viewport settings restoration
2021-05-09 12:34:55 -05:00
parent 7112c1a369
commit 5437843390
13 changed files with 226 additions and 14 deletions
@@ -0,0 +1,43 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <Window/SettingsDialog/SettingsDialog.h>
+#include <Window/SettingsDialog/SettingsWidget.h>
+
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
+
+namespace MaterialEditor
+{
+    SettingsDialog::SettingsDialog(QWidget* parent)
+        : QDialog(parent)
+    {
+        setWindowTitle("Material Editor Settings");
+        setFixedSize(600, 300);
+        setLayout(new QVBoxLayout(this));
+
+        auto settingsWidget = new SettingsWidget(this);
+        settingsWidget->Populate();
+        layout()->addWidget(settingsWidget);
+
+        // Create the bottom row of the dialog with action buttons
+        auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok, this);
+        layout()->addWidget(buttonBox);
+
+        QObject::connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+        QObject::connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+        setModal(true);
+    }
+} // namespace MaterialEditor
+
+//#include <Window/SettingsDialog/moc_SettingsDialog.cpp>
@@ -0,0 +1,27 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#include <QDialog>
+
+namespace MaterialEditor
+{
+    class SettingsDialog
+        : public QDialog
+    {
+        Q_OBJECT
+    public:
+        SettingsDialog(QWidget* parent = nullptr);
+        ~SettingsDialog() = default;
+    };
+} // namespace MaterialEditor
@@ -0,0 +1,72 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <Window/SettingsDialog/SettingsWidget.h>
+#include <AtomToolsFramework/Inspector/InspectorPropertyGroupWidget.h>
+
+namespace MaterialEditor
+{
+    SettingsWidget::SettingsWidget(QWidget* parent)
+        : AtomToolsFramework::InspectorWidget(parent)
+    {
+        m_documentSettings =
+            AZ::UserSettings::CreateFind<MaterialDocumentSettings>(AZ::Crc32("MaterialDocumentSettings"), AZ::UserSettings::CT_GLOBAL);
+    }
+
+    SettingsWidget::~SettingsWidget()
+    {
+        AtomToolsFramework::InspectorRequestBus::Handler::BusDisconnect();
+    }
+
+    void SettingsWidget::Populate()
+    {
+        AddGroupsBegin();
+        AddDocumentGroup();
+        AddGroupsEnd();
+    }
+
+    void SettingsWidget::AddDocumentGroup()
+    {
+        const AZStd::string groupNameId = "documentSettings";
+        const AZStd::string groupDisplayName = "Document Settings";
+        const AZStd::string groupDescription = "Document Settings";
+
+        const AZ::Crc32 saveStateKey(AZStd::string::format("SettingsWidget::DocumentGroup"));
+        AddGroup(
+            groupNameId, groupDisplayName, groupDescription,
+            new AtomToolsFramework::InspectorPropertyGroupWidget(
+                m_documentSettings.get(), nullptr, m_documentSettings->TYPEINFO_Uuid(), this, this, saveStateKey));
+    }
+
+    void SettingsWidget::Reset()
+    {
+        AtomToolsFramework::InspectorRequestBus::Handler::BusDisconnect();
+        AtomToolsFramework::InspectorWidget::Reset();
+    }
+
+    void SettingsWidget::BeforePropertyModified(AzToolsFramework::InstanceDataNode* pNode)
+    {
+        AZ_UNUSED(pNode);
+    }
+
+    void SettingsWidget::AfterPropertyModified(AzToolsFramework::InstanceDataNode* pNode)
+    {
+        AZ_UNUSED(pNode);
+    }
+
+    void SettingsWidget::SetPropertyEditingComplete(AzToolsFramework::InstanceDataNode* pNode)
+    {
+        AZ_UNUSED(pNode);
+    }
+} // namespace MaterialEditor
+
+//#include <Window/SettingsWidget/moc_SettingsWidget.cpp>
@@ -0,0 +1,54 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <Atom/Document/MaterialDocumentSettings.h>
+#include <AtomToolsFramework/Inspector/InspectorWidget.h>
+#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals.h>
+#endif
+
+namespace MaterialEditor
+{
+    //! Provides controls for viewing and editing settings.
+    class SettingsWidget
+        : public AtomToolsFramework::InspectorWidget
+        , private AzToolsFramework::IPropertyEditorNotify
+    {
+        Q_OBJECT
+    public:
+        AZ_CLASS_ALLOCATOR(SettingsWidget, AZ::SystemAllocator, 0);
+
+        explicit SettingsWidget(QWidget* parent = nullptr);
+        ~SettingsWidget() override;
+
+        void Populate();
+
+    private:
+        void AddDocumentGroup();
+
+        // AtomToolsFramework::InspectorRequestBus::Handler overrides...
+        void Reset() override;
+
+        // AzToolsFramework::IPropertyEditorNotify overrides...
+        void BeforePropertyModified(AzToolsFramework::InstanceDataNode* pNode) override;
+        void AfterPropertyModified(AzToolsFramework::InstanceDataNode* pNode) override;
+        void SetPropertyEditingActive([[maybe_unused]] AzToolsFramework::InstanceDataNode* pNode) override {}
+        void SetPropertyEditingComplete(AzToolsFramework::InstanceDataNode* pNode) override;
+        void SealUndoStack() override {}
+        void RequestPropertyContextMenu(AzToolsFramework::InstanceDataNode*, const QPoint&) override {}
+        void PropertySelectionChanged(AzToolsFramework::InstanceDataNode*, bool) override {}
+
+        AZStd::intrusive_ptr<MaterialDocumentSettings> m_documentSettings;
+    };
+} // namespace MaterialEditor