Doc: restructure UI design section

Remove graphics and combine some short topics to
put more weight on Qt Quick development instead of
generic UI development.

Change-Id: Ief2041022e0ccb407c26b0742825613223082f0a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

5 files changed, 44 insertions, 82 deletions

diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
index 3b1bb028da..86815fdf85 100644
--- a/doc/src/qtcreator.qdoc
+++ b/doc/src/qtcreator.qdoc
@@ -190,10 +190,7 @@
                 \li \l {Creating Buttons}
                 \li \l {Creating Scalable Buttons and Borders}
                 \li \l {Creating Screens}
-                \li \l {Animating Screens}
-                \li \l {Adding User Interaction Methods}
                 \li \l {Exporting Designs from Graphics Software}
-                \li \l {Implementing Application Logic}
                 \li \l {Using QML Modules with Plugins}
             \endlist
             \li \l{Developing Widget Based Applications}
diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc
index 61caacd9a8..a9a152e8ce 100644
--- a/doc/src/qtquick/qtquick-app-development.qdoc
+++ b/doc/src/qtquick/qtquick-app-development.qdoc
@@ -31,67 +31,40 @@
 
     \title Developing Qt Quick Applications
 
-    You can either create Qt Quick projects from scratch or import existing
-    projects to \QC.
-
-    You can use the code editor (\l{Working in Edit Mode}{Edit mode}) or the
-    visual editor (\l{Using Qt Quick Designer}{Design mode}) to develop Qt Quick
-    applications.
-
-    Typically, application development proceeds as follows:
-
-    \table
-        \row
-            \li \inlineimage creator_createproject.png
-            \li \inlineimage creator_createcomponents.png
-            \li \inlineimage creator_createscreen.png
-        \row
-            \li \l {Creating Qt Quick Projects}{Create or import projects.}
-            \li \l {Creating Components}{Create components.}
-            \li \l {Creating Screens}{Create screens.}
-        \row
-            \li \inlineimage creator_createanimation.png
-            \li \inlineimage creator_createuserinter.png
-            \li \inlineimage creator_createcode.png
-        \row
-            \li \l {Animating Screens}{Add animation to screens.}
-            \li \l {Adding User Interaction Methods}
-                {Add user interaction methods.}
-            \li \l {Implementing Application Logic}
-                {Implement the application logic.}
-    \endtable
+    \list
 
-    \section1 Related Topics
+        \li \l {Creating Qt Quick Projects}
 
-    \list
+            You can either create Qt Quick projects from scratch or import
+            existing projects to \QC.
         \li \l {Using Qt Quick Designer}
-        \li \l {Creating Buttons}
-        \li \l {Creating Scalable Buttons and Borders}
-        \li \l {Exporting Designs from Graphics Software}
-        \li \l {Using QML Modules with Plugins}
-
-    \endlist
 
-*/
+            You can use the code editor (Edit mode) or the visual editor (Design
+            mode) to develop Qt Quick applications.
 
+        \li \l {Creating Components}
 
-/*!
+            You can use predefined QML types to create components or use a set
+            of Qt Quick Controls for creating classic desktop-style user
+            interfaces using Qt Quick 2.1 (available since Qt 5.1).
+        \li \l {Creating Screens}
 
-    \contentspage index.html
-    \previouspage quick-export-to-qml.html
-    \page quick-application-logic.html
-    \nextpage creator-qml-modules-with-plugins.html
+            You can use predefined QML types, Qt Quick Controls, and your own
+            components to create screens. You can use states and transitions to
+            navigate between screens.
+        \li \l {Exporting Designs from Graphics Software}
 
-    \title Implementing Application Logic
+            You can export designs from graphics software, such as Adobe
+            Photoshop and GIMP, to QML files. You can then edit QML files in
+            \QC.
+        \li \l {Using QML Modules with Plugins}
 
-    A user interface is only a part of an application, and not really useful by itself.
-    You can use Qt or JavaScript to implement the application logic. For more information on
-    using JavaScript, see
-    \l{http://qt-project.org/doc/qt-5.0/qtqml/qtqml-javascript-topic.html}
-    {Integrating QML and JavaScript}.
+            QML modules may use plugins to expose components defined in C++ to
+            QML applications. \QC cannot load the plugins to determine the
+            details of the contained components, and therefore, the modules must
+            provide extra type information for code completion and the semantic
+            checks to work correctly.
 
-    For an example of how to use JavaScript to develop a game, see the
-    \l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick2-qml-advtutorial.html}
-    {QML Advanced Tutorial}.
+    \endlist
 
- */
+*/
diff --git a/doc/src/qtquick/qtquick-exporting-qml.qdoc b/doc/src/qtquick/qtquick-exporting-qml.qdoc
index 010b91ef52..9244df48d2 100644
--- a/doc/src/qtquick/qtquick-exporting-qml.qdoc
+++ b/doc/src/qtquick/qtquick-exporting-qml.qdoc
@@ -25,9 +25,9 @@
 /*!
 
     \contentspage index.html
-    \previouspage quick-user-interaction.html
+    \previouspage quick-screens.html
     \page quick-export-to-qml.html
-    \nextpage quick-application-logic.html
+    \nextpage creator-qml-modules-with-plugins.html
 
     \title Exporting Designs from Graphics Software
 
diff --git a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
index e28920cd6e..7536b1cba2 100644
--- a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
+++ b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
@@ -24,7 +24,7 @@
 
 /*!
     \contentspage index.html
-    \previouspage quick-application-logic.html
+    \previouspage quick-export-to-qml.html
     \page creator-qml-modules-with-plugins.html
     \nextpage creator-using-qt-designer.html
 
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index e9b62f89d5..86904ceaa7 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -27,7 +27,7 @@
     \contentspage index.html
     \previouspage quick-scalable-image.html
     \page quick-screens.html
-    \nextpage quick-animations.html
+    \nextpage quick-export-to-qml.html
 
     \title Creating Screens
 
@@ -183,17 +183,7 @@
 
         \endlist
 
-*/
-
-
-/*!
-
-    \contentspage index.html
-    \previouspage quick-screens.html
-    \page quick-animations.html
-    \nextpage quick-user-interaction.html
-
-    \title Animating Screens
+    \section1 Animating Screens
 
     To make movement between states smooth, you can specify transitions. You can
     use different types of animated transitions. For example, you can animate
@@ -210,17 +200,7 @@
     see \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-transition.html}
     {Transition}.
 
-*/
-
-
-/*!
-
-    \contentspage index.html
-    \previouspage quick-animations.html
-    \page quick-user-interaction.html
-    \nextpage quick-export-to-qml.html
-
-    \title Adding User Interaction Methods
+    \section1 Adding User Interaction Methods
 
     You can add the following basic interaction methods to scenes:
 
@@ -242,4 +222,16 @@
 
     \endlist
 
+    \section1 Implementing Application Logic
+
+    A user interface is only a part of an application, and not really useful by itself.
+    You can use Qt or JavaScript to implement the application logic. For more information on
+    using JavaScript, see
+    \l{http://qt-project.org/doc/qt-5.0/qtqml/qtqml-javascript-topic.html}
+    {Integrating QML and JavaScript}.
+
+    For an example of how to use JavaScript to develop a game, see the
+    \l{http://qt-project.org/doc/qt-5.0/qtquick/qtquick2-qml-advtutorial.html}
+    {QML Advanced Tutorial}.
+
 */