From 7f2823791543ad8348ab9a36d031dd8473fd5161 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 26 Nov 2020 16:36:29 +0100 Subject: [PATCH] Doc: Add support for the \youtube macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Show links to Youtube videos using thumbnails with a play button. Change-Id: I131f24b1fb723c817c2387429bbf52997003f105 Reviewed-by: Thomas Hartmann Reviewed-by: Topi Reiniƶ --- doc/config/macros.qdocconf | 14 ++++ .../config/qtdesignstudio.qdocconf | 6 +- .../images/videoicons/9ihYeC0YJ0M.jpg | Bin 0 -> 7769 bytes .../images/videoicons/ZzbucmQPU44.jpg | Bin 0 -> 2393 bytes .../images/videoicons/aV6kFxH3Xws.jpg | Bin 0 -> 2827 bytes .../src/qtbridge/qtbridge-ps-overview.qdoc | 2 + .../src/qtbridge/qtbridge-ps-using.qdoc | 9 --- .../qtbridge/qtbridge-sketch-overview.qdoc | 2 + .../qtbridge/qtbridge-tutorial-links.qdocinc | 64 ++++++++++++++++++ .../src/qtdesignstudio-examples.qdoc | 4 +- .../src/qtdesignstudio-importing-2d.qdoc | 17 +---- .../src/qtdesignstudio-projects.qdoc | 5 ++ 12 files changed, 95 insertions(+), 28 deletions(-) create mode 100644 doc/qtdesignstudio/images/videoicons/9ihYeC0YJ0M.jpg create mode 100644 doc/qtdesignstudio/images/videoicons/ZzbucmQPU44.jpg create mode 100644 doc/qtdesignstudio/images/videoicons/aV6kFxH3Xws.jpg create mode 100644 doc/qtdesignstudio/src/qtbridge/qtbridge-tutorial-links.qdocinc diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 3b2970724b5..d2e02d06784 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -48,3 +48,17 @@ macro.beginfloatright.HTML = "
" macro.endfloat.HTML = "
" macro.clearfloat.HTML = "
" macro.emptyspan.HTML = "" + +# Embed YouTube content by video ID - Example: \youtube dQw4w9WgXcQ +# Also requires a .jpg thumbnail for offline docs. In .qdocconf, add: +# +# HTML.extraimages += images/dQw4w9WgXcQ.jpg +# qhp.ProjectName.extraFiles += images/dQw4w9WgXcQ.jpg +# +macro.youtube.HTML = "
\n\n" \ + "
\n" diff --git a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf index dec1878602a..26bdee56c23 100644 --- a/doc/qtdesignstudio/config/qtdesignstudio.qdocconf +++ b/doc/qtdesignstudio/config/qtdesignstudio.qdocconf @@ -69,8 +69,10 @@ exampledirs = ../examples/ \ ../../qtcreator/examples examples.fileextensions += *.qml *.svg *.ts *.qm -HTML.extraimages = ../../config/images/commercial.png -qhp.QtCreator.extraFiles = ../../config/images/commercial.png +{HTML.extraimages,qhp.qtdesignstudio.extraFiles} += ../../config/images/commercial.png \ + ../images/videoicons/9ihYeC0YJ0M.jpg \ + ../images/videoicons/aV6kFxH3Xws.jpg \ + ../images/videoicons/ZzbucmQPU44.jpg depends += qtwidgets \ qtcore \ diff --git a/doc/qtdesignstudio/images/videoicons/9ihYeC0YJ0M.jpg b/doc/qtdesignstudio/images/videoicons/9ihYeC0YJ0M.jpg new file mode 100644 index 0000000000000000000000000000000000000000..93ffdccbd7f27763362d04a9e98df664482976ca GIT binary patch literal 7769 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 H`2QvV(zJ^g literal 0 HcmV?d00001 diff --git a/doc/qtdesignstudio/images/videoicons/ZzbucmQPU44.jpg b/doc/qtdesignstudio/images/videoicons/ZzbucmQPU44.jpg new file mode 100644 index 0000000000000000000000000000000000000000..dd25d4cea3604bd7018983b3c55d86cc17582556 GIT binary patch literal 2393 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 B;7b4i literal 0 HcmV?d00001 diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc index 26eda08a083..5b0bab0e502 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc @@ -52,4 +52,6 @@ Photoshop, you should follow the guidelines for working with Photoshop and organizing your assets. \endlist + + \include qtbridge-tutorial-links.qdocinc qtpsbridge videos */ diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc index d9677906fbb..f643a5d20e9 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc @@ -249,15 +249,6 @@ In the \QBPS \uicontrol Settings dialog, select \uicontrol {Override JSX Script} to set the override JSX script. - For more information, watch a video tutorial and webinar about using \QBPS: - - \list - \li \l{https://resources.qt.io/development-topic-ui-design/qtdesignstudio-clustertutorial-partone} - {Building an Instrument Cluster for Your Car HMI, Part 1} - \li \l{https://www.youtube.com/watch?v=ZzbucmQPU44} - {From Photoshop to Prototype with Qt Design Studio} - \endlist - \section1 Importing Metadata & Assets \QBPS can import metadata generated from other tools and generate a Photoshop document. A diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc index a85a2473101..5471fdbf287 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc @@ -52,4 +52,6 @@ Sketch, you should follow the guidelines for working with Sketch and organizing your assets. \endlist + + \include qtbridge-tutorial-links.qdocinc qtsketchbridge tutorials */ diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-tutorial-links.qdocinc b/doc/qtdesignstudio/src/qtbridge/qtbridge-tutorial-links.qdocinc new file mode 100644 index 00000000000..4508b9acc4a --- /dev/null +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-tutorial-links.qdocinc @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Bridge 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. +** +****************************************************************************/ + +//! [qtpsbridge videos] + + \section1 \QBPS Videos + + For more information, watch a video tutorial and webinar about using \QBPS + that are also accessible from the \uicontrol Tutorials tab of the Welcome + mode: + + \list + \li Building an Instrument Cluster for Your Car HMI, Part 1 + + \youtube aV6kFxH3Xws + + You can access the Cluster tutorial source files in the + \uicontrol Examples tab. + + \li From Photoshop to Prototype with Qt Design Studio + + \youtube ZzbucmQPU44 + \endlist + +//! [qtpsbridge videos] + + +//! [qtsketchbridge tutorials] + + \section1 \QBSK Tutorials + + For more information, read the tutorials about using \QBSK that are also + accessible from the \uicontrol Tutorials tab of the Welcome mode: + + \list + \li \l{https://www.qt.io/blog/qt-design-studio-sketch-bridge-tutorial-part-1} + {Sketch Bridge Tutorial Part 1} + \li \l{https://www.qt.io/blog/qt-design-studio-sketch-bridge-tutorial-part-2} + {Sketch Bridge Tutorial Part 2} + \endlist + +//! [qtsketchbridge tutorials] diff --git a/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc index d1fa52b418b..6494ac4d1fd 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc @@ -38,8 +38,8 @@ The \uicontrol Tutorials tab contains links to video tutorials that provide more information about \QDS. - You can access the Cluster tutorial source files in the \uicontrol Examples - tab. + \include qtbridge-tutorial-links.qdocinc qtpsbridge videos + \include qtbridge-tutorial-links.qdocinc qtsketchbridge tutorials \section1 Examples diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc index 8314d6cd660..83cef36ea5b 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc @@ -100,19 +100,6 @@ \uicontrol {Asset Import} dialog while importing, fix the issues in design tool and export the assets again. - \section1 \QB Videos - - For more information, see the \QB tutorials that are also accessible from - the \uicontrol Tutorials tab of the Welcome mode: - - \list - \li \l{https://resources.qt.io/development-topic-ui-design/qtdesignstudio-clustertutorial-partone} - {Building an Instrument Cluster for Your Car HMI, Part 1} (\QBPS) - \li \l{https://www.youtube.com/watch?v=ZzbucmQPU44} - {From Photoshop to Prototype with Qt Design Studio} - \li \l{https://www.qt.io/blog/qt-design-studio-sketch-bridge-tutorial-part-1} - {Sketch Bridge Tutorial Part 1} - \li \l{https://www.qt.io/blog/qt-design-studio-sketch-bridge-tutorial-part-2} - {Sketch Bridge Tutorial Part 2} - \endlist + \include qtbridge-tutorial-links.qdocinc qtpsbridge videos + \include qtbridge-tutorial-links.qdocinc qtsketchbridge tutorials */ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc index 7c8ae924725..0eca243f587 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc @@ -81,6 +81,11 @@ application. \endlist + For an example of creating a \uicontrol {Qt Quick 3D Application} project, + watch the following video: + + \youtube 9ihYeC0YJ0M + \section1 Using Project Wizards \list 1