From be3444924798602eedf6f4c22985fe01cb6cf1de Mon Sep 17 00:00:00 2001
From: Mats Honkamaa <mats.honkamaa@qt.io>
Date: Mon, 19 Sep 2022 10:32:36 +0300
Subject: [PATCH] Doc: Add info about 3D view context menu

Task-number: QDS-7494
Change-Id: Ic6fce90317e2ff5736ba20996ba30b1f338c36ac
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 .../images/3d-view-context-menu.png            | Bin 0 -> 4571 bytes
 .../qtdesignstudio-3d-camera.qdoc              |  16 ++++++++++++----
 .../qtdesignstudio-3d-editor.qdoc              |  10 ++++++++++
 .../qtdesignstudio-3d-lights.qdoc              |  11 ++++++++---
 .../qtdesignstudio-3d-model.qdoc               |  17 ++++++++++++-----
 5 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 doc/qtdesignstudio/images/3d-view-context-menu.png

diff --git a/doc/qtdesignstudio/images/3d-view-context-menu.png b/doc/qtdesignstudio/images/3d-view-context-menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2e35e001987cbea031473cd2b7cd8abe9934b56
GIT binary patch
literal 4571
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
TYfl&$7#KWV{an^LB{Ts59~mxh

literal 0
HcmV?d00001

diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
index a501eecfd08..2f6c05b24a8 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc
@@ -40,10 +40,18 @@
 
      \image studio-qtquick-3d-components.png "Qt Quick 3D components in Components"
 
-    Add a camera by dragging-and-dropping one of the camera components from
-    \uicontrol Components > \uicontrol {Qt Quick 3D} > \uicontrol
-    {Qt Quick 3D} to the \l {3D} view or to a 3D view in \l Navigator.
-    If the cameras are not displayed in \uicontrol {Components}, add the
+    To add a camera component to your UI, do one of the following:
+    \list
+      \li Drag a camera component from \uicontrol Components >
+      \uicontrol {Qt Quick 3D} to the \l {3D} view or to
+      \l Navigator > \uicontrol {View3D} > \uicontrol Scene.
+      \li Right-click in the \uicontrol 3D view and select
+      \uicontrol Create > \uicontrol Cameras from the context menu.
+      \note You can only create \uicontrol {Camera Perspective} and
+      \uicontrol {Camera Ortographic} this way.
+    \endlist
+
+    If you cannot find the camera components in \uicontrol {Components}, add the
     \uicontrol QtQuick3D module to your project, as described in
     \l {Adding and Removing Modules}.
 
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
index 8f0628aef0d..5c2bf4f14bd 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc
@@ -70,6 +70,16 @@
     Additionally, you can toggle the visibility of the grid, selection boxes,
     icon gizmos, and camera frustums in the 3D scene.
 
+    There is a context menu in the \uicontrol 3D view. To open it, right-click
+    in the \uicontrol 3D view. From the context menu you can:
+    \list
+      \li Create cameras, lights, and models.
+      \li Open \uicontrol {Material Editor} and edit materials.
+      \li Delete components
+    \list
+
+    \image 3d-view-context-menu.png
+
     To refresh the contents of the \uicontrol{3D} view, press \key P or
     select the \inlineimage icons/reset.png
     (\uicontrol {Reset View}) button.
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
index deb6edbb640..d8fca3e3461 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
@@ -36,9 +36,14 @@
     As a secondary light source, you can use \l{Setting the Light Probe}
     {image-based lighting}.
 
-    To add light components to your UI, drag-and-drop them from
-    \uicontrol Components > \uicontrol {Qt Quick 3D} to the \l {3D} view or to
-    \l Navigator > \uicontrol {Scene Environment} > \uicontrol Scene.
+    To add a light component to your UI, do one of the following:
+    \list
+      \li Drag a light component from \uicontrol Components >
+      \uicontrol {Qt Quick 3D} to the \l {3D} view or to
+      \l Navigator > \uicontrol {View3D} > \uicontrol Scene.
+      \li Right-click in the \uicontrol 3D view and select
+      \uicontrol Create > \uicontrol Lights from the context menu.
+    \endlist
 
     If you cannot find the light components in \uicontrol {Components}, add the
     \uicontrol {Qt Quick 3D} module to your project as instructed in
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
index e4253f0bb60..0893eadd975 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc
@@ -37,14 +37,21 @@
 
     \image studio-3d-models.png "Various 3D models in the 3D view"
 
-    A Model component loads mesh data from a file. You can modify how the
+    A model component loads mesh data from a file. You can modify how the
     component is shaded by using materials. For more information, see
     \l {Materials and Shaders} and \l {Creating Custom Materials}.
 
-    You can drag-and-drop a model from \uicontrol Components
-    > \uicontrol {Qt Quick 3D} > \uicontrol {Qt Quick 3D} to the \l {3D} view or
-    to \l Navigator > \uicontrol {Scene Environment} > \uicontrol Scene. If the
-    models are not displayed in \uicontrol {Components}, you should add the
+    To add a model component to your UI, do one of the following:
+    \list
+      \li Drag a model component from \uicontrol Components >
+      \uicontrol {Qt Quick 3D} to the \l {3D} view or to
+      \l Navigator > \uicontrol {View3D} > \uicontrol Scene.
+      \li Right-click in the \uicontrol 3D view and select
+      \uicontrol Create > \uicontrol Primitives from the context menu.
+      \note You can not create \uicontrol Empty models this way.
+    \endlist
+
+    If you cannot find the model components in \uicontrol {Components}, add the
     \uicontrol QtQuick3D module to your project, as described in
     \l {Adding and Removing Modules}.