From b18587742ff23c7f221af81da99ed72ba87a1cdd Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 28 Apr 2020 12:55:37 +0200 Subject: [PATCH] Doc: Describe downloading Qt Bridge from Qt Marketplace Adjust the info about exporting and importing assets. Change-Id: Ibc66fac68e14483fda050b7501fc7e091115ce89 Reviewed-by: Johanna Vanhatapio Reviewed-by: Mahmoud Badri Reviewed-by: Thomas Hartmann --- .../src/qtbridge/qtbridge-overview.qdoc | 10 +++++--- .../src/qtbridge/qtbridge-ps-setup.qdoc | 24 +++++++++---------- .../src/qtbridge/qtbridge-sketch-setup.qdoc | 10 ++++---- .../src/qtdesignstudio-importing-2d.qdoc | 13 ++++++---- .../src/qtdesignstudio-importing-designs.qdoc | 2 ++ .../qtdesignstudio-3d-importing.qdoc | 11 +++++---- 6 files changed, 39 insertions(+), 31 deletions(-) diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc index 9a912f573a3..d666763e557 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc @@ -31,9 +31,13 @@ \title Exporting Artwork from Design Tools - You need to use \QB for exporting the 2D assets from design tools, - whereas you can directly import 3D assets saved in widely-used 3D - graphics formats. For best results when importing 3D assets, follow + You need to use \QB to first export 2D assets from design tools and then + import them. When working with 3D assets, you can use the export functions + provided by the 3D graphics tools to save the assets in widely-used 3D + graphics formats, and then use \QB to import them. You can download \QB + from the \l{https://marketplace.qt.io/}{Qt Marketplace}. + + For best results when importing 3D assets, follow the guidelines for creating and exporting them. \list diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc index 1261ee4d85f..6e3b8ef3cd3 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Bridge documentation. @@ -32,10 +32,12 @@ \title Setting Up \QBPS - \QBPS is delivered as an Adobe extension (ZXP) package and requires Adobe - Photoshop version 20.0.0, or later to be installed. The \QBPS installation - process differs depending on whether you use ZXPInstaller and whether you - are installing on Windows or \macos. + You can download \QBPS from the \l{https://marketplace.qt.io/} + {Qt Marketplace}. It is delivered as an Adobe extension (ZXP) + package and requires Adobe Photoshop version 20.0.0, or later + to be installed. The \QBPS installation process differs depending + on whether you use ZXPInstaller and whether you are installing on + Windows or \macos. \section1 Installing with ZXPInstaller @@ -44,8 +46,7 @@ \list 1 \li Download and install \l{http://zxpinstaller.com/}{ZXPInstaller}. \li Start ZXPInstaller. - \li Drag and drop the \QBPS ZXP package from the \c photoshop_bridge - directory in the installation directory of \QDS to ZXPInstaller. + \li Drag and drop the \QBPS ZXP package to ZXPInstaller. \li Follow the instructions of the installation program. \endlist @@ -59,9 +60,8 @@ To install \QBPS on Windows without using ZXPInstaller: \list 1 - \li Copy the \QBPS ZXP package from the \c photoshop_bridge directory - in the installation directory of \QDS to the \c Documents directory - in your user directory. + \li Copy the \QBPS ZXP package to the \c Documents directory in your + user directory. \li Open Windows PowerShell. \li Enter the following commands: \badcode @@ -77,9 +77,7 @@ To install \QBPS on \macos without using ZXPInstaller: \list 1 - \li Copy the \QBPS ZXP package from the \c photoshop_bridge - directory in the installation directory of \QDS to your - \c Documents directory. + \li Copy the \QBPS ZXP package to your \c Documents directory. \li Open Terminal. \li Enter the following commands: \badcode diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc index 1f7a49d2e0d..46d611ad514 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Bridge documentation. @@ -32,13 +32,13 @@ \title Setting Up \QBSK - \QBSK is delivered with \QDS as a Sketch plugin that you can install to - Sketch. + You can download \QBSK from the \l{https://marketplace.qt.io/} + {Qt Marketplace}. It is delivered as a Sketch plugin that you + can install to Sketch. \note Install the Sketch app before installing the plugin. - To install the \QBSK plugin to Sketch, double-click the \QBSK plugin in the - \c sketch_bridge directory in the installation directory of \QDS. + To install the \QBSK plugin to Sketch, double-click the executable file. The plugin is available at \uicontrol Plugins > \uicontrol {\QB}. */ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc index 9b9bd856044..65335c3a5c7 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Bridge documentation. @@ -31,12 +31,15 @@ \title Importing 2D Assets + You can download \QB from the \l{https://marketplace.qt.io/}{Qt Marketplace}. + \image studio-imported-assets.png "Artwork imported into Qt Design Studio" - You can import assets that you exported with \QB to a \QDS project as image - and QML files and edit them in the Design mode. If you make changes to your - design in the design tool, you can merge the changes into existing QML files - without overwriting the changes you have made in \QDS. + \QB enables you to export assets and then import them to a \QDS project + as image and QML files for editing in the \uicontrol {Form Editor}. If you + make changes to your design in the design tool, you can merge the changes + into existing QML files without overwriting the changes you have made in + \QDS. \note Attempting to import assets exported on another system might fail. diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc index 8ad05eba811..887a148e817 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc @@ -35,6 +35,8 @@ exporting the 2D assets from design tools, whereas you can directly import 3D assets saved in widely-used 3D graphics formats. + You can download \QB from the \l{https://marketplace.qt.io/}{Qt Marketplace}. + \list \li \l{Importing 2D Assets} diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc index 17f7482233c..d8025677cf5 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc @@ -36,10 +36,11 @@ \title Importing 3D Assets - You can import files you created using 3D graphics applications and stored - in several widely-used formats, such as .blend, .dae, .fbx, .glb, .gltf, - .obj, .uia, or .uip. For a list of formats supported by each \l{Qt Quick 3D} - version, see the module documentation. + You can download \QB from the \l{https://marketplace.qt.io/}{Qt Marketplace}. + It enables you to import files you created using 3D graphics applications + and stored in several widely-used formats, such as .blend, .dae, .fbx, .glb, + .gltf, .obj, .uia, or .uip. For a list of formats supported by each + \l{Qt Quick 3D} version, see the module documentation. For more information about exporting 3D graphics from Maya, see \l{Exporting from Maya}. @@ -68,5 +69,5 @@ \endlist You can open the imported files in the Design mode for editing in the - \l{Editing 3D Scenes}{3D editor}. + \l{Editing 3D Scenes}{3D Editor}. */