Doc: Move information about exporting and importing under one topic

The new "Exporting and Importing" topic contains information about
exporting and importing 2D and 3D assets, as well as exporting QML
types.

Fixes: QDS-4369
Change-Id: Ie98ede4b0bcec4b872778fa7b2f054f1af4175fd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

doc/qtcreator/src/qtquick/qtquick-export.qdoc

@@ -25,10 +25,11 @@
 
 /*!
     \page creator-exporting-qml.html
-    \previouspage quick-converting-ui-projects.html
     \if defined(qtdesignstudio)
+    \previouspage studio-importing-3d.html
     \nextpage quick-uis.html
     \else
+    \previouspage quick-converting-ui-projects.html
     \nextpage creator-using-qt-designer.html
     \endif
 

doc/qtdesignstudio/src/qtdesignstudio-exporting-and-importing.qdoc

@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt Design Studio documentation.
+**
+** 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 Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+**
+****************************************************************************/
+
+/*!
+    \previouspage studio-getting-started.html
+    \page studio-exporting-and-importing.html
+    \nextpage qtbridge-overview.html
+
+    \title Exporting and Importing
+
+    Typically, you as a designer would design a UI using imaging and design
+    tools, such as Adobe Photoshop, Sketch, Figma, Blender, or Maya, and then
+    send your design to a developer for implementation. You can use the \QB
+    export tool to convert 2D assets into a metadata format supported by \QDS.
+    You can use the export functionality of 3D graphics tools to save your 3D
+    assets in a format that can be imported into \QDS.
+
+    You can import the 2D and 3D assets into \QDS for editing before you
+    submit the UI to the developer for adding the functionality to the
+    application.
+
+    If you want to make further changes to your components in the design tool,
+    you can export the UI files back into the metadata format, which you can
+    then import back into the design tool by using \QB. For example, you could
+    create components in a design tool and export them to \QDS before you start
+    making instances of them. In \QDS, you can add functionality to the
+    components, such as button states and then bring them back to the design
+    tool as assets. If you use functional \QDS components in the design tool,
+    you will find it easier to merge new iterations of the design to \QDS and
+    continue to build the components there.
+
+    The following image describes the workflow using \QBPS and \QDS:
+
+    \image studio-workflow.png
+
+    The workflow consists of the following steps:
+
+    \list 1
+        \li Export your design from a design tool into the metadata format.
+        \li \l{Creating Projects}{Create a project} in \QDS and import the
+            metadata file to it.
+        \li Edit the imported components and create more components in
+            \l {Form Editor} and \l {3D Editor}.
+        \li Animate your design in \l {Transition Editor} or \l Timeline
+            and \l {Curve Editor}.
+        \li Create interactions in \l States and \l {Connection View}.
+        \li \l{Previewing}{Preview} your design in real time, on the desktop
+            or on a mobile or an embedded device.
+        \li Optionally, export your components back into the metadata format
+            that you can import back into the design tool by using \QB. You
+            can continue to iterate your design this way until it is ready.
+    \endlist
+
+    For more information, watch a video that shows how to perform the tasks
+    above:
+
+    \youtube pEETxSxYazg
+
+    \list
+        \li \l {Exporting from Design Tools}
+
+            Export designs containing 2D and 3D assets into a metadata format
+            that you can import to projects in \QDS.
+        \li \l{Importing Designs}
+
+            Import assets that you exported from design tools to a \QDS project
+            and edit them in the \uicontrol Design mode to create a UI.
+        \li \l {Exporting Components}
+
+            Export UI files (.ui.qml) back to the metadata format and PNG assets
+            to generate native file formats in design tools using \QB.
+     \endlist
+*/

doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Design Studio documentation.
@@ -26,51 +26,19 @@
 /*!
     \previouspage index.html
     \page studio-getting-started.html
-    \nextpage qtbridge-overview.html
+    \nextpage studio-exporting-and-importing.html
 
     \title Getting Started
 
-    Typically, you as a designer would design a UI using imaging and design
+    The following topics contain information that you'll need to get started
-    tools, such as Adobe Photoshop, Sketch, Blender, or Maya, and then send your
+    with \QDS:
-    design to a developer for implementation. With the \QB export tool,
-    you can convert 2D assets into \l {Qt Quick} files. You can use the export
-    functionality of 3D graphics tools to save your 3D assets in a format
-    supported by \QDS. You can import the 2D and 3D assets into \QDS for
-    editing, before you submit the UI to the developer for adding the
-    functionality to the application.
-
-    The following image describes the workflow using \QBPS and \QDS:
-
-    \image studio-workflow.png
-
-    The workflow consists of the following steps:
-
-    \list 1
-        \li Export your design from a design tool.
-        \li Create a project in \QDS and import your design to it.
-        \li Create reusable components in the Design mode.
-        \li Animate your design with the transition editor or timeline and
-            easing curve editor.
-        \li Create interactions using states and connections.
-        \li Preview your design in real time, on the desktop or on a mobile
-            or an embedded device.
-    \endlist
-
-    For more information, watch a video that shows how to perform the tasks
-    above:
-
-    \youtube pEETxSxYazg
-
-    \section1 First Steps
-
-    The following topics contain information that you'll need to find your
-    way around \QDS:
 
     \list
-        \li \l {Exporting from Design Tools}
+        \li \l {Exporting and Importing}
 
             Describes how to export designs containing 2D and 3D assets into
-            files that you can import to projects in \QDS.
+            files that you can import to projects in \QDS, how to import them,
+            and how to export them from \QDS back to the metadata format.
         \li \l {User Interface}
 
             Describes the parts and basic features of \QDS.

doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Bridge documentation.
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 /*!
-    \previouspage creator-vcs-git.html
+    \previouspage exporting-from-qt3ds.html
     \page studio-importing-designs.html
     \nextpage studio-importing-2d.html
 

doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc

@@ -55,23 +55,11 @@
             project source files and configuration files. Do not store generated
             files.
 
-        \li \l{Importing Designs}
-
-            You can import assets that you exported from Adobe Photoshop to a
-            \QDS project and edit them in the Design mode to create a UI.
-
         \li \l {Converting UI Projects to Applications}
 
             \QDS projects are useful for creating UIs. To use them
             for application development in Qt Creator, you have to convert them
             to Qt Quick Application projects that contain .pro, .cpp, and .qrc
             files.
-
-        \li \l {Exporting Components}
-
-            You can export UI files (.ui.qml) to JSON metadata format
-            and PNG assets to generate native file formats in content creation
-            tools, such as Adobe Photoshop, using \QB.
-
     \endlist
 */

doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc

@@ -31,27 +31,39 @@
     \list
         \li \l{Getting Started}
             \list
-                \li \l{Exporting from Design Tools}
+                \l {Exporting and Importing}
                     \list
-                        \li \l{Exporting Designs from Adobe Illustrator}
+                        \li \l{Exporting from Design Tools}
-                        \li \l{Exporting Designs from Adobe Photoshop}
                             \list
-                                \li \l{Setting Up Qt Bridge for Adobe Photoshop}
+                                \li \l{Exporting Designs from Adobe Illustrator}
-                                \li \l{Using Qt Bridge for Adobe Photoshop}
+                                \li \l{Exporting Designs from Adobe Photoshop}
+                                    \list
+                                        \li \l{Setting Up Qt Bridge for Adobe Photoshop}
+                                        \li \l{Using Qt Bridge for Adobe Photoshop}
+                                    \endlist
+                                \li \l{Exporting Designs from Sketch}
+                                    \list
+                                        \li \l{Setting Up Qt Bridge for Sketch}
+                                        \li \l{Using Qt Bridge for Sketch}
+                                    \endlist
+                                \li \l{Exporting Designs from Figma}
+                                    \list
+                                        \li \l{Setting Up Qt Bridge for Figma}
+                                        \li \l{Using Qt Bridge for Figma}
+                                    \endlist
+                                \li \l{Exporting 3D Assets}
+                                    \list
+                                        \li \l{Exporting from Blender}
+                                        \li \l{Exporting from Maya}
+                                        \li \l{Exporting from Qt 3D Studio}
+                                    \endlist
                             \endlist
-                        \li \l{Exporting Designs from Sketch}
+                        \li \l{Importing Designs}
                             \list
-                                \li \l{Setting Up Qt Bridge for Sketch}
+                                \li \l{Importing 2D Assets}
-                                \li \l{Using Qt Bridge for Sketch}
+                                \li \l{Importing 3D Assets}
                             \endlist
-                        \li \l{Exporting Designs from Figma}
+                        \li \l{Exporting Components}
-                            \list
-                                \li \l{Setting Up Qt Bridge for Figma}
-                                \li \l{Using Qt Bridge for Figma}
-                            \endlist
-                        \li \l{Exporting from Blender}
-                        \li \l{Exporting from Maya}
-                        \li \l{Exporting from Qt 3D Studio}
                     \endlist
                 \li \l{User Interface}
                     \list
@@ -86,13 +98,7 @@
             \list
                 \li \l{Creating Projects}
                 \li \l{Using Git}
-                \li \l{Importing Designs}
-                    \list
-                        \li \l{Importing 2D Assets}
-                        \li \l{Importing 3D Assets}
-                    \endlist
                 \li \l{Converting UI Projects to Applications}
-                \li \l{Exporting Components}
             \endlist
         \li \l{Creating UIs}
             \list

doc/qtdesignstudio/src/qtdesignstudio.qdoc

@@ -47,7 +47,7 @@
         \row
         \li \b {\l{Getting Started}}
             \list
-                \li \l{Exporting from Design Tools}
+                \li \l{Exporting and Importing}
                 \li \l{User Interface}
                 \li \l{Design Views}
                 \li \l{Tutorials}
@@ -57,9 +57,7 @@
                 \list
                     \li \l{Creating Projects}
                     \li \l{Using Git}
-                    \li \l{Importing Designs}
                     \li \l{Converting UI Projects to Applications}
-                    \li \l{Exporting Components}
                 \endlist
             \li \b {\l{Creating UIs}}
                 \list

doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc

@@ -28,7 +28,7 @@
 /*!
     \page exporting-from-qt3ds.html
     \previouspage exporting-from-maya.html
-    \nextpage creator-quick-tour.html
+    \nextpage studio-importing-designs.html
     \title Exporting from Qt 3D Studio
 
     Use the following guidelines to achieve the best results when converting

doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc

@@ -27,10 +27,10 @@
     \page studio-importing-3d.html
     \if defined(qtdesignstudio)
     \previouspage studio-importing-2d.html
-    \nextpage quick-converting-ui-projects.html
+    \nextpage creator-exporting-qml.html
     \else
     \previouspage exporting-from-maya.html
-    \nextpage studio-3d-editor.html
+    \nextpage studio-3d-view.html
     \endif
 
     \title Importing 3D Assets