diff --git a/doc/qtcreator/src/howto/creator-telemetry.qdoc b/doc/qtcreator/src/howto/creator-telemetry.qdoc index db91a28bc8a..8cb24c64e6b 100644 --- a/doc/qtcreator/src/howto/creator-telemetry.qdoc +++ b/doc/qtcreator/src/howto/creator-telemetry.qdoc @@ -26,7 +26,7 @@ /*! \page creator-telemetry.html \if defined(qtdesignstudio) - \previouspage creator-editor-external.html + \previouspage creator-quick-ui-forms.html \else \previouspage creator-task-lists.html \endif diff --git a/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc b/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc index ff34d49bf10..9a4a9c94fd9 100644 --- a/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc +++ b/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc @@ -30,9 +30,9 @@ // ********************************************************************** /*! - \previouspage creator-ui-best-practices.html + \previouspage adding-plugins.html \page creator-usability.html - \nextpage studio-qtquick-best-practices.html + \nextpage creator-coding.html \title Optimizing Applications for Mobile Devices diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc index c98362ae17f..ffee57cccbc 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc @@ -46,7 +46,7 @@ \list - \li \l {Previewing} + \li \l {Validating with Target Hardware} You can use the QML live preview to preview a QML file or an entire Qt Quick application on the desktop, as well as on diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index b9060826396..b812857a1ab 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -155,61 +155,49 @@ \li \l{Scalable Layouts} \li \l{Using Custom Fonts} \li \l{Annotating Designs} - \li \l{Loading Placeholder Data} \li \l{UI Files} \endlist - \li \l {Adding Dynamics} + \li \l{Prototyping} \list - \li \l{Creating Animations} + \li \l{Creating UI Logic} + \li \l{Simulating Complex Experiences} \list - \li \l{Editing Easing Curves} + \li \l{Loading Placeholder Data} + \li \l{Using QML Modules with Plugins} + \endlist + \li \l {Dynamic Behaviors} + \list + \li \l{Adding Connections} + \list + \li \l{Connecting Components to Signals} + \li \l{Adding Bindings Between Properties} + \li \l{Specifying Dynamic Properties} + \li \l{Managing C++ Backend Objects} + \endlist + \li \l {Adding States} \endlist - \li \l{Adding Connections} - \list - \li \l{Connecting Components to Signals} - \li \l{Adding Bindings Between Properties} - \li \l{Specifying Dynamic Properties} - \li \l{Managing C++ Backend Objects} - \endlist - \li \l {Adding States} - \endlist - \li \l{Editing 3D Scenes} - \list \li \l {Exporting 3D Assets} \list \li \l{Exporting from Blender}{Blender} \li \l{Exporting from Maya}{Maya} \endlist \li \l{Importing 3D Assets} - \li \l{Adding 3D Views} - \li \l{Using 3D Components} - \list - \li \l{Setting Group Properties} - \li \l{Adding 3D Models} - \li \l{Using Materials and Shaders} - \li \l{Attaching Textures to Materials} - \li \l{Using 3D Materials} - \li \l{Applying 3D Effects} - \li \l{Using Custom Shaders} - \li \l{Creating Custom Effects and Materials} - \li \l{Using Lights} - \li \l{Using Scene Camera} - \li \l{Setting Scene Environment} - \endlist - \endlist + \li \l{Exporting Components} + \endlist + \li \l{Motion Design} + \list + \li \l{Introduction to Animation Techniques} + \li \l{Creating Animations} + \li \l{Editing Easing Curves} + \endlist \li \l {Browsing ISO 7000 Icons} - \li \l {Using QML Modules with Plugins} \li \l {Converting UI Projects to Applications} - \li \l {Exporting Components} \endlist \li \l{Developing Widget Based Applications} \list \li \l{Adding Qt Designer Plugins} \endlist - \li \l {Best Practices} - \list - \li \l{Optimizing Applications for Mobile Devices} - \endlist + \li \l{Optimizing Applications for Mobile Devices} \endlist \li \l{Coding} \list @@ -247,7 +235,7 @@ \endlist \li \l{Building and Running} \list - \li \l{Previewing} + \li \l{Validating with Target Hardware} \list \li \l{Previewing on Desktop} \li \l{Previewing on Devices} diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc index dd2798fb7d6..9492de89225 100644 --- a/doc/qtcreator/src/qtcreator.qdoc +++ b/doc/qtcreator/src/qtcreator.qdoc @@ -96,7 +96,7 @@ \row \li \b {\l{Building and Running}} \list - \li \l{Previewing} + \li \l{Validating with Target Hardware} \li \l{Building for Multiple Platforms} \li \l{Running on Multiple Platforms} \li \l{Deploying to Devices} diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc index c8f02215299..ee038bcd218 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc @@ -49,17 +49,26 @@ \li \l {Wireframing} - Qt Quick enables you to build UIs around the behavior of - \e components and how they connect with one another. You - create components using Qt Quick and QML types that are - available in the Design mode, manage their relationships, - and specify their properties. + Plan your UI properly. Know what elements, such as screens, + components, and states, you need. Create a descriptive wireframe + and acquire a detailed UI specification before you start to make + the process of creating the UI more efficient. - \li \l {Adding Dynamics} + \li \l {Prototyping} - You can animate the properties of UI components and create - connections between them to enable them to communicate with - each other. + After your UI wireframe has been approved, you can turn it into + an interactive prototype to ensure that you and the developers + share a common vision about the UI appearance and functionality. + + \li \l{Motion Design} + + After the wireframing and prototyping phases, you can use the + supported motion design techniques to fine-tune your UI for + production. You can use different animation techniques for + different purposes. \QC supports common motion design techniques, + such as timeline and keyframe based animation and easing curves, + as well as screen-to-screen or state-to-state application flows + and data-driven UI logic animation. \endlist diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc index 7af5a6ea8dd..afd9d07e584 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc @@ -24,7 +24,7 @@ ****************************************************************************/ /*! - \previouspage quick-property-bindings.html + \previouspage quick-dynamic-properties.html \page quick-connections-backend.html \nextpage quick-states.html diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc index 4939494504b..48dbe68617e 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc @@ -26,7 +26,7 @@ /*! \page qtquick-iso-icon-browser.html \previouspage studio-3d-scene-environment.html - \nextpage creator-qml-modules-with-plugins.html + \nextpage quick-converting-ui-projects.html \title Browsing ISO 7000 Icons diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc index 9cd23d6d0b7..1c85738d98b 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-states-scxml.qdocinc @@ -39,9 +39,10 @@ \image qmldesigner-states-when-condition.png - If you add animation to the states, you can \l{Previewing}{preview} - or \l{Running on Multiple Platforms}{run} the application to test - the animation. + If you add animation to the states, you can + \l{Validating with Target Hardware}{preview} + or \l{Running on Multiple Platforms}{run} + the application to test the animation. //! [scxml state machines] */ diff --git a/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc b/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc index cdc8891b56e..ab23eb15810 100644 --- a/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc +++ b/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc @@ -27,7 +27,7 @@ \previouspage creator-live-preview-devices.html \page qt-design-viewer.html \if defined(qtdesignstudio) - \nextpage studio-advanced.html + \nextpage studio-exporting-and-importing.html \else \nextpage creator-building-targets.html \endif diff --git a/doc/qtdesignstudio/src/qtdesignstudio-simulation-overview.qdoc b/doc/qtcreator/src/qtquick/qtdesignstudio-simulation-overview.qdoc similarity index 87% rename from doc/qtdesignstudio/src/qtdesignstudio-simulation-overview.qdoc rename to doc/qtcreator/src/qtquick/qtdesignstudio-simulation-overview.qdoc index c32d5baaa52..e5899fe3de9 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-simulation-overview.qdoc +++ b/doc/qtcreator/src/qtquick/qtdesignstudio-simulation-overview.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. @@ -25,16 +25,19 @@ /*! \page studio-simulation-overview.html - \previouspage creator-editor-options-text.html + \previouspage qtquick-creating-ui-logic.html \nextpage qtquick-placeholder-data.html - \title Simulating Data Input + \title Simulating Complex Experiences \QDS enables you to connect UIs to different forms of data from various sources, such as QML-based data models, JavaScript files, and backend - services. You can also connect your UI to Simulink to load live data from a + services. + \if definded(qtdesignstudio) + You can also connect your UI to Simulink to load live data from a Simulink simulation. + \endif \list \li \l{Loading Placeholder Data} @@ -43,6 +46,7 @@ you can test grid, list, or path views, even though you don't have access to real data. + \if defined(qtdesignstudio) \li \l{Simulating Application Logic} You can use JavaScript to generate mock data for your UI. @@ -52,6 +56,7 @@ Use the Simulink connector to connect a Simulink Simulation Model to your UI. Simulink is a MATLAB-based graphical programming environment for modeling, simulating, and analyzing multi-domain dynamic systems. + \endif \li \l{Using QML Modules with Plugins} diff --git a/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc b/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc index 6d3c47ff2e6..274c205c60b 100644 --- a/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc @@ -25,22 +25,16 @@ /*! \page qtquick-adding-dynamics.html - \previouspage creator-quick-ui-forms.html - \nextpage studio-timeline.html + \previouspage creator-qml-modules-with-plugins.html + \nextpage qmldesigner-connections.html - \title Adding Dynamics + \title Dynamic Behaviors - You can animate the properties of UI components and create connections - between them to enable them to communicate with each other. + Create connections between components to enable them to communicate with + each other. The connections can be triggered by signals that are emitted + when the values of other components or the UI state change. \list - \li \l {Creating Animations} - - You can use a timeline and keyframe based editor in the - \uicontrol Timeline view to animate the properties of UI - components. Animating properties enables their values to - move through intermediate values at specified keyframes - instead of immediately changing to the target value. \li \l {Adding Connections} You can create connections between the UI components and diff --git a/doc/qtcreator/src/qtquick/qtquick-animation-overview.qdoc b/doc/qtcreator/src/qtquick/qtquick-animation-overview.qdoc index 0a1e0cb3abc..638cbce6ce6 100644 --- a/doc/qtcreator/src/qtquick/qtquick-animation-overview.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-animation-overview.qdoc @@ -202,7 +202,7 @@ decreased from the backend, it moves the needle animation from one end of the timeline to the other. - For more information, see \l{Simulating Data Input}. + For more information, see \l{Simulating Complex Experiences}. \section2 Programmatic Animation diff --git a/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc b/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc index 136b292d7e4..79bc0f1e774 100644 --- a/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc @@ -27,10 +27,11 @@ \page qtquick-annotations.html \if defined(qtdesignstudio) \previouspage qtquick-positioning.html + \nextpage qtquick-prototyping.html \else \previouspage qtquick-fonts.html + \nextpage qtquick-ui-forms.html \endif - \nextpage qtquick-placeholder-data.html \title Annotating Designs diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc index 0ea771d54a2..d41d4d0bd38 100644 --- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc @@ -90,10 +90,10 @@ instead of duplicating them, so the components do not need to be processed as completely new component types. This reduces loading and compilation time as well as the size of the binary. - \li Any content that is data-driven should be - \l {Using UI Files}{exported as a public property} of the - relevant component. For example, a speedometer should have an \c int - or \c real property for speed to which the UI is bound. + \li Any content that is data-driven should be exported as a public + property (alias property) of the relevant component. For example, + a speedometer should have an \c int or \c real property for speed + to which the UI is bound. \li Separate UI from the application logic. Designers should work with the \l{UI Files}{UI files} (.ui.qml), while developers should work on the corresponding implementation files (.qml) to define their diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc index 2c3d6a15f15..62c9bdb5439 100644 --- a/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc @@ -24,8 +24,8 @@ ****************************************************************************/ /*! - \previouspage qtquick-editing-easing-curves.html \page qmldesigner-connections.html + \previouspage qtquick-adding-dynamics.html \nextpage quick-signals.html \title Adding Connections diff --git a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc index df88e5473ae..fed9a25ca26 100644 --- a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc @@ -188,7 +188,7 @@ or the entire UI. The changes you make to the UI are instantly visible to you in the preview. \li \key Alt+P (\key Opt+P on \macos) - \li \l{Previewing} + \li \l{Validating with Target Hardware} \row \li Preview size \li Displays the size of the preview dialog as a percentage. You can diff --git a/doc/qtcreator/src/qtquick/qtquick-export.qdoc b/doc/qtcreator/src/qtquick/qtquick-export.qdoc index e9c305c8c4c..2aed8fea62d 100644 --- a/doc/qtcreator/src/qtquick/qtquick-export.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-export.qdoc @@ -25,13 +25,8 @@ /*! \page creator-exporting-qml.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 + \nextpage qtquick-motion-design.html \title Exporting Components diff --git a/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc b/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc index 02a2a044dbd..41a17fc6234 100644 --- a/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc @@ -24,9 +24,14 @@ ****************************************************************************/ /*! - \previouspage qtquick-positioning.html \page qtquick-fonts.html + \if defined{qtdesignstudio} + \previouspage studio-importing-2d.html + \nextpage studio-importing-3d.html + \else + \previouspage qtquick-positioning.html \nextpage qtquick-annotations.html + \endif \title Using Custom Fonts diff --git a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc index 6b2a6fc224c..495629ab899 100644 --- a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc @@ -26,11 +26,12 @@ /*! \page quick-converting-ui-projects.html \if defined(qtdesignstudio) - \previouspage studio-importing-3d.html + \previouspage creator-vcs-git.html + \nextpage creator-editor-external.html \else - \previouspage creator-qml-modules-with-plugins.html + \previouspage qtquick-iso-icon-browser.html + \nextpage creator-using-qt-designer.html \endif - \nextpage creator-exporting-qml.html \title Converting UI Projects to Applications diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc index 6d1b2d8726c..f6577915c94 100644 --- a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 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. @@ -24,17 +24,13 @@ ****************************************************************************/ /*! - \if defined(qtdesignstudio) - \previouspage studio-3d-camera.html - \else - \previouspage creator-building-running.html - \endif \page creator-live-preview.html + \previouspage quick-states.html \nextpage creator-live-preview-desktop.html - \title Previewing + \title Validating with Target Hardware - You can use the QML live preview to preview a QML file or the entire + You can use the live preview feature to preview a UI file or the entire UI on the desktop, as well as on Android and embedded Linux devices. The changes you make to the UI are instantly visible to you in the preview. diff --git a/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc index ba92923c96b..31b69054fad 100644 --- a/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-modules-with-plugins.qdoc @@ -33,11 +33,10 @@ \page creator-qml-modules-with-plugins.html \if defined(qtdesignstudio) \previouspage studio-simulink.html - \nextpage studio-debugging.html \else - \previouspage qtquick-iso-icon-browser.html - \nextpage quick-converting-ui-projects.html + \previouspage qtquick-placeholder-data.html \endif + \nextpage qtquick-adding-dynamics.html \title Using QML Modules with Plugins diff --git a/doc/qtcreator/src/qtquick/qtquick-motion-design.qdoc b/doc/qtcreator/src/qtquick/qtquick-motion-design.qdoc index 0f15aeed24a..9d68b374bbc 100644 --- a/doc/qtcreator/src/qtquick/qtquick-motion-design.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-motion-design.qdoc @@ -25,6 +25,7 @@ /*! \page qtquick-motion-design.html + \previouspage creator-exporting-qml.html \nextpage quick-animation-overview.html \title Motion Design @@ -39,6 +40,14 @@ Learn more about which animation techniques are supported by \QDS and the use cases they are most suitable for. + + \li \l {Creating Animations} + + You can use a timeline and keyframe based editor in the + \uicontrol Timeline view to animate the properties of UI + components. Animating properties enables their values to + move through intermediate values at specified keyframes + instead of immediately changing to the target value. \li Production Quality (TODO) After the wireframing and prototyping phases, you can use the diff --git a/doc/qtcreator/src/qtquick/qtquick-placeholder-data.qdoc b/doc/qtcreator/src/qtquick/qtquick-placeholder-data.qdoc index c3133fd0b86..e684cfda634 100644 --- a/doc/qtcreator/src/qtquick/qtquick-placeholder-data.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-placeholder-data.qdoc @@ -25,12 +25,12 @@ /*! \page qtquick-placeholder-data.html - \if defined(qtdesignstudio) + \previouspage studio-simulation-overview.html + \if defined(qtdesignstudio) \nextpage studio-javascript.html \else - \previouspage qtquick-annotations.html - \nextpage creator-quick-ui-forms.html + \nextpage creator-qml-modules-with-plugins.html \endif \title Loading Placeholder Data diff --git a/doc/qtcreator/src/qtquick/qtquick-prototyping.qdoc b/doc/qtcreator/src/qtquick/qtquick-prototyping.qdoc new file mode 100644 index 00000000000..1e9c7840009 --- /dev/null +++ b/doc/qtcreator/src/qtquick/qtquick-prototyping.qdoc @@ -0,0 +1,109 @@ +/**************************************************************************** +** +** 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. +** +****************************************************************************/ + +/*! + \page qtquick-prototyping.html + \if defined(qtdesignstudio) + \previouspage qtquick-annotations.html + \else + \previouspage creator-quick-ui-forms.html + \endif + \nextpage qtquick-creating-ui-logic.html + + \title Prototyping + + \table + \row + \li \image studio-3d-scenes.png + \li After your UI wireframe has been approved, you can turn it + into an interactive prototype to ensure that you and the + developers share a common vision about the UI appearance + and functionality. You can create the UI logic to simulate + complex experiences and add dynamic behavior. You can then + validate your design on desktop, embedded, and mobile device + platforms. In the prototyping phase, you can also import + assets from 2D and 3D content creation tools to bring your + prototype closer to the final UI. + \endtable + + \list + + \li \l {Creating UI Logic} + + You can turn your wireframe into an interactive prototype by + adding the logic that enables your components to apply actions + or react to mock data from backend systems to simulate complex + experiences. + \li \l{Simulating Complex Experiences} + + You can connect UIs to different forms of data from various + sources, such as QML-based data models, JavaScript files, and + backend services. + \if defined(qtdesignstudio) + You can also connect your UI to Simulink to load live data from + a Simulink simulation. + \endif + + \li \l {Dynamic Behaviors} + + You can create connections between components to enable them to + communicate with each other. The connections can be triggered by + changes in component property values or in UI states. + + \if defined(qtdesignstudio) + \li \l {Validating with Target Hardware} + + You can use the live preview feature to preview a UI file or the + entire UI on the desktop, as well as on Android and embedded Linux + devices. The changes you make to the UI are instantly visible + to you in the preview. + + \li \l {Asset Creation with Other Tools} + + Describes how to export designs containing 2D and 3D assets into + 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. + + \else + \li \l {Exporting 3D Assets} + + You can export assets from 3D graphics applications into several + widely-used formats, such as .blend, .dae, .fbx, .glb, .gltf, .obj, + .uia, or .uip. + + \li \l {Importing 3D Assets} + + You can import exported assets into \QC. For a list of formats + supported by each \l{Qt Quick 3D} version, see the module + documentation. + + \li \l {Exporting Components} + + You can export components contained in \l{UI Files}{UI files} + (.ui.qml) to JSON metadata format and PNG assets. + \endif + + \endlist +*/ diff --git a/doc/qtcreator/src/qtquick/qtquick-states.qdoc b/doc/qtcreator/src/qtquick/qtquick-states.qdoc index 6267acb0717..f02e150a874 100644 --- a/doc/qtcreator/src/qtquick/qtquick-states.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-states.qdoc @@ -26,10 +26,10 @@ /*! \page quick-states.html \if defined(qtdesignstudio) - \previouspage quick-property-bindings.html + \previouspage quick-dynamic-properties.html \nextpage creator-live-preview.html \else - \previouspage qtbridge-figma-using.html + \previouspage quick-connections-backend.html \nextpage exporting-3d-assets.html \endif diff --git a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc index 6481f6bb022..16bcb47ea13 100644 --- a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc @@ -33,10 +33,11 @@ \page creator-quick-ui-forms.html \if defined(qtdesignstudio) \previouspage qtquick-annotations.html + \nextpage creator-telemetry.html \else - \previouspage qtquick-placeholder-data.html + \previouspage qtquick-annotations.html + \nextpage qtquick-prototyping.html \endif - \nextpage qtquick-adding-dynamics.html \title UI Files diff --git a/doc/qtdesignstudio/examples/doc/progressbar.qdoc b/doc/qtdesignstudio/examples/doc/progressbar.qdoc index 27042f72ea0..ddfc9c69eca 100644 --- a/doc/qtdesignstudio/examples/doc/progressbar.qdoc +++ b/doc/qtdesignstudio/examples/doc/progressbar.qdoc @@ -216,7 +216,8 @@ 100. When all our progress bar instances have been animated, we'll continue by specifying easing curves for them. - For more information about previewing UIs, see \l {Previewing}. + For more information about previewing UIs, see + \l {Validating with Target Hardware}. \section1 Specifying Easing Curves diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc index da7748a9a8b..db4800d66a6 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc @@ -24,7 +24,7 @@ ****************************************************************************/ /*! - \previouspage studio-getting-started.html + \previouspage studio-exporting-and-importing.html \page qtbridge-overview.html \nextpage qtbridge-ai.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc index 67d5db7276d..9f7ef447a8f 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc @@ -43,15 +43,13 @@ it mainly from the keyboard. \list - \li \l{Supported Platforms} - You can install and run \QC on several operating systems to design - UIs for multiple desktop, embedded, and mobile device platforms. \li \l{UI Files} Some of the wizards create projects that contain UI files (.ui.qml). You should always edit UI files in \l{Form Editor} and \l Properties, to avoid breaking the code. + \li \l{Coding} You can use the code editor in the \uicontrol {Text Editor} view or @@ -59,12 +57,6 @@ the QML language as code, not just as plain text. This enables it to provide you with useful features, such as semantic highlighting, checking code syntax, code completion, and refactoring actions. - \li \l{Simulating Data Input} - - \QDS enables you to connect UIs to different forms of data from various - sources, such as QML-based data models, JavaScript files, and backend - services. You can also connect your UI to Simulink to load live data from a - Simulink simulation. \li \l{Debugging and Profiling} \QDS comes with a JavaScript debugger. In the Debug mode, you diff --git a/doc/qtdesignstudio/src/qtdesignstudio-exporting-and-importing.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-exporting-and-importing.qdoc index e9b50c79a9d..f40e9ad6aeb 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-exporting-and-importing.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-exporting-and-importing.qdoc @@ -24,11 +24,11 @@ ****************************************************************************/ /*! - \previouspage studio-getting-started.html + \previouspage qt-design-viewer.html \page studio-exporting-and-importing.html \nextpage qtbridge-overview.html - \title Exporting and Importing + \title Asset Creation with Other Tools 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 @@ -66,8 +66,8 @@ \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 \l{Validating with Target Hardware}{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. diff --git a/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc index decfeac83e4..4185c6ed527 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc @@ -43,8 +43,10 @@ Contains answers to some frequently asked questions about \QDS. + \li \l{Supported Platforms} + You can install and run \QC on several operating systems to design + UIs for multiple desktop, embedded, and mobile device platforms. \endlist - */ diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc index 3e7e65f753b..e44a9952a2a 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc @@ -26,7 +26,7 @@ /*! \previouspage studio-importing-designs.html \page studio-importing-2d.html - \nextpage studio-importing-3d.html + \nextpage qtquick-fonts.html \title Importing 2D Assets diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc index 98642453836..c93df2a20ef 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc @@ -60,7 +60,7 @@ Because the projects do not contain any C++ code, you do not need to build them. To test how well your designs work, you can preview the UIs on the desktop or embedded Linux devices. For more - information, see \l{Previewing}. + information, see \l{Validating with Target Hardware}. \image studio-project-wizards.png "A list of project wizards" diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index 3250d6d73ab..da5b29fca83 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -111,22 +111,18 @@ \li \l{Scalable Layouts} \li \l{Annotating Designs} \endlist - \li \l{Prototyping} (NEW) + \li \l{Prototyping} \list - \li Creating UI Logic - \li \l{Simulating Data Input}{Simulating Complex Experiences} + \li \l{Creating UI Logic} + \li \l{Simulating Complex Experiences} \list \li \l{Loading Placeholder Data} \li \l{Simulating Application Logic} \li \l{Simulating Dynamic Systems} \li \l{Using QML Modules with Plugins} \endlist - \li \l{Adding Dynamics}{Dynamic Behaviors} + \li \l{Dynamic Behaviors} \list - \li \l{Creating Animations} - \list - \li \l{Editing Easing Curves} - \endlist \li \l{Adding Connections} \list \li\l{Connecting Components to Signals} @@ -135,34 +131,34 @@ \endlist \li \l{Adding States} \endlist - \li \l{Previewing}{Validating with Target Hardware} + \li \l{Validating with Target Hardware} \list \li \l{Previewing on Desktop} \li \l{Previewing on Devices} \li \l{Previewing in Browsers} \endlist - \li \l {Exporting and Importing}{Asset Creation with Other Tools} + \li \l {Asset Creation with Other Tools} \list \li \l{Exporting from Design Tools} \li \l{Exporting 2D Assets} (NEW) - \list - \li \l{Exporting Designs from Adobe Illustrator} - \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 - \endlist + \list + \li \l{Exporting Designs from Adobe Illustrator} + \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 + \endlist \li \l {Exporting 3D Assets} \list \li \l{Exporting from Blender} @@ -178,12 +174,13 @@ \li \l{Importing 3D Assets} \endlist \li \l{Exporting Components} - \li \l{To and from Qt Creator} (designer-developer workflow) \endlist \endlist \li \l{Motion Design} \list \li \l{Introduction to Animation Techniques} + \li \l{Creating Animations} + \li \l{Editing Easing Curves} \li \l{Production Quality} (NEW) \list \li \l{Detailed Motion Design} (NEW) diff --git a/doc/qtdesignstudio/src/qtdesignstudio-use-cases.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-use-cases.qdoc index c1633162522..dac2526ed0a 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-use-cases.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-use-cases.qdoc @@ -61,7 +61,7 @@ \row \li \l{Wireframing} \li \l{Prototyping} - \li \l{Exporting and Importing} + \li \l{Asset Creation with Other Tools} \li \l{Implementing Applications} \endtable */ diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc index 963c446eb03..1761fe504ce 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc @@ -63,19 +63,21 @@ \li \l{Scalable Layouts} \li \l{Annotating Designs} \endlist - \li \b {\l{Prototyping}} (NEW) + \li \b {\l{Prototyping}} \list - \li Creating UI Logic - \li \l{Simulating Data Input}{Simulating Complex Experiences} - \li \l{Adding Dynamics}{Dynamic Behaviors} - \li \l{Previewing}{Validating with Target Hardware} - \li \l{Exporting and Importing}{Asset Creation with Other Tools} + \li \l{Creating UI Logic} + \li \l{Simulating Complex Experiences} + \li \l{Dynamic Behaviors} + \li \l{Validating with Target Hardware} + \li \l{Asset Creation with Other Tools} \endlist \li \b {\l{Motion Design}} \list \li \l{Introduction to Animation Techniques} + \li \l{Creating Animations} + \li \l{Editing Easing Curves} \li \l{Production Quality} (NEW) - \li \l{Importing for Content Creation Tools} + \li \l{Importing from Content Creation Tools} \li \l{Optimizing for Target Hardware} (NEW) \endlist \row @@ -112,7 +114,7 @@ \row \li {4,1} \note To report bugs and suggestions to the \l{https://bugreports.qt.io/}{Qt Project Bug Tracker}, - select \uicontrol {Help > Report Bug} in QDS. + select \uicontrol {Help > Report Bug} in \QDS. To copy and paste detailed information about your system to the bug report, select \uicontrol Help > \uicontrol {System Information}. diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc index 68ab76c6559..c96480bfc34 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc @@ -29,7 +29,7 @@ /*! \page exporting-3d-assets.html \if defined(qtdesignstudio) - \previouspage + \previouspage figmaqtbridge.html \else \previouspage quick-states.html \endif @@ -37,6 +37,17 @@ \title Exporting 3D Assets + \if defined(qtcreator) + \table + \row + \li \inlineimage blender-logo.png + \li \inlineimage maya-logo.png + \row + \li \l{Exporting from Blender}{Blender} + \li \l{Exporting from Maya}{Maya} + \endtable + \endif + You can import files you created using 3D graphics applications and exported to 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} diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc index 29ef5c54068..96ecbb8b0d3 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc @@ -28,7 +28,12 @@ /*! \page exporting-from-qt3ds.html \previouspage exporting-from-maya.html + \if defined(qtdesignstudio) \nextpage studio-importing-designs.html + \else + \nextpage studio-importing-3d.html + \endif + \title Exporting from Qt 3D Studio Use the following guidelines to achieve the best results when converting diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc index 06d8cf804a7..624d7f5ecb9 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc @@ -26,12 +26,11 @@ /*! \page studio-importing-3d.html \if defined(qtdesignstudio) - \previouspage studio-importing-2d.html - \nextpage creator-exporting-qml.html + \previouspage qtquick-fonts.html \else \previouspage exporting-from-maya.html - \nextpage studio-3d-view.html \endif + \nextpage creator-exporting-qml.html \title Importing 3D Assets