diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc index 176bcc03319..6214adf509a 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc @@ -30,6 +30,28 @@ \title Importing 2D Assets + You can import 2D assets, such as images, fonts, and sound files, to \QDS to + use them in your projects. + + To import an asset, drag-and-drop the external file containing the asset from, + for example, File Explorer on Windows, to \uicontrol {Form Editor}, + \uicontrol Navigator, or \uicontrol {Text Editor}. Alternatively, select + \l Library > \uicontrol Assets > \inlineimage plus.png + and follow the instructions in the \uicontrol {Asset Import} dialog. You can + also multiselect several external asset files to drag-and-drop them to + \QDS simultaneously. + + The imported images will appear in \uicontrol Library > \uicontrol Assets. + If you initiate the import by dragging the assets to \uicontrol {Form Editor}, + they are also added to your projects as image components, and you can view + them in \uicontrol {Form Editor} and \uicontrol Navigator. If you drag an + external font file to \uicontrol {Form Editor}, it will be added to your + project as a text component. Other imported assets, such as sound files, + will only appear in \uicontrol Library > \uicontrol Assets, and you can then + drag-and-drop them to a suitable view. + + \section1 Importing Designs From Other Design Tools + \image studio-imported-assets.png "UI imported into Qt Design Studio" \QB enables you to export assets and then import them to a \QDS project @@ -45,7 +67,7 @@ information about the options you have, see \l {Creating Projects}. - To import designs to \QDS projects: + To import assets exported in \QB to \QDS projects: \list 1 \li Select \uicontrol File > \uicontrol {New File or Project} > @@ -107,4 +129,5 @@ design tool and export the assets again. \include qtbridge-tutorial-links.qdocinc qtsketchbridge tutorials + */ diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc index 624d7f5ecb9..ae12772cf4d 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc @@ -43,17 +43,27 @@ For more information about exporting 3D graphics, see \l{Exporting 3D Assets}. - During the import, you can optimize the files for \QDS. You can remove - components from meshes to reduce the cache size, find and fix issues in - the files, optimize graphs and meshes, and so on. The available options - depend on whether you are importing files that you created with Qt 3D Studio - or with other 3D graphics tools. See the tooltips in the options dialog - for more information about a particular option. - \image studio-import-3d.png To import 3D assets to \QDS projects: + \list 1 + \li Drag-and-drop an external file containing the 3D asset from, + for example, File Explorer (on Windows), to \uicontrol {3D Editor}. + \li In the \uicontrol {3D Scene Options} tab, select options for + importing the file. + \li Select \uicontrol Import to import the 3D graphics file. + \li When the import is done, select \uicontrol Close. + \endlist + + The 3D asset you dragged-and-dropped to \uicontrol {3D Editor} has now + been added to your scene, and you can see it in the \uicontrol {3D Editor} + view and in \uicontrol Navigator. It is also available in + \uicontrol Library > \uicontrol Components > \uicontrol {My 3D Components}. + + Alternatively, you can initiate the import dialog from the + \uicontrol Library view: + \list 1 \li In the \l{Design Views}{Design mode}, select \l Library > \uicontrol Assets > \inlineimage plus.png @@ -67,6 +77,17 @@ \li When the import is done, select \uicontrol Close. \endlist + The 3D asset now appears in \uicontrol Library > \uicontrol Components > + \uicontrol {My 3D Components}. You can add it to the scene by + drag-and-dropping it to \uicontrol {3D Editor}. + + During the import, you can optimize the files for \QDS. You can remove + components from meshes to reduce the cache size, find and fix issues in + the files, optimize graphs and meshes, and so on. The available options + depend on whether you are importing files that you created with Qt 3D Studio + or with other 3D graphics tools. See the tooltips in the options dialog + for more information about a particular option. + The 3D asset you added to the project now appears in \uicontrol Library > \uicontrol Components > \uicontrol {My 3D Components}. You can add it to your UI by dragging-and-dropping it to \l {3D Editor}. diff --git a/doc/qtdesignstudio/src/views/qtquick-library.qdoc b/doc/qtdesignstudio/src/views/qtquick-library.qdoc index b1d03a72e67..adf66688b16 100644 --- a/doc/qtdesignstudio/src/views/qtquick-library.qdoc +++ b/doc/qtdesignstudio/src/views/qtquick-library.qdoc @@ -119,9 +119,13 @@ \section1 Assets \uicontrol Library > \uicontrol {Assets} displays the images and other files - that you add to the project folder by selecting \inlineimage plus.png - . To add assets to your UI, drag-and-drop them to \l Navigator or - \l {Form Editor}. + that you add to the project folder by dragging-and-dropping external asset + files to \QDS or by selecting \inlineimage plus.png + . For more information about importing assets to \QDS, see + \l {Importing 2D Assets} and \l {Importing 3D Assets}. + + To add assets to your UI, drag-and-drop them from \uicontrol Library > + \uicontrol Assets to \l Navigator, \l {Form Editor}, or \l {3D Editor}. To add multiple assets to your UI simultaneously, multiselect them first by holding \key Ctrl and clicking the asset files you wish to select.