aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-11-26 10:55:37 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-11-27 13:54:38 +0000
commite1a892369905c073a7e30530c4cc32f6a012f8d8 (patch)
tree53af250c652ffc4738a7fc0244950d8fccce8c39
parent7f2823791543ad8348ab9a36d031dd8473fd5161 (diff)
Doc: Replace most occurrences of "artwork" with "design"
...or remove the term. Qt Bridge can be use to export complete UI designs, instead of just artwork, and we want to stress that. Task-number: QDS-2744 Change-Id: I843b09d822c77ca4a59b993a9b3e392b747c15f6 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Antti Aaltonen Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--doc/qtcreator/src/qtquick/qtdesignstudio-best-practices.qdoc2
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-uis.qdoc38
-rw-r--r--doc/qtdesignstudio/examples/doc/images/webinardemo-blureffect.pngbin49263 -> 41536 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/images/webinardemo-mainappui.pngbin233963 -> 211375 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/images/webinardemo-states.pngbin8247 -> 12616 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/images/webinardemo-timeline.pngbin18458 -> 14513 bytes
-rw-r--r--doc/qtdesignstudio/examples/doc/webinardemo.qdoc18
-rw-r--r--doc/qtdesignstudio/src/qtbridge/qtbridge-ai.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc6
-rw-r--r--doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc6
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc20
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc4
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc2
-rw-r--r--doc/qtdesignstudio/src/qtdesignstudio.qdoc2
17 files changed, 55 insertions, 51 deletions
diff --git a/doc/qtcreator/src/qtquick/qtdesignstudio-best-practices.qdoc b/doc/qtcreator/src/qtquick/qtdesignstudio-best-practices.qdoc
index e950769040..5b3573620c 100644
--- a/doc/qtcreator/src/qtquick/qtdesignstudio-best-practices.qdoc
+++ b/doc/qtcreator/src/qtquick/qtdesignstudio-best-practices.qdoc
@@ -43,7 +43,7 @@
\if defined(qtdesignstudio)
For guidelines on how to achieve best results when importing assets, see
- \l {Exporting Artwork from Design Tools}.
+ \l {Exporting from Design Tools}.
\endif
\section1 Naming Conventions
diff --git a/doc/qtcreator/src/qtquick/qtquick-uis.qdoc b/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
index 74bc891d71..2461f6468b 100644
--- a/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-uis.qdoc
@@ -42,19 +42,20 @@
for you.
\endif
- 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. You can specify values for the \e properties of a
+ 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 \uicontrol Library view in the Design
+ mode. You can specify values for the \e properties of a
component to change its appearance and behavior. All QML types have a
set of predefined properties, some of which control things that are
visible to users, while others are used behind the scene.
While it is useful to learn the basics of Qt Quick, you can also rely on
\QMLD to write the code for you when you drag-and-drop the ready-made
- components to the \uicontrol {Form Editor} view and change them to your
- liking by modifying their properties in the \uicontrol Properties view in
- the Design mode. You can always check up details in the extensive Qt Quick
+ components from the \uicontrol Library view to the \uicontrol {Form Editor}
+ or \uicontrol Navigator view and change them to your liking by modifying
+ their properties in the \uicontrol Properties view.
+ You can always check up details in the extensive Qt Quick
documentation by pressing \key F1.
\list
@@ -62,9 +63,8 @@
\if defined(qtdesignstudio)
\li \l {Designing Application Flows}
- After you export and import your artwork, you can design the
- application flow in the form of a \e {schematic diagram} that
- shows all significant components of an application UI and their
+ You can design an application in the form of a \e {schematic diagram}
+ that shows all significant components of an application UI and their
interconnections by means of symbols. This results in an
interactive prototype that can be clicked through to simulate
the user experience of the application.
@@ -72,16 +72,15 @@
\li \l {Creating Components}
- In addition to your imported artwork, you can use the Design
- mode to customize ready-made components or design any custom form
- and shape directly as QML types. You can import visual assets in
- various formats, such as PNG, JPG, and SVG for use in the
- components.
+ You can enhance imported designs by customizing ready-made
+ components or design custom forms and shapes directly as
+ QML types. You can import visual assets in various formats,
+ such as PNG, JPG, and SVG for use in the components.
\li \l {Managing Item Hierarchy}
You can manage the items in the current QML file and their
- relationships in the \uicontrol Navigator.
+ relationships in the \uicontrol Navigator view.
\li \l {Specifying Item Properties}
@@ -92,6 +91,13 @@
type. You can specify properties for your components in the
\uicontrol Properties view.
+ \li \l {Positioning Items}
+
+ The position of an item in a UI can be either absolute or relative
+ to other items. While manual positioning is efficient for a static
+ UI, consider the other available method, such as anchors, layouts,
+ positioners, and property bindings, for dynamic UIs.
+
\li \l {Using Custom Fonts}
You can load custom fonts to \QMLD and use them in your designs.
diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-blureffect.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-blureffect.png
index 32a40a8de5..060f6da824 100644
--- a/doc/qtdesignstudio/examples/doc/images/webinardemo-blureffect.png
+++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-blureffect.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-mainappui.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-mainappui.png
index 29d39c8267..1c2f25fead 100644
--- a/doc/qtdesignstudio/examples/doc/images/webinardemo-mainappui.png
+++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-mainappui.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-states.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-states.png
index 83755e876a..6d074c1a15 100644
--- a/doc/qtdesignstudio/examples/doc/images/webinardemo-states.png
+++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-states.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-timeline.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-timeline.png
index c6c0976eed..71f5eb49fb 100644
--- a/doc/qtdesignstudio/examples/doc/images/webinardemo-timeline.png
+++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-timeline.png
Binary files differ
diff --git a/doc/qtdesignstudio/examples/doc/webinardemo.qdoc b/doc/qtdesignstudio/examples/doc/webinardemo.qdoc
index 1e13961c91..5ff9fd35dd 100644
--- a/doc/qtdesignstudio/examples/doc/webinardemo.qdoc
+++ b/doc/qtdesignstudio/examples/doc/webinardemo.qdoc
@@ -42,12 +42,12 @@
\section1 Exporting from Adobe Photoshop
We use Adobe Photoshop to design our application and \QB to export our
- artwork to \QDS as PNG images and custom QML types.
+ design to \QDS as PNG images and custom QML types.
Before we can begin, we must set up \QB as instructed in
\l{Exporting Designs from Adobe Photoshop}.
- We organize our artwork in Photoshop using artboards as instructed in
+ We organize our design in Photoshop using artboards as instructed in
\l{Organizing Assets}.
\QB automatically proposes identifiers for all groups and layers. The ids
@@ -116,10 +116,10 @@
To be able to use the type, we added the statement that imports the
Qt Quick Studio Effects module: \c {QtQuick.Studio.Effects 1.0}.
- We specify that the artwork to which we want to apply the effect is a
+ We specify that the component to which we want to apply the effect is a
child of the effect. We then specify the radius property for the effect,
in the \uicontrol {QML Properties} field. We can modify the property in
- \QDS.
+ the \uicontrol Radius field in the \uicontrol Properties view in \QDS.
\image webinardemo-blureffect.png "FastBlurItem QML item in Design mode"
@@ -142,18 +142,18 @@
We want to animate the contents of the \e largePopup artboard in \QDS, so
we export each group and layer as a child.
- \section2 Exporting Artwork
+ \section2 Exporting Our Design
When we have specified settings for all the artboards and the groups and
layers in them, we select \uicontrol Export to copy the assets and metadata
to the export path we specified.
- \section1 Importing Artwork
+ \section1 Importing Our Design
- After using \QB in Adobe Photoshop to export our artwork, we import it into
+ After using \QB in Adobe Photoshop to export our design, we import it into
a project that we create in \QDS, as instructed in \l{Importing Designs}.
- If we need to make changes in Photoshop later and export our artwork again,
+ If we need to make changes in Photoshop later and export our design again,
\QDS will try to merge our changes during the import, so that none of the
changes we mage in \QDS are lost.
@@ -185,7 +185,7 @@
\image webinardemo-states.png "Popup states in the States view"
- For more information about using states, see \l {Creating Animations}.
+ For more information about using states, see \l {Creating States}.
We then use the \uicontrol Timeline view to add animations that are run
when moving from one state to another.
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ai.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ai.qdoc
index 4d870c8497..e7dddea24f 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ai.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ai.qdoc
@@ -31,7 +31,7 @@
\title Exporting Designs from Adobe Illustrator
Even though \QDS does not provide a specific export bridge for Adobe
- Illustrator, you can create artwork in it and export it to \QDS in
+ Illustrator, you can desing UIs in it and export your designs to \QDS in
the following ways:
\list
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc
index 7d3509a006..27fd037067 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc
@@ -28,7 +28,7 @@
\page qtbridge-overview.html
\nextpage qtbridge-ai.html
- \title Exporting Artwork from Design Tools
+ \title Exporting from Design Tools
You need to use \QB to first export 2D assets from design tools and then to
\l{Importing Designs}{import} them into \QDS.
@@ -56,12 +56,12 @@
\li \l{Exporting Designs from Adobe Photoshop}
You can use the \QBPS export tool in Adobe Photoshop to convert
- artwork into \e {.metadata} format that you can import into
+ designs into \e {.metadata} format that you can import into
projects in \QDS.
\li \l{Exporting Designs from Sketch}
- You can use the \QBSK export tool in Sketch to convert artwork into
+ You can use the \QBSK export tool in Sketch to convert designs into
metadata that you can import into projects in \QDS.
\li \l{Exporting 3D Assets}
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc
index 5b0bab0e50..aedd017a93 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc
@@ -44,7 +44,7 @@
\li \l{Setting Up Qt Bridge for Adobe Photoshop}
You must install and set up the \QBPS export tool before you can use
- it to export artwork.
+ it to export designs.
\li \l{Using Qt Bridge for Adobe Photoshop}
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc
index f643a5d20e..cab3e9b322 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc
@@ -60,7 +60,7 @@
will be imported as a single QML file that can contain other assets. A child
will be imported as a single image file that you can use within QML files.
- If you plan to use pieces of your artwork as separate images in the UI,
+ If you plan to use pieces of your design as separate images in the UI,
group them on an artboard as separate layers. You can then export the group
as a component and each layer within it as a child. The children are
imported to \QDS as separate PNG files that you can use as image sources.
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc
index 5471fdbf28..4f626c1af0 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc
@@ -44,7 +44,7 @@
\li \l{Setting Up Qt Bridge for Sketch}
You must install Sketch and the \QBSK export tool before you can use
- the tool to export artwork.
+ the tool to export designs.
\li \l{Using Qt Bridge for Sketch}
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc
index 19898c2490..9dc01844d2 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-app-flows.qdoc
@@ -30,10 +30,8 @@
\title Designing Application Flows
- After you \l {Exporting Artwork from Design Tools}{export} your artwork from
- your favorite design tool and \l{Importing Designs}{import} it to \QDS, you
- can design the application flow in the form of a \e {schematic diagram} that
- shows all significant components of an application UI and their
+ You can design the application flow in the form of a \e {schematic diagram}
+ that shows all significant components of an application UI and their
interconnections by means of symbols. This results in an interactive
prototype that can be clicked through to simulate the user experience of
the application. The QML code is created in the background and can be used
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc
index e216828828..dd11d02c7d 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc
@@ -30,12 +30,12 @@
\title Getting Started
- Typically, you as a designer would create artwork in imaging and design
- tools, such as Adobe Photoshop, Sketch, Blender, or Maya, and then send it
- to a developer for adding it to the application. With the \QB export tool,
+ Typically, you as a designer would design a UI using imaging and design
+ tools, such as Adobe Photoshop, Sketch, Blender, or Maya, and then send your
+ 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
+ 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.
@@ -46,8 +46,8 @@
The workflow consists of the following steps:
\list 1
- \li Export your artwork from a design tool.
- \li Create a project in \QDS and import your artwork to it.
+ \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 timeline and easing curve editor.
\li Create interactions using states and connections.
@@ -59,16 +59,16 @@
way around \QDS:
\list
- \li \l {Exporting Artwork from Design Tools}
+ \li \l {Exporting from Design Tools}
- Describes how to export 2D and 3D assets into files that
- you can import to projects in \QDS.
+ Describes how to export designs containing 2D and 3D assets into
+ files that you can import to projects in \QDS.
\li \l {User Interface}
Describes the parts and basic features of \QDS.
\li \l{Editing QML Files in Design Mode}
- Describes the parts and basic features of the Design mode.
+ Describes the views and basic features of the Design mode.
This is where you'll do most of your work.
\li \l {Tutorials}
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
index 83cef36ea5..5adc1751c8 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc
@@ -30,13 +30,13 @@
\title Importing 2D Assets
- \image studio-imported-assets.png "Artwork imported into Qt Design Studio"
+ \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
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. For more information, see \l {Exporting Artwork from Design Tools}.
+ \QDS. For more information, see \l {Exporting from Design Tools}.
\note Attempting to import assets exported on another system might fail.
diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
index 52ad03e04d..c883a14dc1 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc
@@ -31,7 +31,7 @@
\list
\li \l{Getting Started}
\list
- \li \l{Exporting Artwork from Design Tools}
+ \li \l{Exporting from Design Tools}
\list
\li \l{Exporting Designs from Adobe Illustrator}
\li \l{Exporting Designs from Adobe Photoshop}
diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
index 1fa4e2be98..06d140b5b1 100644
--- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc
+++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc
@@ -45,7 +45,7 @@
\row
\li \b {\l{Getting Started}}
\list
- \li \l{Exporting Artwork from Design Tools}
+ \li \l{Exporting from Design Tools}
\li \l{User Interface}
\li \l{Editing QML Files in Design Mode}
\li \l{Tutorials}