Integrate Edit3D view into Creator

Edit3D view is now a tab alongside Form Editor. Buttons were moved to a Creator side task bar on Edit 3D view. Change-Id: Ia06107e4f855ba512ffea3e628a61558894e800e Fixes: QDS-1570 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-11 11:33:25 +02:00
parent 7eda08f600
commit 4908055937
93 changed files with 2037 additions and 509 deletions
--- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#include "edit3dwidget.h"
+#include "edit3dview.h"
+#include "edit3dcanvas.h"
+#include "edit3dactions.h"
+
+#include "qmldesignerplugin.h"
+#include "designersettings.h"
+#include "qmldesignerconstants.h"
+#include "viewmanager.h"
+
+#include <toolbox.h>
+#include <utils/utilsicons.h>
+#include <QVBoxLayout>
+
+namespace QmlDesigner {
+
+Edit3DWidget::Edit3DWidget(Edit3DView *view) :
+    m_view(view)
+{
+    setMouseTracking(true);
+    setFocusPolicy(Qt::WheelFocus);
+
+    auto fillLayout = new QVBoxLayout(this);
+    fillLayout->setContentsMargins(0, 0, 0, 0);
+    fillLayout->setSpacing(0);
+    setLayout(fillLayout);
+
+    // Initialize toolbar
+    m_toolBox = new ToolBox(this);
+    fillLayout->addWidget(m_toolBox.data());
+
+    // Iterate through view actions. A null action indicates a separator and a second null action
+    // after separator indicates an exclusive group.
+    auto addActionsToToolBox = [this](const QVector<Edit3DAction *> &actions, bool left) {
+        bool previousWasSeparator = true;
+        QActionGroup *group = nullptr;
+        for (auto action : actions) {
+            if (action) {
+                if (group)
+                    group->addAction(action->action());
+                addAction(action->action());
+                if (left)
+                    m_toolBox->addLeftSideAction(action->action());
+                else
+                    m_toolBox->addRightSideAction(action->action());
+                previousWasSeparator = false;
+            } else {
+                if (previousWasSeparator) {
+                    group = new QActionGroup(this);
+                    previousWasSeparator = false;
+                } else {
+                    group = nullptr;
+                    auto separator = new QAction(this);
+                    separator->setSeparator(true);
+                    addAction(separator);
+                    m_toolBox->addLeftSideAction(separator);
+                    previousWasSeparator = true;
+                }
+            }
+        }
+
+    };
+    addActionsToToolBox(view->leftActions(), true);
+    addActionsToToolBox(view->rightActions(), false);
+
+    // Canvas is used to render the actual edit 3d view
+    m_canvas = new Edit3DCanvas(this);
+    fillLayout->addWidget(m_canvas.data());
+}
+
+Edit3DCanvas *Edit3DWidget::canvas() const
+{
+    return m_canvas.data();
+}
+
+Edit3DView *Edit3DWidget::view() const
+{
+    return m_view.data();
+}
+
+}