Doc: new wizard layout and options

Change-Id: Ib19010e913ebf1702f89a220f633053bbca28545
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

4 files changed, 135 insertions, 37 deletions

diff --git a/doc/images/qtcreator-cpp-class-wizard.png b/doc/images/qtcreator-cpp-class-wizard.png
index 6b3483f0e9..f6d2a4832e 100644
--- a/doc/images/qtcreator-cpp-class-wizard.png
+++ b/doc/images/qtcreator-cpp-class-wizard.png
diff --git a/doc/images/qtcreator-new-opengl-file.png b/doc/images/qtcreator-new-opengl-file.png
index c63e05a93e..789e762e77 100644
--- a/doc/images/qtcreator-new-opengl-file.png
+++ b/doc/images/qtcreator-new-opengl-file.png
diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png
index 6cfb7fb5af..0287d8c6fb 100644
--- a/doc/images/qtcreator-new-qt-quick-project-wizard.png
+++ b/doc/images/qtcreator-new-qt-quick-project-wizard.png
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index 2fc96c64b4..7c0ead0041 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -88,11 +88,13 @@
     \section1 Using Project Wizards
 
     In the first step, you
-    select the type of the project. Next, you select a location for the project
-    and specify settings for it.
+    select a template for the project. You can filter templates (1) to view only
+    those that apply to a particular target.
 
     \image qtcreator-new-qt-quick-project-wizard.png
 
+    Next, you select a location for the project and specify settings for it.
+
     When you have completed the steps, \QC automatically generates the project
     with required headers, source files, user interface descriptions and project
     files, as defined by the wizard.
@@ -105,53 +107,137 @@
 
     \list
 
-        \o  Qt Quick Project
+        \o  Applications
+
+        \list
+
+            \if defined(qcmanual)
+            \o  Qt GUI Application
+
+                Use \QD forms to design a Qt widget based user interface for the
+                desktop and C++ to implement the application logic
+
+            \o  Mobile Qt Application
+
+                Use \QD forms to design a Qt widget based user interface for
+                mobile devices and C++ to implement the application logic.
+                Select this template to develop for devices that support only
+                Qt 4.6.x
+            \endif
+
+            \o  Qt Quick Application (Built-in Elements)
+
+                Use built-in QML elements to design Qt Quick based user
+                interfaces with a custom look and feel and QML and C++ code to
+                implement the application logic
+
+            \o  Qt Quick Application for Symbian
+
+                Use Qt Quick Components for Symbian to design a user interface
+                with the platform look and feel. Select this template to develop
+                for Symbian devices that support Qt 4.7.4 or later and have the
+                Qt Quick Components installed
+
+            \o  Qt Quick Application for MeeGo Harmattan
+
+                Use Qt Quick Components for MeeGo Harmattan to design a user
+                interface with the platform look and feel
+
+            \o  Qt Quick Application (from Existing QML File)
+
+                Convert existing QML applications to projects that you can run
+                in \QC or deploy to mobile devices
 
-            Use QML elements or Qt Quick Components to define the user interface
-            and, optionally, C++ or JavaScript to define the application logic.
+            \o  Qt Console Application
 
-        \if defined(qcmanual)
-        \o  Qt Widget Project
+                Use a single main.cpp file
 
-            Use \QD forms to define a Qt widget based user interface and C++ to
-            define the application logic
-        \endif
+            \o  HTML5 Application
 
-        \o  Other Project
+                Use a QtWebKit view to desigm the user interface and HTML5 and
+                C++ code to implement the application logic
+
+            \o  Qt Quick UI
+
+                Use a single QML file that contains the main view. You can run
+                Qt Quick UI projects in the QML Viewer and you need not build
+                them. You do not need to have the development environment
+                installed on your computer to create and run this type of
+                projects
+
+        \endlist
+
+        \o  Libraries
 
         \list
 
-            \o  HTML5 based applications that contain both HTML5 and C++ code
-                and include a WebKit view
+            \o  C++ Library
 
-            \o  Qt console applications that contain a single main.cpp file with
-                a stub implementation
+                Shared or static C++ library based on qmake
 
-            \o  Shared or static C++ libraries
+            \o  Custom QML Extension Plugin
 
-            \o  Plain C or C++ projects that use qmake but do not use the Qt
-                library
+                C++ plugin that makes it possible to offer extensions
+                that can be loaded dynamically into applications by using the
+                QDeclarativeEngine class
+
+            \o  \QC Plugin
 
-            \o  Qt unit tests for features or classes
+
+        \endlist
+
+        \o  Other Projects
+
+        \list
+
+            \o  Qt Unit Test
+
+                Qt unit tests for features or classes
 
             \if defined(qcmanual)
             \o  Qt Custom Designer Widgets
+
+                Custom \QD widget or widget collection
             \endif
 
-            \o  \QC plugins
+            \o  Plain C/C++ Project
+
+                Plain C or C++ project that uses qmake but does not use the Qt
+                library
 
-            \o  Empty Qt projects that are based on qmake but do not use any
+            \o  Empty Qt Project
+
+                Empty Qt project that is based on qmake but does not use any
                 default classes
 
-            \o  Subprojects to structure your qmake projects as a tree hierarchy
+            \o  Subdirs Project
+
+                Subprojects that enable you to structure your qmake projects as
+                a tree hierarchy
 
         \endlist
 
-        \o  Project from Version Control
+        \o  Non-Qt Projects
+
+            Plain C or C++ projects that use CMake but do not use the Qt library
+
+        \o  Import Project
+
+        \list
+
+        \o  Project from version control
 
             Import a project from a supported version control system. For more
             information on how version control systems are integrated in
-            \QC, see \l{Using Version Control Systems}.
+            \QC, see \l{Using Version Control Systems}
+
+        \o  Import Existing Project
+
+            Import an existing project that does not use any of the supported
+            build systems: qmake, CMake, or Autotools. This enables you to use
+            \QC as a code editor
+
+        \endlist
 
     \endlist
 
@@ -180,29 +266,41 @@
 
     \list
 
-        \o  Qt resource files, which allow you to store binary files in the
-            application executable
+        \o  C++
 
-        \if defined(qcmanual)
-        \o  \QD forms and \QD form classes, which specify parts of user
-            interfaces in Qt widget based projects
-        \endif
+            C++ class, source, or header files that you can use to write the
+            application logic in both Qt Quick projects and
+            \if defined(qcmanual)
+            Qt widget based projects
+            \endif
 
-        \o  QML files, which specify elements in Qt Quick projects
+        \o  Qt
 
-        \o  GLSL files that define fragment and vertex shaders in both Qt Quick
-            projects and Qt widget based projects
+        \list
 
-        \o  C++ class, source, or header files that you can use to write the
-            application logic in both Qt Quick projects and
             \if defined(qcmanual)
-            Qt widget based projects
+            \o  \QD forms and \QD form classes, which specify parts of user
+                interfaces in Qt widget based projects
             \endif
 
+        \o  Qt resource files, which allow you to store binary files in the
+            application executable
+
+        \o  QML files, which specify elements in Qt Quick projects
+
         \o  JavaScript files that you can use to write the application logic in
             Qt Quick projects
 
-        \o  Text files
+        \endlist
+
+        \o  GLSL
+
+            GLSL files that define fragment and vertex shaders in both Qt Quick
+            projects and Qt widget based projects
+
+        \o  General
+
+            Text files
 
     \endlist