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/edit3dactions.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dactions.cpp
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** 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 "edit3dactions.h"
+#include "edit3dview.h"
+#include "edit3dwidget.h"
+
+#include <viewmanager.h>
+#include <nodeinstanceview.h>
+#include <qmldesignerplugin.h>
+
+#include <QDebug>
+
+namespace QmlDesigner {
+
+Edit3DActionTemplate::Edit3DActionTemplate(const QString &description,
+                                           SelectionContextOperation action,
+                                           View3DActionCommand::Type type)
+    : DefaultAction(description),
+      m_action(action),
+      m_type(type)
+{ }
+
+void Edit3DActionTemplate::actionTriggered(bool b)
+{
+    if (m_type != View3DActionCommand::Empty) {
+        QmlDesignerPlugin::instance()->viewManager().nodeInstanceView()
+                ->view3DAction(View3DActionCommand(m_type, b));
+    }
+
+    if (m_action)
+        m_action(m_selectionContext);
+}
+
+Edit3DAction::Edit3DAction(const QByteArray &menuId, View3DActionCommand::Type type,
+                           const QString &description, const QKeySequence &key, bool checkable,
+                           bool checked, const QIcon &iconOff, const QIcon &iconOn,
+                           SelectionContextOperation selectionAction)
+    : AbstractAction(new Edit3DActionTemplate(description, selectionAction, type))
+    , m_menuId(menuId)
+{
+    action()->setShortcut(key);
+    action()->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    action()->setCheckable(checkable);
+    action()->setChecked(checked);
+    if (checkable) {
+        QIcon onOffIcon;
+        const auto onAvail = iconOn.availableSizes(); // Assume both icons have same sizes available
+        for (const auto &size : onAvail) {
+            onOffIcon.addPixmap(iconOn.pixmap(size), QIcon::Normal, QIcon::On);
+            onOffIcon.addPixmap(iconOff.pixmap(size), QIcon::Normal, QIcon::Off);
+        }
+        action()->setIcon(onOffIcon);
+    } else {
+        action()->setIcon(iconOff);
+    }
+}
+
+QByteArray Edit3DAction::category() const
+{
+    return QByteArray();
+}
+
+bool Edit3DAction::isVisible(const SelectionContext &selectionContext) const
+{
+    return true;
+}
+
+bool Edit3DAction::isEnabled(const SelectionContext &selectionContext) const
+{
+    return isVisible(selectionContext);
+}
+
+}
+