From e31942fb23c38b92db06b2da6621ef6127907111 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Thu, 21 Mar 2024 15:12:58 +0100
Subject: [PATCH] Doc: Organize the front page into four columns

Lots of the information from the first column will still
move into the How To and Reference sections in future releases.

- Remove obsolete sub-TOC topics.
- Rename the "Overview" as "Developing with Qt Creator" and place it
  first in the TOC.

Task-number: QTCREATORBUG-29361
Change-Id: I8af0460b2391f3152606e5326bb7e8f630f64531
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 doc/qtcreator/config/style/qt5-sidebar.html   |  33 ++++---------
 doc/qtcreator/images/front-projects.png       | Bin 676 -> 0 bytes
 doc/qtcreator/images/front-publishing.png     | Bin 715 -> 0 bytes
 doc/qtcreator/images/front-testing.png        | Bin 905 -> 0 bytes
 .../creator-only/creator-getting-started.qdoc |   4 +-
 .../creator-only/creator-overview.qdoc        |  11 +++--
 .../creator-only/creator-reference.qdoc       |   2 +-
 .../creator-only/creator-testing.qdoc         |  44 ------------------
 doc/qtcreator/src/qtcreator-toc.qdoc          |  22 ++++-----
 doc/qtcreator/src/qtcreator.qdoc              |  34 +++++---------
 10 files changed, 40 insertions(+), 110 deletions(-)
 delete mode 100644 doc/qtcreator/images/front-projects.png
 delete mode 100644 doc/qtcreator/images/front-publishing.png
 delete mode 100644 doc/qtcreator/images/front-testing.png
 delete mode 100644 doc/qtcreator/src/overview/creator-only/creator-testing.qdoc

diff --git a/doc/qtcreator/config/style/qt5-sidebar.html b/doc/qtcreator/config/style/qt5-sidebar.html
index 9fc4a6bc7b3..509808af114 100644
--- a/doc/qtcreator/config/style/qt5-sidebar.html
+++ b/doc/qtcreator/config/style/qt5-sidebar.html
@@ -5,13 +5,20 @@
 </div>
 <div class="sectionlist normallist">
     <div class="heading">
-        <h2>Getting Started</h2>
+        <h2>Developing with Qt Creator</h2>
     </div>
     <div class="indexboxcont indexboxbar">
         <ul>
             <li><a href="creator-overview.html">Overview</a></li>
-            <li><a href="creator-quick-tour.html">User Interface</a></li>
-            <li><a href="creator-configuring.html">Configuring Qt Creator</a></li>
+            <li><a href="creator-getting-started.html">Getting Started</a></li>
+            <li><a href="creator-project-creating.html">Creating Projects</a></li>
+            <li><a href="creator-configuring-projects.html">Configuring Projects</a></li>
+            <li><a href="creator-live-preview.html">Validating with Target Hardware</a></li>
+            <li><a href="creator-connecting-mobile.html">Connecting Devices</a></li>
+            <li><a href="creator-deployment.html">Deploying to Devices</a></li>
+            <li><a href="creator-debugging.html">Debugging</a></li>
+            <li><a href="creator-analyze-mode.html">Analyzing Code</a></li>
+            <li><a href="creator-squish.html">Using Squish</a></li>
         </ul>
     </div>
 </div>
@@ -34,26 +41,6 @@
         </ul>
     </div>
 </div>
-<div class="sectionlist normallist">
-        <div class="heading">
-            <h2>Running on Devices</h2>
-        </div>
-        <ul>
-            <li><a href="creator-live-preview.html">Validating with Target Hardware</a></li>
-            <li><a href="creator-deployment.html">Deploying to Devices</a></li>
-            <li><a href="creator-connecting-mobile.html">Connecting Devices</a></li>
-        </ul>
-</div>
-<div class="sectionlist normallist">
-        <div class="heading">
-            <h2>Debugging and Analyzing</h2>
-        </div>
-        <ul>
-            <li><a href="creator-debugging.html">Debugging</a></li>
-            <li><a href="creator-analyze-mode.html">Analyzing Code</a></li>
-            <li><a href="creator-squish.html">Using Squish</a></li>
-        </ul>
-</div>
 <div class="sectionlist normallist">
     <div class="heading">
         <h2>How To</h2>
diff --git a/doc/qtcreator/images/front-projects.png b/doc/qtcreator/images/front-projects.png
deleted file mode 100644
index bd3412e8489a20f81e3c81bd7848bde1de66abc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 676
zcmeAS@N?(olHy`uVBq!ia0y~yU~mCp4rT@h2L7|j4Gatne*%0$Tp1V`82&RfG%z^q
zXUN^Ak}zK(bd^lnW~ro&BGF5P;?_wgu98StB^tL%IChnI{0gzSHDXb#MB~<oMy(Q#
zT_Ya5N;r0<SoCVq*p;F&t3+Z}iNviIk69@evr;s6wMg_Tk=RwD(JMt_R*A)|5{+Ih
z8ogQsgjR{ht`?03Nr}d+hA0q;StS~?5`<z`gGdk?tOjhXC`kJ%(P)qrAdMi!t3ZOW
zU@~TvD4YS8!o~nO11=tsxZ*kk14BqjkY6wZBNGcd2PYRVpRlNew4$<}fuWhXle?#v
zx1WD-SVUBEYGzJuL2*T8bz4Vg*W{_Q=gwQWa_#yp+ji_ea_rQ(%hzw+e)QzUt2ggH
zeEjtF+mD~W|NQ;8vb^de0|O(or;B4q#NoGB+=H1M1==2pr7{XT8Z2TFz9|#v7|1g5
z$KU_|4>gKjD>}Vt`S-N_$1QEH8poQt%vzRNe|mdu*zY6JrNIer_AoFM>`w4GGv6ua
zOzcTst%?K}_M+x>>c@&55_E1i%hXz@C~5w7HR{`ZV)gv?DLGG$C7K96RTMXCa&B+r
zl`Hz!+QXN|cCFGwFgUe7t6=@+_L)JP`b(o3E^MwiktA=wJ9(YOjRMC>K93I`t@w1Z
zH_s=Jr!3O##MvJ=grpCj7EM;3Zc$m2Z~E@@>Sxs_rT-}_nqK*#dOA@?S}Nq*fd#vM
z=(${(cHS}M>wyJJ*x3TNF>f(eIn%ZNr|0D@_17eF^rr9I<a00!l-xXB{an^LB{Ts5
D&}<eZ

diff --git a/doc/qtcreator/images/front-publishing.png b/doc/qtcreator/images/front-publishing.png
deleted file mode 100644
index 9946aa36cd3d87afa2ea864171b4cc44ef9f9e69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 715
zcmeAS@N?(olHy`uVBq!ia0y~yU~mCp4rT@h2L7|j4GatnR|9-PT>t<7&p-rlb8};0
zU~qJF#IIIfUVhc8RdRB23l}b&w`kF-RjUjP45rVTWo&FbbLPzHt5!{&F{87mr+?C<
z-U$<0+uIwOo12=Ns;jG4ty*7MSy^0Kx_b56RjXFz<>lq(=V#^QWM*e)WM%E%y?gKe
z!`E)yxpC{x`HPn?UAeY<_wF_8)@|OlZR5r*yZ7z8diBPW=g)87yZ7wnOUJW8>Pw2x
zFfcH<l?3?(GcYo-u(GjpaB&NYipk2$D`;xz8yQ<WIJ<ay`}p|!`TGY11O|nNN5sU&
zC8wljW#{A<6ql4%RMyrvHBXy8d)~^`tJiK`tj#3Dz`z*q>Eaj?aro`@?w}?I5r>0b
zJf_;81E-|C3u<&qT(sBt>%af%TNm(H98TV8HaU4t;ya@=Z)T>-mzT3DK9^S#^KLhs
z(xo(iaX@XP15fw!tj5){TP0NtR)5^$TGi@uPld0ONArZtq@r0%&M2;2;;FSq$hXtw
zwCZh@ol)8alioR$a+h8>>V1XNCdlapvrovLCt?q7SHJrpbaaMZ`mZYo{`;lBSwFpy
zU3Xz|ywP$G&ZV}=PbzFAZM_VIP9<&lcT?NZBcioV;pOl9MJL~Rbfms)d~$D-!Dko4
zvma87eV^P?bZ(fKYt3MGa5<COM&HZ5(o5XWzV~~(UiFCd<kTbilJ{n;N!r(&*X^==
z;)|Io`-?u@4&*$orgzRwXqs<KTcm1s`tJg+6Ghvm+dGSXx$r0A<GJF~6V^@s{k7@&
zKIM6Fbw{-K<@xQ%Yh>?DTU{&Xx%+C)8}67lvRBV1t&lIaD%#d2KT9gb>w~`3T~I3X
MboFyt=akR{0RKHG5dZ)H

diff --git a/doc/qtcreator/images/front-testing.png b/doc/qtcreator/images/front-testing.png
deleted file mode 100644
index 69b1fe45d56df3832ea96ef7e20b36facb741f79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 905
zcmeAS@N?(olHy`uVBq!ia0y~yU~mCp4rT@h2L7|j4Gav7`T;&6t_&dXzoFrOXz2gk
z+}jBW_X`Ujr=>m1%DS4AbR#Y8Zb8BQ<mAV>xwkVi?&Rm+%gVZ+lk+Gm>rO_-{p{@9
zIXQQ8a_(eh-ObFrmz8xVJNs^S_PwmEdzqPcv$OAl8TYcY@8slw*xA`2c4p>Xi2BS-
zkowF_h+dFXR@R-YtUC||Fzp~U5OJ``U9jxE>}(JtJNsT{Cdl@zERgwNV?l<4)k7E%
zWl(lj*1fDOki)=+zy;w9kSy3JxClDK{<v5u0|P^9NswPK10xeNI|nBh4==xfkf@lr
zgp{m;wu!Zkt)sK6o41dzUtn-ZSVUBGOng#Cc1~$oZC!n1Q)@?ePj6rU#3|Ee&YrV&
z!=}w!4jepm_{hmKXV0C#dgtDgXU|{0dh_Aa=P%!X{QCXp??1ISN53&JFfQ?QaSVw#
z{PybgphFH4tPhmM-X!IBu!>qI@kSirD?92I*!BGH{Da*QO(&j}&-{4k<WA2`GixT#
z@il7@R`>f?JWEXYW=_q*jZ(?K8dXmI*34a$);|B{HCLrADZ%F@Hc8dUUU8Zh?>!-P
zZ}dyw8p-Fi`*&{Iclge^?+i11X1NpzIh@~9xoq)0G0Qqh#sKML#aE24nlg=K*D%{$
zWJ=!3;1<W1J5lsmO@aKx6tyR8x5~<IGn8vMPjb)uQN(l8zW?BzH$SU|%Zv3G3eMiG
z4Kbd*STQs8u9c>_UBZh~RzlY*PI63<acdDaS?1){>JiZ@;q)Y^HReRmvnDRhZ5bh-
zWCf=Qg(<hWsit<+YNqR)E^kp0_EJ%FezdK;c(vQ4MSeV{O3^v&S3LG}6xyzupg#T0
z)Vsloh7Y$JuX3unwACtFvNCVNx*zFNCkC(FxT<On@63(I{&=cBQ8^#F(6Djl6@L#c
zhW#Ed)9RQSo-dHG{J`+x`OVbsD=h72=Q^ws@nk(y`2JG<zf*62hdtRLT=g+8R-AJ~
q#oni`qM5Sn$D$t|=@eG4pJJXR=lV>=ejOtyOL@BbxvX<aXaWH9!La`T

diff --git a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
index 115e666d0b9..b1531ae6857 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
@@ -25,11 +25,11 @@
             \li \inlineimage front-ui.png
             \li \inlineimage front-advanced.png
         \row
-            \li \b {\l{Overview}}
+            \li \b {\l{Developing with \QC}}
 
                 If you have not used an integrated development environment (IDE)
                 before, or want to know what kind of IDE \QC is, go to
-                \l{Overview}.
+                \l{Developing with \QC}.
             \li \b {\l{User Interface}}
 
                 If you have not used \QC before, and want to become familiar
diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
index 675b8884c69..b164224e848 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
@@ -8,11 +8,11 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-getting-started.html
+    \previouspage index.html
     \page creator-overview.html
-    \nextpage creator-quick-tour.html
+    \nextpage creator-getting-started.html
 
-    \title Overview
+    \title Developing with \QC
 
     \QC is a cross-platform, complete integrated development environment
     (IDE) that you can use to create applications for desktop, embedded,
@@ -235,6 +235,11 @@
     a suitable native debugger for each kit from the ones it finds on the
     computer. Edit the kits to override this choice.
 
+    If you install \QC with \QOI, the GNU Symbolic Debugger is installed
+    automatically and you should be ready to start debugging after you create
+    a new project. However, you can change the setup to use debugging tools for
+    Windows, for example.
+
     Connect devices to your computer to debug processes running on the devices.
 
     For more information, see \l{Debugging}.
diff --git a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
index 0a9240f7594..45432f561bd 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
@@ -4,7 +4,7 @@
 /*!
     \page creator-reference.html
     \previouspage creator-how-tos.html
-    \nextpage creator-known-issues.html
+    \nextpage creator-acknowledgements.html
 
     \title Reference
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc
deleted file mode 100644
index 34297d34fa5..00000000000
--- a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
-
-// **********************************************************************
-// NOTE: the sections are not ordered by their logical order to avoid
-// reshuffling the file each time the index order changes (i.e., often).
-// Run the fixnavi.pl script to adjust the links to the index order.
-// **********************************************************************
-
-/*!
-    \previouspage creator-build-process-customizing.html
-    \page creator-testing.html
-    \nextpage creator-debugging.html
-
-    \title Debugging and Analyzing
-
-    \image front-testing.png
-
-    \list
-
-        \li \l{Debugging}
-
-            If you install \QC with \QOI, the GNU Symbolic Debugger
-            is installed automatically and you should be ready to start
-            debugging after you create a new project. However, you can
-            change the setup to use debugging tools for Windows, for
-            example. You can connect \l{glossary-device}{devices} to your
-            development host and debug processes running on the devices.
-
-        \li \l{Analyzing Code}
-
-            Use tools for analyzing C++ and QML code to identify issues in
-            memory management, CPU usage, coding constructs, and so on. You
-            must install and configure the tools on your system to use them
-            from \QC. However, the QML Profiler is installed as part of \QC
-            for profiling Qt Quick applications.
-
-        \li \l{Using Squish}
-
-            Map AUTs to \QC and run Squish test suites and cases from it.
-
-    \endlist
-
-*/
diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc
index 52b28cf7e2b..0a60027451d 100644
--- a/doc/qtcreator/src/qtcreator-toc.qdoc
+++ b/doc/qtcreator/src/qtcreator-toc.qdoc
@@ -13,20 +13,15 @@
     {Qt documentation} portal or in the \l {Get help}{Help} mode.
 
     \list
-        \li \l{Getting Started}
-        \list
-            \li \l{Overview}
+        \li \l{Developing with \QC}
         \list
+            \li \l{Getting Started}
+                \list
+                    \li \l{User Interface}
+                    \li \l{Configuring Qt Creator}
+                \endlist
             \li \l{Creating Projects}
             \li \l{Configuring Projects}
-        \endlist
-            \li \l{User Interface}
-            \li \l{Configuring Qt Creator}
-        \endlist
-        \li \l{Tutorials}
-            \generatelist creator-tutorials
-        \li \l{Running on Devices}
-        \list
             \li \l{Validating with Target Hardware}
             \list
                 \li \l{Previewing on Desktop}
@@ -52,9 +47,6 @@
                 \li \l{Connecting Remote Linux Devices}
                 \li \l{Building Applications for the Web}
             \endlist
-        \endlist
-        \li \l{Debugging and Analyzing}
-        \list
             \li \l{Debugging}
             \list
                 \li \l{Setting Up Debugger}
@@ -97,6 +89,8 @@
             \endlist
             \li \l{Using Squish}
         \endlist
+        \li \l{Tutorials}
+            \generatelist creator-tutorials
         \li \l{How To}
         \list
             \li Analyze
diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc
index 0fc9b31eeb6..cc3352dd108 100644
--- a/doc/qtcreator/src/qtcreator.qdoc
+++ b/doc/qtcreator/src/qtcreator.qdoc
@@ -9,7 +9,7 @@
 
 /*!
     \page index.html
-    \nextpage creator-getting-started.html
+    \nextpage creator-overview.html
 
     \title Qt Creator Manual
 
@@ -27,37 +27,27 @@
 
     \table
         \row
-            \li {4,1} \b {\l{All Topics}{Click Here for a List of All Topics}}
+            \li {4,1} \b {\l{All Topics}}
         \row
             \li \inlineimage front-gs.png
             \li \inlineimage front-coding.png
-            \li \inlineimage front-preview.png
-        \row
-            \li \b {\l{Getting Started}}
-                \list
-                    \li \l{Overview}
-                    \li \l{User Interface}
-                    \li \l{Configuring Qt Creator}
-                \endlist
-            \li \b {\l{Tutorials}}
-                \generatelist creator-tutorials
-            \li \b {\l{Running on Devices}}
-                \list
-                    \li \l{Validating with Target Hardware}
-                    \li \l{Deploying to Devices}
-                    \li \l{Connecting Devices}
-                \endlist
-        \row
-            \li \inlineimage front-testing.png
             \li \inlineimage front-help.png
             \li \inlineimage front-advanced.png
         \row
-            \li \b {\l{Debugging and Analyzing}}
+            \li \b {\l{Developing with \QC}}
                 \list
+                    \li \l{Getting Started}
+                    \li \l{Creating Projects}
+                    \li \l{Configuring Projects}
+                    \li \l{Validating with Target Hardware}
+                    \li \l{Connecting Devices}
+                    \li \l{Deploying to Devices}
                     \li \l{Debugging}
                     \li \l{Analyzing Code}
                     \li \l{Using Squish}
                 \endlist
+            \li \b {\l{Tutorials}}
+                \generatelist creator-tutorials
             \li \b {\l{How To}}
                 \list
                     \li \l{Analyze}
@@ -70,7 +60,6 @@
                     \li \l{Test}
                     \li \l{Use \QC}
                     \li \l{Use the UI}
-                    \li \l{How To}{See All}
                 \endlist
             \li \b {\l{Reference}}
                 \list
@@ -83,7 +72,6 @@
                     \li \l {Supported Platforms}
                     \li \l {Version Control Systems}
                     \li \l {Views}
-                    \li \l {Reference}{See All}
                 \endlist
     \endtable
 */