From 048a8269430cd5da98cea8d6238d7278ba1fd779 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 19 Feb 2021 10:37:32 +0100 Subject: [PATCH] Doc: Rename Form Editor view topic using the view name ...and move it to the topic that describes Design views. Change-Id: Ifb0c70936cb1059b8c7e4b86a23a4035b8047411 Reviewed-by: Thomas Hartmann --- doc/qtcreator/src/qtcreator-toc.qdoc | 2 +- doc/qtcreator/src/qtquick/qtquick-components.qdoc | 2 +- doc/qtcreator/src/qtquick/qtquick-designer.qdoc | 2 +- doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc | 8 ++++---- doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index 10b5c1e76fb..8ccab79a3a0 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -93,13 +93,13 @@ \li \l {Editing QML Files in Design Mode} \list + \li \l{Form Editor} \li \l{Library} \endlist \li \l {Creating UIs} \list \li \l {Creating Components} \list - \li \l{Editing 2D Content} \li \l{Shapes} \li \l{Text} \li \l{Images} diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc index 0f7d989f6e4..5f7711b8af4 100644 --- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc @@ -152,7 +152,7 @@ \list - \li \l{Editing 2D Content} + \li \l{Form Editor} \li \l{Working in 3D Editor}{3D Editor} diff --git a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc index c3cc768f4cf..09dd1846d41 100644 --- a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc @@ -33,7 +33,7 @@ \page creator-using-qt-quick-designer.html \if defined(qtdesignstudio) \previouspage creator-modes.html - \nextpage creator-project-managing-workspaces.html + \nextpage qtquick-form-editor.html \else \previouspage quick-projects.html \nextpage quick-uis.html diff --git a/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc index 951479b9d01..e93be2f583f 100644 --- a/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc @@ -25,13 +25,13 @@ /*! \page qtquick-form-editor.html - \previouspage quick-components.html - \nextpage quick-shapes.html + \previouspage creator-using-qt-quick-designer.html + \nextpage quick-library.html - \title Editing 2D Content + \title Form Editor You design applications in the \uicontrol {Form Editor} view by placing - 2D components and assets into it. + \l{Component Types}{2D components} and \l{Assets}{assets} into it. When you select items in \uicontrol {Form Editor}, markers appear around their edges and in their corners. Depending on the shape of diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index 02af2c4b3f9..6b23964d095 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -58,6 +58,7 @@ \li \l{Selecting Modes} \li \l{Editing QML Files in Design Mode} \list + \li \l{Form Editor} \li \l{Library} \endlist \li \l{Managing Workspaces} @@ -86,7 +87,6 @@ \li \l{Designing Application Flows} \li \l{Creating Components} \list - \li \l{Editing 2D Content} \li \l{Shapes} \li \l{Text} \li \l{Images}